| durin42 |
| hg-reviewers |
This method now doesn't do very much interesting and can be removed. The
updated files set can be updated where _droppath was originally called.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| self._updatedfiles.add(dest) | self._updatedfiles.add(dest) | ||||
| def copied(self, file): | def copied(self, file): | ||||
| return self._map.copymap.get(file, None) | return self._map.copymap.get(file, None) | ||||
| def copies(self): | def copies(self): | ||||
| return self._map.copymap | return self._map.copymap | ||||
| def _droppath(self, f): | |||||
| self._updatedfiles.add(f) | |||||
| def _addpath(self, f, state, mode, size, mtime): | def _addpath(self, f, state, mode, size, mtime): | ||||
| oldstate = self[f] | oldstate = self[f] | ||||
| if state == 'a' or oldstate == 'r': | if state == 'a' or oldstate == 'r': | ||||
| scmutil.checkfilename(f) | scmutil.checkfilename(f) | ||||
| if f in self._map.dirs: | if f in self._map.dirs: | ||||
| raise error.Abort(_('directory %r already in dirstate') % f) | raise error.Abort(_('directory %r already in dirstate') % f) | ||||
| # shadows | # shadows | ||||
| for d in util.finddirs(f): | for d in util.finddirs(f): | ||||
| def add(self, f): | def add(self, f): | ||||
| '''Mark a file added.''' | '''Mark a file added.''' | ||||
| self._addpath(f, 'a', 0, -1, -1) | self._addpath(f, 'a', 0, -1, -1) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def remove(self, f): | def remove(self, f): | ||||
| '''Mark a file removed.''' | '''Mark a file removed.''' | ||||
| self._dirty = True | self._dirty = True | ||||
| self._droppath(f) | |||||
| oldstate = self[f] | oldstate = self[f] | ||||
| size = 0 | size = 0 | ||||
| if self._pl[1] != nullid: | if self._pl[1] != nullid: | ||||
| entry = self._map.get(f) | entry = self._map.get(f) | ||||
| if entry is not None: | if entry is not None: | ||||
| # backup the previous state | # backup the previous state | ||||
| if entry[0] == 'm': # merge | if entry[0] == 'm': # merge | ||||
| size = -1 | size = -1 | ||||
| elif entry[0] == 'n' and entry[2] == -2: # other parent | elif entry[0] == 'n' and entry[2] == -2: # other parent | ||||
| size = -2 | size = -2 | ||||
| self._map.otherparentset.add(f) | self._map.otherparentset.add(f) | ||||
| self._updatedfiles.add(f) | |||||
| self._map.removefile(f, oldstate, size) | self._map.removefile(f, oldstate, size) | ||||
| if size == 0: | if size == 0: | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def merge(self, f): | def merge(self, f): | ||||
| '''Mark a file merged.''' | '''Mark a file merged.''' | ||||
| if self._pl[1] == nullid: | if self._pl[1] == nullid: | ||||
| return self.normallookup(f) | return self.normallookup(f) | ||||
| return self.otherparent(f) | return self.otherparent(f) | ||||
| def drop(self, f): | def drop(self, f): | ||||
| '''Drop a file from the dirstate''' | '''Drop a file from the dirstate''' | ||||
| oldstate = self[f] | oldstate = self[f] | ||||
| if self._map.dropfile(f, oldstate): | if self._map.dropfile(f, oldstate): | ||||
| self._dirty = True | self._dirty = True | ||||
| self._droppath(f) | self._updatedfiles.add(f) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def _discoverpath(self, path, normed, ignoremissing, exists, storemap): | def _discoverpath(self, path, normed, ignoremissing, exists, storemap): | ||||
| if exists is None: | if exists is None: | ||||
| exists = os.path.lexists(os.path.join(self._root, path)) | exists = os.path.lexists(os.path.join(self._root, path)) | ||||
| if not exists: | if not exists: | ||||
| # Maybe a path component exists | # Maybe a path component exists | ||||
| if not ignoremissing and '/' in path: | if not ignoremissing and '/' in path: | ||||