( )⚙ D11323 dirstatemap: use the default code to handle normal entry

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11323

dirstatemap: use the default code to handle normal entry
ClosedPublic

Authored by marmoute on Aug 21 2021, 5:56 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG442711f2c447: dirstatemap: use the default code to handle normal entry
Summary

This case is quite simple.

Diff Detail

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

Event Timeline

marmoute created this revision.Aug 21 2021, 5:56 AM
baymax updated this revision to Diff 30049.Aug 26 2021, 9:00 AM

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

Alphare accepted this revision.Aug 26 2021, 9:11 AM
This revision is now accepted and ready to land.Aug 26 2021, 9:11 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (4 lines)

Diff 29972

mercurial/dirstatemap.py

self.addfile(filename, possibly_dirty=possibly_dirty) self.addfile(filename, possibly_dirty=possibly_dirty)
return return
elif wc_tracked: elif wc_tracked:
# this is a "normal" file # this is a "normal" file
if parentfiledata is None: if parentfiledata is None:
msg = b'failed to pass parentfiledata for a normal file: %s' msg = b'failed to pass parentfiledata for a normal file: %s'
msg %= filename msg %= filename
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
mode, size, mtime = parentfiledata
self.addfile(filename, mode=mode, size=size, mtime=mtime)
self.nonnormalset.discard(filename)
return
else: else:
assert False, 'unreachable' assert False, 'unreachable'
old_entry = self._map.get(filename) old_entry = self._map.get(filename)
self._dirs_incr(filename, old_entry) self._dirs_incr(filename, old_entry)
entry = DirstateItem( entry = DirstateItem(
wc_tracked=wc_tracked, wc_tracked=wc_tracked,
p1_tracked=p1_tracked, p1_tracked=p1_tracked,