equal
deleted
inserted
replaced
440 for d in pathutil.finddirs(f): |
440 for d in pathutil.finddirs(f): |
441 if self._map.hastrackeddir(d): |
441 if self._map.hastrackeddir(d): |
442 break |
442 break |
443 entry = self._map.get(d) |
443 entry = self._map.get(d) |
444 if entry is not None and entry[0] != b'r': |
444 if entry is not None and entry[0] != b'r': |
445 raise error.Abort( |
445 msg = _(b'file %r in dirstate clashes with %r') |
446 _(b'file %r in dirstate clashes with %r') |
446 msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) |
447 % (pycompat.bytestr(d), pycompat.bytestr(f)) |
447 raise error.Abort(msg) |
448 ) |
|
449 self._dirty = True |
448 self._dirty = True |
450 self._updatedfiles.add(f) |
449 self._updatedfiles.add(f) |
451 self._map.addfile(f, oldstate, state, mode, size, mtime) |
450 self._map.addfile(f, oldstate, state, mode, size, mtime) |
452 |
451 |
453 def normal(self, f, parentfiledata=None): |
452 def normal(self, f, parentfiledata=None): |