[PATCH 4 of 7 Series-A] hidden: use both parents of working directory
pierre-yves.david at logilab.fr
pierre-yves.david at logilab.fr
Mon Jan 7 12:30:36 CST 2013
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1357266976 -3600
# Node ID dc09a6fbb82e5688b45048eea91c28e91771f5be
# Parent b04d0f4dfa0d2a1fe0cc5285cef99ddaeeb41af6
hidden: use both parents of working directory
If we are merging with and extinct revision, this extinct revision should not be
hidden.
diff --git a/mercurial/repoview.py b/mercurial/repoview.py
--- a/mercurial/repoview.py
+++ b/mercurial/repoview.py
@@ -16,11 +16,11 @@ def computehidden(repo):
During most operation hidden should be filtered."""
assert not repo.changelog.filteredrevs
if repo.obsstore:
### hide extinct changeset that are not accessible by any mean
- hiddenquery = 'extinct() - ::(. + bookmark())'
+ hiddenquery = 'extinct() - ::(p1() + p2() + bookmark())'
return frozenset(repo.revs(hiddenquery))
return frozenset()
def computeunserved(repo):
"""compute the set of revision that should be filtered when used a server
More information about the Mercurial-devel
mailing list