[Commented On] D11375: dirstate-item: implement `v1_mtime` with higher level block
baymax (Baymax, Your Personal Patch-care Companion)
phabricator at mercurial-scm.org
Mon Aug 30 13:00:50 UTC 2021
baymax added a comment.
baymax updated this revision to Diff 30152.
✅ refresh by Heptapod after a successful CI run (🐙 💚)
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11375?vs=30131&id=30152
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11375/new/
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, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210830/694875b0/attachment-0002.html>
More information about the Mercurial-patches
mailing list