| Alphare |
| hg-reviewers |
We want to split current user of dirstate.add between hg add-like cases and
update of the dirstate coming from update/merge.
To do this we will introduce new API. The first step is to introduces an
internal function that these new API migh use (or not use) to distinct between
the migrated users and the others.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
This series starting from here looks good, but could use a typo pass on the commit messages, that'd be great. I'll queue it on monday probably.
✅ refresh by Heptapod after a successful CI run (🐙 💚)
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (10 lines) |
| if source: | if source: | ||||
| copies[f] = source | copies[f] = source | ||||
| self.normallookup(f) | self.normallookup(f) | ||||
| # Also fix up otherparent markers | # Also fix up otherparent markers | ||||
| elif s.from_p2: | elif s.from_p2: | ||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if source: | if source: | ||||
| copies[f] = source | copies[f] = source | ||||
| self.add(f) | self._add(f) | ||||
| return copies | return copies | ||||
| def setbranch(self, branch): | def setbranch(self, branch): | ||||
| self.__class__._branch.set(self, encoding.fromlocal(branch)) | self.__class__._branch.set(self, encoding.fromlocal(branch)) | ||||
| f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True) | f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True) | ||||
| try: | try: | ||||
| f.write(self._branch + b'\n') | f.write(self._branch + b'\n') | ||||
| f.close() | f.close() | ||||
| self._addpath(f, merged=True) | self._addpath(f, merged=True) | ||||
| else: | else: | ||||
| # add-like | # add-like | ||||
| self._addpath(f, from_p2=True) | self._addpath(f, from_p2=True) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def add(self, f): | def add(self, f): | ||||
| '''Mark a file added.''' | '''Mark a file added.''' | ||||
| self._addpath(f, added=True) | self._add(f) | ||||
| self._map.copymap.pop(f, None) | |||||
| def _add(self, filename): | |||||
| """internal function to mark a file as added""" | |||||
| self._addpath(filename, added=True) | |||||
| self._map.copymap.pop(filename, None) | |||||
| def remove(self, f): | def remove(self, f): | ||||
| '''Mark a file removed.''' | '''Mark a file removed.''' | ||||
| self._dirty = True | self._dirty = True | ||||
| self._updatedfiles.add(f) | self._updatedfiles.add(f) | ||||
| self._map.removefile(f, in_merge=self.in_merge) | self._map.removefile(f, in_merge=self.in_merge) | ||||
| def merge(self, f): | def merge(self, f): | ||||