marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This is much easier to read and maintain. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11375 AFFECTED FILES mercurial/pure/parsers.py CHANGE DETAILS diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -377,25 +377,18 @@ # the object has no state to record, this is -currently- # unsupported raise RuntimeError('untracked item') - elif not self._wc_tracked: + elif self.removed: return 0 elif self._possibly_dirty: return AMBIGUOUS_TIME - elif self._merged: - return AMBIGUOUS_TIME - elif not (self._p1_tracked or self._p2_tracked) and self._wc_tracked: + elif self.merged: return AMBIGUOUS_TIME - elif self._clean_p2 and self._wc_tracked: - return AMBIGUOUS_TIME - elif not self._p1_tracked and self._p2_tracked and self._wc_tracked: + elif self.added: return AMBIGUOUS_TIME - elif self._wc_tracked: - if self._mtime is None: - return 0 - else: - return self._mtime + elif self.from_p2: + return AMBIGUOUS_TIME else: - raise RuntimeError('unreachable') + return self._mtime if self._mtime is not None else 0 def need_delay(self, now): """True if the stored mtime would be ambiguous with the current time""" To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
