( )⚙ D11592 dirstate-item: use the `p2_info` property to replace more verbose call

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11592

dirstate-item: use the `p2_info` property to replace more verbose call
ClosedPublic

Authored by marmoute on Oct 2 2021, 8:40 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe2753a7acfa7: dirstate-item: use the `p2_info` property to replace more verbose call

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Oct 2 2021, 8:40 PM
baymax updated this revision to Diff 30597.Oct 3 2021, 6:51 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Oct 3 2021, 5:13 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:13 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (2 lines)
Mmercurial/dirstatemap.py (4 lines)

Diff 30584

mercurial/dirstate.py

# tuple members one by one. # tuple members one by one.
t = dget(fn) t = dget(fn)
mode = t.mode mode = t.mode
size = t.size size = t.size
time = t.mtime time = t.mtime
if not st and t.tracked: if not st and t.tracked:
dadd(fn) dadd(fn)
elif t.merged or t.from_p2: elif t.p2_info:
madd(fn) madd(fn)
elif t.added: elif t.added:
aadd(fn) aadd(fn)
elif t.removed: elif t.removed:
radd(fn) radd(fn)
elif t.tracked: elif t.tracked:
if ( if (
size >= 0 size >= 0

mercurial/dirstatemap.py

def setparents(self, p1, p2, fold_p2=False): def setparents(self, p1, p2, fold_p2=False):
self._parents = (p1, p2) self._parents = (p1, p2)
self._dirtyparents = True self._dirtyparents = True
copies = {} copies = {}
if fold_p2: if fold_p2:
for f, s in pycompat.iteritems(self._map): for f, s in pycompat.iteritems(self._map):
# Discard "merged" markers when moving away from a merge state # Discard "merged" markers when moving away from a merge state
if s.merged or s.from_p2: if s.p2_info:
source = self.copymap.pop(f, None) source = self.copymap.pop(f, None)
if source: if source:
copies[f] = source copies[f] = source
s.drop_merge_data() s.drop_merge_data()
return copies return copies
### disk interaction ### disk interaction
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.
files_with_p2_info = [ files_with_p2_info = [
f for f, s in self._map.items() if s.merged or s.from_p2 f for f, s in self._map.items() if s.p2_info
] ]
rust_map = self._map rust_map = self._map
for f in files_with_p2_info: for f in files_with_p2_info:
e = rust_map.get(f) e = rust_map.get(f)
source = self.copymap.pop(f, None) source = self.copymap.pop(f, None)
if source: if source:
copies[f] = source copies[f] = source
e.drop_merge_data() e.drop_merge_data()