[PATCH 6 of 6] revert: remove nullrev from the bookmark computation

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu Sep 18 16:40:59 CDT 2014

# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1411009019 25200
#      Wed Sep 17 19:56:59 2014 -0700
# Node ID 8d2c99203baf20aaab22d260d22fadbf0e42a7df
# Parent  ac8639727377910aacfcd326bd3dec008a577b82
revert: remove nullrev from the bookmark computation

Same as for other revset we sanitize the content of the set to be able to rely
on it more.

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -465,10 +465,11 @@ def bookmark(repo, subset, x):
             for bmrev in matchrevs:
         bms = set([repo[r].rev()
                    for r in repo._bookmarks.values()])
+    bms -= set([node.nullrev])
     return subset.filter(bms.__contains__)
 def branch(repo, subset, x):
     """``branch(string or set)``
     All changesets belonging to the given branch or the branches of the given

More information about the Mercurial-devel mailing list