| Alphare |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| mtime=None, | mtime=None, | ||||
| added=False, | added=False, | ||||
| merged=False, | merged=False, | ||||
| from_p2=False, | from_p2=False, | ||||
| possibly_dirty=False, | possibly_dirty=False, | ||||
| ): | ): | ||||
| entry = self._map.get(f) | entry = self._map.get(f) | ||||
| if added or entry is not None and entry.removed: | if added or entry is not None and entry.removed: | ||||
| scmutil.checkfilename(f) | self._check_new_tracked_filename(f) | ||||
| if self._map.hastrackeddir(f): | |||||
| msg = _(b'directory %r already in dirstate') | |||||
| msg %= pycompat.bytestr(f) | |||||
| raise error.Abort(msg) | |||||
| # shadows | |||||
| for d in pathutil.finddirs(f): | |||||
| if self._map.hastrackeddir(d): | |||||
| break | |||||
| entry = self._map.get(d) | |||||
| if entry is not None and not entry.removed: | |||||
| msg = _(b'file %r in dirstate clashes with %r') | |||||
| msg %= (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( | self._map.addfile( | ||||
| f, | f, | ||||
| mode=mode, | mode=mode, | ||||
| size=size, | size=size, | ||||
| mtime=mtime, | mtime=mtime, | ||||
| added=added, | added=added, | ||||
| merged=merged, | merged=merged, | ||||
| from_p2=from_p2, | from_p2=from_p2, | ||||
| possibly_dirty=possibly_dirty, | possibly_dirty=possibly_dirty, | ||||
| ) | ) | ||||
| def _check_new_tracked_filename(self, filename): | |||||
| scmutil.checkfilename(filename) | |||||
| if self._map.hastrackeddir(filename): | |||||
| msg = _(b'directory %r already in dirstate') | |||||
| msg %= pycompat.bytestr(filename) | |||||
| raise error.Abort(msg) | |||||
| # shadows | |||||
| for d in pathutil.finddirs(filename): | |||||
| if self._map.hastrackeddir(d): | |||||
| break | |||||
| entry = self._map.get(d) | |||||
| if entry is not None and not entry.removed: | |||||
| msg = _(b'file %r in dirstate clashes with %r') | |||||
| msg %= (pycompat.bytestr(d), pycompat.bytestr(filename)) | |||||
| raise error.Abort(msg) | |||||
| def _get_filedata(self, filename): | def _get_filedata(self, filename): | ||||
| """returns""" | """returns""" | ||||
| s = os.lstat(self._join(filename)) | s = os.lstat(self._join(filename)) | ||||
| mode = s.st_mode | mode = s.st_mode | ||||
| size = s.st_size | size = s.st_size | ||||
| mtime = s[stat.ST_MTIME] | mtime = s[stat.ST_MTIME] | ||||
| return (mode, size, mtime) | return (mode, size, mtime) | ||||