D8731: memctx: make `parents()` return list of one element if it’s not a merge
mjacob (Manuel Jacob)
phabricator at mercurial-scm.org
Sat Jul 11 21:12:35 UTC 2020
mjacob created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
It is part of the contract of `parents()` that non-merges return a list of one
element. `self._parents` is always a list of two elements in `memctx`.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8731
AFFECTED FILES
mercurial/context.py
CHANGE DETAILS
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -2891,6 +2891,11 @@
return scmutil.status(modified, added, removed, [], [], [], [])
+ def parents(self):
+ if self._parents[1].node() == nullid:
+ return [self._parents[0]]
+ return self._parents
+
class memfilectx(committablefilectx):
"""memfilectx represents an in-memory file to commit.
To: mjacob, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list