Show More
@@ -76,6 +76,11 b' class _dirstatemapcommon:' | |||||
76 | # for consistent view between _pl() and _read() invocations |
|
76 | # for consistent view between _pl() and _read() invocations | |
77 | self._pendingmode = None |
|
77 | self._pendingmode = None | |
78 |
|
78 | |||
|
79 | def _set_identity(self): | |||
|
80 | # ignore HG_PENDING because identity is used only for writing | |||
|
81 | file_path = self._opener.join(self._filename) | |||
|
82 | self.identity = util.filestat.frompath(file_path) | |||
|
83 | ||||
79 | def preload(self): |
|
84 | def preload(self): | |
80 | """Loads the underlying data, if it's not already loaded""" |
|
85 | """Loads the underlying data, if it's not already loaded""" | |
81 | self._map |
|
86 | self._map | |
@@ -295,9 +300,7 b' class dirstatemap(_dirstatemapcommon):' | |||||
295 |
|
300 | |||
296 | def read(self): |
|
301 | def read(self): | |
297 | # ignore HG_PENDING because identity is used only for writing |
|
302 | # ignore HG_PENDING because identity is used only for writing | |
298 | self.identity = util.filestat.frompath( |
|
303 | self._set_identity() | |
299 | self._opener.join(self._filename) |
|
|||
300 | ) |
|
|||
301 |
|
304 | |||
302 | testing.wait_on_cfg(self._ui, b'dirstate.pre-read-file') |
|
305 | testing.wait_on_cfg(self._ui, b'dirstate.pre-read-file') | |
303 | if self._use_dirstate_v2: |
|
306 | if self._use_dirstate_v2: | |
@@ -563,9 +566,7 b' if rustmod is not None:' | |||||
563 | Fills the Dirstatemap when called. |
|
566 | Fills the Dirstatemap when called. | |
564 | """ |
|
567 | """ | |
565 | # ignore HG_PENDING because identity is used only for writing |
|
568 | # ignore HG_PENDING because identity is used only for writing | |
566 |
self.identity |
|
569 | self._set_identity() | |
567 | self._opener.join(self._filename) |
|
|||
568 | ) |
|
|||
569 |
|
570 | |||
570 | testing.wait_on_cfg(self._ui, b'dirstate.pre-read-file') |
|
571 | testing.wait_on_cfg(self._ui, b'dirstate.pre-read-file') | |
571 | if self._use_dirstate_v2: |
|
572 | if self._use_dirstate_v2: |
General Comments 0
You need to be logged in to leave comments.
Login now