( )⚙ D10933 dirstate: explicitely deal with the `added` case in `_addpath`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10933

dirstate: explicitely deal with the `added` case in `_addpath`
ClosedPublic

Authored by marmoute on Jul 2 2021, 11:18 AM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4a7df782f416: dirstate: explicitely deal with the `added` case in `_addpath`
Summary

This special case is now directly handled, this clarify the possible value for
the other options.

Diff Detail

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

Event Timeline

marmoute created this revision.Jul 2 2021, 11:18 AM
SimonSapin accepted this revision.Jul 2 2021, 12:11 PM
pulkit accepted this revision.Jul 3 2021, 7:43 AM
This revision is now accepted and ready to land.Jul 3 2021, 7:43 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (15 lines)

Diff 28734

mercurial/dirstate.py

for d in pathutil.finddirs(f): for d in pathutil.finddirs(f):
if self._map.hastrackeddir(d): if self._map.hastrackeddir(d):
break break
entry = self._map.get(d) entry = self._map.get(d)
if entry is not None and entry[0] != b'r': if entry is not None and entry[0] != b'r':
msg = _(b'file %r in dirstate clashes with %r') msg = _(b'file %r in dirstate clashes with %r')
msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
raise error.Abort(msg) raise error.Abort(msg)
if from_p2: if state == b'a':
assert not possibly_dirty
assert not from_p2
size = NONNORMAL
mtime = AMBIGUOUS_TIME
elif from_p2:
assert not possibly_dirty
size = FROM_P2 size = FROM_P2
mtime = AMBIGUOUS_TIME mtime = AMBIGUOUS_TIME
elif possibly_dirty: elif possibly_dirty:
mtime = AMBIGUOUS_TIME mtime = AMBIGUOUS_TIME
else: else:
assert size != FROM_P2 assert size != FROM_P2
if size != NONNORMAL: assert size != NONNORMAL
size = size & _rangemask size = size & _rangemask
if mtime != AMBIGUOUS_TIME:
mtime = mtime & _rangemask mtime = mtime & _rangemask
self._dirty = True self._dirty = True
self._updatedfiles.add(f) self._updatedfiles.add(f)
self._map.addfile(f, oldstate, state, mode, size, mtime) self._map.addfile(f, oldstate, state, mode, size, mtime)
def normal(self, f, parentfiledata=None): def normal(self, f, parentfiledata=None):
"""Mark a file normal and clean. """Mark a file normal and clean.
parentfiledata: (mode, size, mtime) of the clean file parentfiledata: (mode, size, mtime) of the clean file