Mercurial > hg
changeset 47487:1f571077222d
dirstate: add an explicit `from_p2` parameter to `_addpath`
This lets says what we mean instead of using magic value. The lower level can
then decide how to express that.
Differential Revision: https://phab.mercurial-scm.org/D10931
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 02 Jul 2021 02:01:10 +0200 |
| parents | 523c00383e79 |
| children | 91520abe2b2c |
| files | mercurial/dirstate.py |
| diffstat | 1 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstate.py Fri Jul 02 02:05:47 2021 +0200 +++ b/mercurial/dirstate.py Fri Jul 02 02:01:10 2021 +0200 @@ -438,7 +438,15 @@ def copies(self): return self._map.copymap - def _addpath(self, f, state, mode, size=NONNORMAL, mtime=AMBIGUOUS_TIME): + def _addpath( + self, + f, + state, + mode, + size=NONNORMAL, + mtime=AMBIGUOUS_TIME, + from_p2=False, + ): oldstate = self[f] if state == b'a' or oldstate == b'r': scmutil.checkfilename(f) @@ -455,10 +463,15 @@ msg = _(b'file %r in dirstate clashes with %r') msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) raise error.Abort(msg) - if size != NONNORMAL and size != FROM_P2: - size = size & _rangemask - if mtime != AMBIGUOUS_TIME: - mtime = mtime & _rangemask + if from_p2: + size = FROM_P2 + mtime = AMBIGUOUS_TIME + else: + assert size != FROM_P2 + if size != NONNORMAL: + size = size & _rangemask + if mtime != AMBIGUOUS_TIME: + mtime = mtime & _rangemask self._dirty = True self._updatedfiles.add(f) self._map.addfile(f, oldstate, state, mode, size, mtime) @@ -519,10 +532,10 @@ raise error.Abort(msg) if f in self and self[f] == b'n': # merge-like - self._addpath(f, b'm', 0, FROM_P2) + self._addpath(f, b'm', 0, from_p2=True) else: # add-like - self._addpath(f, b'n', 0, FROM_P2) + self._addpath(f, b'n', 0, from_p2=True) self._map.copymap.pop(f, None) def add(self, f):