( )⚙ D11581 dirstatemap: align the Rust wrapper implementation of `setparent`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11581

dirstatemap: align the Rust wrapper implementation of `setparent`
ClosedPublic

Authored by marmoute on Oct 2 2021, 11:06 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbda85920de6b: dirstatemap: align the Rust wrapper implementation of `setparent`
Summary

We move to using drop_merge_data as intended.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (36 lines)

Diff 30638

mercurial/dirstatemap.py

self._dirtyparents = True self._dirtyparents = True
copies = {} copies = {}
if fold_p2: if fold_p2:
# Collect into an intermediate list to avoid a `RuntimeError` # Collect into an intermediate list to avoid a `RuntimeError`
# exception due to mutation during iteration. # exception due to mutation during iteration.
# TODO: move this the whole loop to Rust where `iter_mut` # TODO: move this the whole loop to Rust where `iter_mut`
# enables in-place mutation of elements of a collection while # enables in-place mutation of elements of a collection while
# iterating it, without mutating the collection itself. # iterating it, without mutating the collection itself.
candidatefiles = [ files_with_p2_info = [
(f, s) f for f, s in self._map.items() if s.merged or s.from_p2
for f, s in self._map.items()
if s.merged or s.from_p2
] ]
for f, s in candidatefiles: rust_map = self._map
# Discard "merged" markers when moving away from a merge state for f in files_with_p2_info:
if s.merged: e = rust_map.get(f)
source = self.copymap.get(f) source = self.copymap.pop(f, None)
if source:
copies[f] = source
self.reset_state(
f,
wc_tracked=True,
p1_tracked=True,
possibly_dirty=True,
)
# Also fix up otherparent markers
elif s.from_p2:
source = self.copymap.get(f)
if source: if source:
copies[f] = source copies[f] = source
self.reset_state( e.drop_merge_data()
f, rust_map.set_dirstate_item(f, e)
p1_tracked=False,
wc_tracked=True,
)
return copies return copies
def parents(self): def parents(self):
if not self._parents: if not self._parents:
if self._use_dirstate_v2: if self._use_dirstate_v2:
self._parents = self.docket.parents self._parents = self.docket.parents
else: else:
read_len = self._nodelen * 2 read_len = self._nodelen * 2