Patchwork D8731: memctx: make `parents()` return list of one element if it’s not a merge

login
register
mail settings
Submitter phabricator
Date July 11, 2020, 9:12 p.m.
Message ID <differential-rev-PHID-DREV-fvaagxdxkgfwzhtmlvji-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46697/
State Superseded
Headers show

Comments

phabricator - July 11, 2020, 9:12 p.m.
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




To: mjacob, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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.