| SimonSapin | |
| pulkit |
| hg-reviewers |
This is shorter and 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 (7 lines) |
| 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': | ||||
| raise error.Abort( | msg = _(b'file %r in dirstate clashes with %r') | ||||
| _(b'file %r in dirstate clashes with %r') | msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) | ||||
| % (pycompat.bytestr(d), pycompat.bytestr(f)) | raise error.Abort(msg) | ||||
| ) | |||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(f) | self._updatedfiles.add(f) | ||||
| self._map.addfile(f, oldstate, state, mode, size, mtime) | self._map.addfile(f, oldstate, state, mode, size, mtime) | ||||
| def normal(self, f, parentfiledata=None): | def normal(self, f, parentfiledata=None): | ||||
| """Mark a file normal and clean. | """Mark a file normal and clean. | ||||
| parentfiledata: (mode, size, mtime) of the clean file | parentfiledata: (mode, size, mtime) of the clean file | ||||