| SimonSapin | |
| pulkit |
| hg-reviewers |
This is simpler to read.
| 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 (6 lines) |
| 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, mtime): | ||||
| 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): | ||||
| raise error.Abort( | msg = _(b'directory %r already in dirstate') | ||||
| _(b'directory %r already in dirstate') % pycompat.bytestr(f) | msg %= pycompat.bytestr(f) | ||||
| ) | 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': | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'file %r in dirstate clashes with %r') | _(b'file %r in dirstate clashes with %r') | ||||