diff -r 51a9148f8349 -r e16065bb7f42 mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py Tue Feb 18 03:28:20 2025 +0100 +++ b/mercurial/dirstatemap.py Tue Feb 18 21:23:13 2025 +0100 @@ -674,7 +674,6 @@ Fills the Dirstatemap when called. """ # ignore HG_PENDING because identity is used only for writing - self._set_identity() testing.wait_on_cfg(self._ui, b'dirstate.pre-read-file') if self._use_dirstate_v2: @@ -714,7 +713,6 @@ return self._map def _get_rust_identity(self): - self._set_identity() identity = None if self.identity is not None and self.identity.stat is not None: stat_info = self.identity.stat @@ -734,8 +732,9 @@ return identity def _v1_map(self, from_v2_exception=None): - identity = self._get_rust_identity() try: + self._set_identity() + identity = self._get_rust_identity() self._map, parents = rustmod.DirstateMap.new_v1( self._readdirstatefile(), identity )