Patchwork D7487: changectx: use unfiltered changelog to access parents of unfiltered revs

login
register
mail settings
Submitter phabricator
Date Nov. 23, 2019, 11:54 a.m.
Message ID <8cabf3a6aaa99f51686e421fa5c7042d@localhost.localdomain>
Download mbox | patch
Permalink /patch/43478/
State Not Applicable
Headers show

Comments

phabricator - Nov. 23, 2019, 11:54 a.m.
marmoute updated this revision to Diff 18350.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7487?vs=18294&id=18350

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7487/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7487

AFFECTED FILES
  mercurial/context.py
  tests/test-repo-filters-tiptoe.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-repo-filters-tiptoe.t b/tests/test-repo-filters-tiptoe.t
--- a/tests/test-repo-filters-tiptoe.t
+++ b/tests/test-repo-filters-tiptoe.t
@@ -58,7 +58,6 @@ 
 Getting status of null
 
   $ hg status --change null
-  debug.filters: computing revision filter for "visible"
 
 Getting status of working copy
 
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -517,7 +517,12 @@ 
     @propertycache
     def _parents(self):
         repo = self._repo
-        p1, p2 = repo.changelog.parentrevs(self._rev)
+        if self._maybe_filtered:
+            cl = repo.changelog
+        else:
+            cl = repo.unfiltered().changelog
+
+        p1, p2 = cl.parentrevs(self._rev)
         if p2 == nullrev:
             return [repo[p1]]
         return [repo[p1], repo[p2]]