| SimonSapin | |
| pulkit |
| hg-reviewers |
We don't need to pass the oldstate around, so lets use the new property
instead.
| 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 (3 lines) |
| state, | state, | ||||
| mode, | mode, | ||||
| size=None, | size=None, | ||||
| mtime=None, | mtime=None, | ||||
| from_p2=False, | from_p2=False, | ||||
| possibly_dirty=False, | possibly_dirty=False, | ||||
| ): | ): | ||||
| oldstate = self[f] | oldstate = self[f] | ||||
| if state == b'a' or oldstate == b'r': | entry = self._map.get(f) | ||||
| if state == b'a' or entry is not None and entry.removed: | |||||
| 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): | ||||