| Alphare | |
| pulkit |
| hg-reviewers |
This is a case we never meet, so lets trim it away to simplify the code before
more changes.
| 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 (3 lines) |
| """ | """ | ||||
| if merged and (clean_p1 or clean_p2): | if merged and (clean_p1 or clean_p2): | ||||
| msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' | msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' | ||||
| raise error.ProgrammingError(msg) | raise error.ProgrammingError(msg) | ||||
| if not (p1_tracked or p2_tracked or wc_tracked): | if not (p1_tracked or p2_tracked or wc_tracked): | ||||
| self._drop(filename) | self._drop(filename) | ||||
| elif merged: | elif merged: | ||||
| assert wc_tracked | assert wc_tracked | ||||
| if not self.in_merge: | assert self.in_merge # we are never in the "normallookup" case | ||||
| self.normallookup(filename) | |||||
| self.otherparent(filename) | self.otherparent(filename) | ||||
| elif not (p1_tracked or p2_tracked) and wc_tracked: | elif not (p1_tracked or p2_tracked) and wc_tracked: | ||||
| self._addpath(filename, added=True, possibly_dirty=possibly_dirty) | self._addpath(filename, added=True, possibly_dirty=possibly_dirty) | ||||
| self._map.copymap.pop(filename, None) | self._map.copymap.pop(filename, None) | ||||
| elif (p1_tracked or p2_tracked) and not wc_tracked: | elif (p1_tracked or p2_tracked) and not wc_tracked: | ||||
| self._remove(filename) | self._remove(filename) | ||||
| elif clean_p2 and wc_tracked: | elif clean_p2 and wc_tracked: | ||||
| assert p2_tracked | assert p2_tracked | ||||