Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dirstate.py @ 42763:760a7851e9ba
rust-parsers: move parser bindings to their own file and Python module
This tidies up the Rust side while simplifying the Python side.
Differential Revision: https://phab.mercurial-scm.org/D6627
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Wed, 10 Jul 2019 10:16:28 +0200 |
| parents | 87a34c767384 |
| children | 749ef8c31187 |
line wrap: on
line diff
--- a/mercurial/dirstate.py Mon Jul 08 18:01:39 2019 +0200 +++ b/mercurial/dirstate.py Wed Jul 10 10:16:28 2019 +0200 @@ -27,14 +27,14 @@ util, ) -parsers = policy.importmod(r'parsers') -dirstatemod = policy.importrust(r'dirstate', default=parsers) +orig_parsers = policy.importmod(r'parsers') +parsers = policy.importrust(r'parsers', default=orig_parsers) propertycache = util.propertycache filecache = scmutil.filecache _rangemask = 0x7fffffff -dirstatetuple = parsers.dirstatetuple +dirstatetuple = orig_parsers.dirstatetuple class repocache(filecache): """filecache for files in .hg/""" @@ -1475,7 +1475,7 @@ # parsing the dirstate. # # (we cannot decorate the function directly since it is in a C module) - parse_dirstate = util.nogc(dirstatemod.parse_dirstate) + parse_dirstate = util.nogc(parsers.parse_dirstate) p = parse_dirstate(self._map, self.copymap, st) if not self._dirtyparents: self.setparents(*p) @@ -1486,8 +1486,8 @@ self.get = self._map.get def write(self, st, now): - st.write(dirstatemod.pack_dirstate(self._map, self.copymap, - self.parents(), now)) + st.write(parsers.pack_dirstate(self._map, self.copymap, + self.parents(), now)) st.close() self._dirtyparents = False self.nonnormalset, self.otherparentset = self.nonnormalentries()