Patchwork [4,of,7,Series-A] hidden: use both parents of working directory

login
register
mail settings
Submitter Pierre-Yves David
Date Jan. 7, 2013, 6:30 p.m.
Message ID <dc09a6fbb82e5688b450.1357583436@crater2.logilab.fr>
Download mbox | patch
Permalink /patch/492/
State Accepted
Commit f54898526aadcf7d26f609d426d4fb6d284a2ac5
Headers show

Comments

Pierre-Yves David - Jan. 7, 2013, 6:30 p.m.
# 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.

Patch

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