| SimonSapin | |
| pulkit |
| hg-reviewers |
We want to remove the magic value usage from the higher level, so lets stop
passing them explicitely when possible.
| 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 (10 lines) |
| self._updatedfiles.add(dest) | self._updatedfiles.add(dest) | ||||
| def copied(self, file): | def copied(self, file): | ||||
| return self._map.copymap.get(file, None) | return self._map.copymap.get(file, None) | ||||
| def copies(self): | def copies(self): | ||||
| return self._map.copymap | return self._map.copymap | ||||
| def _addpath(self, f, state, mode, size, mtime): | def _addpath(self, f, state, mode, size=NONNORMAL, mtime=AMBIGUOUS_TIME): | ||||
| 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 | ||||
| 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, NONNORMAL, AMBIGUOUS_TIME) | self._addpath(f, b'n', 0) | ||||
| 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': | ||||
| # merge-like | # merge-like | ||||
| self._addpath(f, b'm', 0, FROM_P2, AMBIGUOUS_TIME) | self._addpath(f, b'm', 0, FROM_P2) | ||||
| else: | else: | ||||
| # add-like | # add-like | ||||
| self._addpath(f, b'n', 0, FROM_P2, AMBIGUOUS_TIME) | self._addpath(f, b'n', 0, FROM_P2) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def add(self, f): | def add(self, f): | ||||
| '''Mark a file added.''' | '''Mark a file added.''' | ||||
| self._addpath(f, b'a', 0, NONNORMAL, AMBIGUOUS_TIME) | self._addpath(f, b'a', 0) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def remove(self, f): | def remove(self, f): | ||||
| '''Mark a file removed.''' | '''Mark a file removed.''' | ||||
| self._dirty = True | self._dirty = True | ||||
| oldstate = self[f] | oldstate = self[f] | ||||
| size = 0 | size = 0 | ||||
| if self._pl[1] != self._nodeconstants.nullid: | if self._pl[1] != self._nodeconstants.nullid: | ||||