| SimonSapin | |
| pulkit |
| hg-reviewers |
This factor the "p2 is not null" check and is fairly simpler to read.
| 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 (13 lines) |
| return [self._validate(p) for p in self._pl] | return [self._validate(p) for p in self._pl] | ||||
| def p1(self): | def p1(self): | ||||
| return self._validate(self._pl[0]) | return self._validate(self._pl[0]) | ||||
| def p2(self): | def p2(self): | ||||
| return self._validate(self._pl[1]) | return self._validate(self._pl[1]) | ||||
| @property | |||||
| def in_merge(self): | |||||
| """True if a merge is in progress""" | |||||
| return self._pl[1] != self._nodeconstants.nullid | |||||
| def branch(self): | def branch(self): | ||||
| return encoding.tolocal(self._branch) | return encoding.tolocal(self._branch) | ||||
| def setparents(self, p1, p2=None): | def setparents(self, p1, p2=None): | ||||
| """Set dirstate parents to p1 and p2. | """Set dirstate parents to p1 and p2. | ||||
| When moving from two parents to one, 'm' merged entries a | When moving from two parents to one, 'm' merged entries a | ||||
| adjusted to normal and previous copy records discarded and | adjusted to normal and previous copy records discarded and | ||||
| if mtime > self._lastnormaltime: | if mtime > self._lastnormaltime: | ||||
| # Remember the most recent modification timeslot for status(), | # Remember the most recent modification timeslot for status(), | ||||
| # to make sure we won't miss future size-preserving file content | # to make sure we won't miss future size-preserving file content | ||||
| # modifications that happen within the same timeslot. | # modifications that happen within the same timeslot. | ||||
| self._lastnormaltime = mtime | self._lastnormaltime = mtime | ||||
| def normallookup(self, f): | def normallookup(self, f): | ||||
| '''Mark a file normal, but possibly dirty.''' | '''Mark a file normal, but possibly dirty.''' | ||||
| if self._pl[1] != self._nodeconstants.nullid: | if self.in_merge: | ||||
| # if there is a merge going on and the file was either | # if there is a merge going on and the file was either | ||||
| # in state 'm' (-1) or coming from other parent (-2) before | # in state 'm' (-1) or coming from other parent (-2) before | ||||
| # being removed, restore that state. | # being removed, restore that state. | ||||
| entry = self._map.get(f) | entry = self._map.get(f) | ||||
| if entry is not None: | if entry is not None: | ||||
| if entry[0] == b'r' and entry[2] in (NONNORMAL, FROM_P2): | if entry[0] == b'r' and entry[2] in (NONNORMAL, FROM_P2): | ||||
| source = self._map.copymap.get(f) | source = self._map.copymap.get(f) | ||||
| if entry[2] == NONNORMAL: | if entry[2] == NONNORMAL: | ||||
| self.merge(f) | self.merge(f) | ||||
| elif entry[2] == FROM_P2: | elif entry[2] == FROM_P2: | ||||
| self.otherparent(f) | self.otherparent(f) | ||||
| if source: | if source: | ||||
| self.copy(source, f) | self.copy(source, f) | ||||
| return | return | ||||
| if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2: | if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2: | ||||
| return | return | ||||
| self._addpath(f, b'n', 0, possibly_dirty=True) | self._addpath(f, b'n', 0, possibly_dirty=True) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def otherparent(self, f): | def otherparent(self, f): | ||||
| '''Mark as coming from the other parent, always dirty.''' | '''Mark as coming from the other parent, always dirty.''' | ||||
| if self._pl[1] == self._nodeconstants.nullid: | if not self.in_merge: | ||||
| msg = _(b"setting %r to other parent only allowed in merges") % f | msg = _(b"setting %r to other parent only allowed in merges") % f | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| if f in self and self[f] == b'n': | if f in self and self[f] == b'n': | ||||
| # merge-like | # merge-like | ||||
| self._addpath(f, b'm', 0, from_p2=True) | self._addpath(f, b'm', 0, from_p2=True) | ||||
| else: | else: | ||||
| # add-like | # add-like | ||||
| self._addpath(f, b'n', 0, from_p2=True) | self._addpath(f, b'n', 0, 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, b'a', 0) | self._addpath(f, b'a', 0) | ||||
| 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 | ||||
| oldstate = self[f] | oldstate = self[f] | ||||
| size = 0 | size = 0 | ||||
| if self._pl[1] != self._nodeconstants.nullid: | if self.in_merge: | ||||
| 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] == b'm': # merge | if entry[0] == b'm': # merge | ||||
| size = NONNORMAL | size = NONNORMAL | ||||
| elif entry[0] == b'n' and entry[2] == FROM_P2: # other parent | elif entry[0] == b'n' and entry[2] == FROM_P2: # other parent | ||||
| size = FROM_P2 | size = FROM_P2 | ||||
| self._map.otherparentset.add(f) | self._map.otherparentset.add(f) | ||||
| self._updatedfiles.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] == self._nodeconstants.nullid: | if not self.in_merge: | ||||
| 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 | ||||