equal
deleted
inserted
replaced
125 if not self._docket: |
125 if not self._docket: |
126 if not self._use_dirstate_v2: |
126 if not self._use_dirstate_v2: |
127 raise error.ProgrammingError( |
127 raise error.ProgrammingError( |
128 b'dirstate only has a docket in v2 format' |
128 b'dirstate only has a docket in v2 format' |
129 ) |
129 ) |
|
130 self._set_identity() |
130 self._docket = docketmod.DirstateDocket.parse( |
131 self._docket = docketmod.DirstateDocket.parse( |
131 self._readdirstatefile(), self._nodeconstants |
132 self._readdirstatefile(), self._nodeconstants |
132 ) |
133 ) |
133 return self._docket |
134 return self._docket |
134 |
135 |
297 return copies |
298 return copies |
298 |
299 |
299 ### disk interaction |
300 ### disk interaction |
300 |
301 |
301 def read(self): |
302 def read(self): |
302 # ignore HG_PENDING because identity is used only for writing |
|
303 self._set_identity() |
|
304 |
|
305 testing.wait_on_cfg(self._ui, b'dirstate.pre-read-file') |
303 testing.wait_on_cfg(self._ui, b'dirstate.pre-read-file') |
306 if self._use_dirstate_v2: |
304 if self._use_dirstate_v2: |
307 |
305 |
308 if not self.docket.uuid: |
306 if not self.docket.uuid: |
309 return |
307 return |
310 testing.wait_on_cfg(self._ui, b'dirstate.post-docket-read-file') |
308 testing.wait_on_cfg(self._ui, b'dirstate.post-docket-read-file') |
311 st = self._read_v2_data() |
309 st = self._read_v2_data() |
312 else: |
310 else: |
|
311 self._set_identity() |
313 st = self._readdirstatefile() |
312 st = self._readdirstatefile() |
314 |
313 |
315 if not st: |
314 if not st: |
316 return |
315 return |
317 |
316 |
579 self._map = rustmod.DirstateMap.new_v2( |
578 self._map = rustmod.DirstateMap.new_v2( |
580 data, self.docket.data_size, self.docket.tree_metadata |
579 data, self.docket.data_size, self.docket.tree_metadata |
581 ) |
580 ) |
582 parents = self.docket.parents |
581 parents = self.docket.parents |
583 else: |
582 else: |
|
583 self._set_identity() |
584 self._map, parents = rustmod.DirstateMap.new_v1( |
584 self._map, parents = rustmod.DirstateMap.new_v1( |
585 self._readdirstatefile() |
585 self._readdirstatefile() |
586 ) |
586 ) |
587 |
587 |
588 if parents and not self._dirtyparents: |
588 if parents and not self._dirtyparents: |