| SimonSapin | |
| pulkit |
| hg-reviewers |
This lets says what we mean instead of using magic value. The lower level can
then decide how to express that.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (5 lines) |
| def _addpath( | def _addpath( | ||||
| self, | self, | ||||
| f, | f, | ||||
| state, | state, | ||||
| mode, | mode, | ||||
| size=NONNORMAL, | size=NONNORMAL, | ||||
| mtime=AMBIGUOUS_TIME, | mtime=AMBIGUOUS_TIME, | ||||
| from_p2=False, | from_p2=False, | ||||
| possibly_dirty=False, | |||||
| ): | ): | ||||
| oldstate = self[f] | oldstate = self[f] | ||||
| if state == b'a' or oldstate == b'r': | if state == b'a' or oldstate == b'r': | ||||
| scmutil.checkfilename(f) | scmutil.checkfilename(f) | ||||
| if self._map.hastrackeddir(f): | if self._map.hastrackeddir(f): | ||||
| msg = _(b'directory %r already in dirstate') | msg = _(b'directory %r already in dirstate') | ||||
| msg %= pycompat.bytestr(f) | msg %= pycompat.bytestr(f) | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| # shadows | # shadows | ||||
| 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 from_p2: | ||||
| size = FROM_P2 | size = FROM_P2 | ||||
| mtime = AMBIGUOUS_TIME | mtime = AMBIGUOUS_TIME | ||||
| elif possibly_dirty: | |||||
| mtime = AMBIGUOUS_TIME | |||||
| else: | else: | ||||
| assert size != FROM_P2 | assert size != FROM_P2 | ||||
| if size != NONNORMAL: | if size != NONNORMAL: | ||||
| size = size & _rangemask | size = size & _rangemask | ||||
| if mtime != AMBIGUOUS_TIME: | 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.merge(f) | self.merge(f) | ||||
| elif entry[2] == FROM_P2: | elif entry[2] == FROM_P2: | ||||
| self.otherparent(f) | self.otherparent(f) | ||||
| if source: | if source: | ||||
| self.copy(source, f) | self.copy(source, f) | ||||
| return | return | ||||
| if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2: | if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2: | ||||
| return | return | ||||
| self._addpath(f, b'n', 0) | self._addpath(f, b'n', 0, possibly_dirty=True) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def otherparent(self, f): | def otherparent(self, f): | ||||
| '''Mark as coming from the other parent, always dirty.''' | '''Mark as coming from the other parent, always dirty.''' | ||||
| if self._pl[1] == self._nodeconstants.nullid: | if self._pl[1] == self._nodeconstants.nullid: | ||||
| msg = _(b"setting %r to other parent only allowed in merges") % f | msg = _(b"setting %r to other parent only allowed in merges") % f | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| if f in self and self[f] == b'n': | if f in self and self[f] == b'n': | ||||