Skip to content
Snippets Groups Projects
Commit 4a7df782 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

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

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

Differential Revision: https://phab.mercurial-scm.org/D10933
parent 91520abe
No related branches found
No related tags found
No related merge requests found
......@@ -464,10 +464,16 @@
msg = _(b'file %r in dirstate clashes with %r')
msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
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
mtime = AMBIGUOUS_TIME
elif possibly_dirty:
mtime = AMBIGUOUS_TIME
else:
assert size != FROM_P2
......@@ -468,13 +474,12 @@
size = FROM_P2
mtime = AMBIGUOUS_TIME
elif possibly_dirty:
mtime = AMBIGUOUS_TIME
else:
assert size != FROM_P2
if size != NONNORMAL:
size = size & _rangemask
if mtime != AMBIGUOUS_TIME:
mtime = mtime & _rangemask
assert size != NONNORMAL
size = size & _rangemask
mtime = mtime & _rangemask
self._dirty = True
self._updatedfiles.add(f)
self._map.addfile(f, oldstate, state, mode, size, mtime)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment