[PATCH 3 of 6 V2-Series-A] hidden: use both parents of working directory

[pierre-yves.david at logilab.fr]

# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1357266976 -3600
# Node ID 3fdab0013c838a19ef6c9891fc3f989e1ea37712
# Parent  585d2fbfbc2c5eb39b1c31193763fd581c41fef0
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