Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dirstate.py @ 42331:9c6c0f736e1d
rust-dirstate: call parse/pack bindings from Python
A future patch will need to address the issue of Rust module policy,
to avoid having ugly duplicate imports and conditionals all over the place.
As the rewrite of dirstate in Rust progresses, we will need fewer of those
"contact points".
Differential Revision: https://phab.mercurial-scm.org/D6350
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Mon, 06 May 2019 22:51:10 +0200 |
| parents | 42dd69985778 |
| children | 7ada598941d2 |
line wrap: on
line diff
--- a/mercurial/dirstate.py Mon May 06 22:50:34 2019 +0200 +++ b/mercurial/dirstate.py Mon May 06 22:51:10 2019 +0200 @@ -27,6 +27,12 @@ util, ) +try: + from . import rustext + rustext.__name__ # force actual import (see hgdemandimport) +except ImportError: + rustext = None + parsers = policy.importmod(r'parsers') propertycache = util.propertycache @@ -1465,7 +1471,12 @@ # parsing the dirstate. # # (we cannot decorate the function directly since it is in a C module) - parse_dirstate = util.nogc(parsers.parse_dirstate) + if rustext is not None: + parse_dirstate = rustext.dirstate.parse_dirstate + else: + parse_dirstate = parsers.parse_dirstate + + parse_dirstate = util.nogc(parse_dirstate) p = parse_dirstate(self._map, self.copymap, st) if not self._dirtyparents: self.setparents(*p) @@ -1476,7 +1487,12 @@ self.get = self._map.get def write(self, st, now): - st.write(parsers.pack_dirstate(self._map, self.copymap, + if rustext is not None: + pack_dirstate = rustext.dirstate.pack_dirstate + else: + pack_dirstate = parsers.pack_dirstate + + st.write(pack_dirstate(self._map, self.copymap, self.parents(), now)) st.close() self._dirtyparents = False