This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11425

dirstate: replace `_add` call in `setparent`
ClosedPublic

Authored by marmoute on Sep 16 2021, 10:42 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7e65ca30fb91: dirstate: replace `_add` call in `setparent`
Summary

Same logic as the previous changeset, it get us closer to removed older API on
the dirstate.

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.

Event Timeline

marmoute created this revision.Sep 16 2021, 10:42 AM
Alphare accepted this revision.Sep 20 2021, 6:02 AM
This revision is now accepted and ready to land.Sep 20 2021, 6:02 AM
marmoute added a commit: rHG7e65ca30fb91: dirstate: replace `_add` call in `setparent`.Sep 20 2021, 10:06 AM
Closed by commit rHG7e65ca30fb91: dirstate: replace `_add` call in `setparent` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (8 lines)

Diff 30307

mercurial/dirstate.py

if source: if source:
copies[f] = source copies[f] = source
self._normallookup(f) self._normallookup(f)
# Also fix up otherparent markers # Also fix up otherparent markers
elif s.from_p2: elif s.from_p2:
source = self._map.copymap.get(f) source = self._map.copymap.get(f)
if source: if source:
copies[f] = source copies[f] = source
self._add(f) self._check_new_tracked_filename(f)
self._updatedfiles.add(f)
self._map.reset_state(
f,
p1_tracked=False,
wc_tracked=True,
)
return copies return copies
def setbranch(self, branch): def setbranch(self, branch):
self.__class__._branch.set(self, encoding.fromlocal(branch)) self.__class__._branch.set(self, encoding.fromlocal(branch))
f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True) f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True)
try: try:
f.write(self._branch + b'\n') f.write(self._branch + b'\n')
f.close() f.close()