[PATCH 2 of 5 STABLE] bookmark: simplify mutability check in `validdest`

Pierre-Yves David pierre-yves.david at ens-lyon.org
Wed Oct 24 17:32:19 CDT 2012


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1351092400 -7200
# Branch stable
# Node ID 751708f1d8dfdd497532ca0111074a927bce708e
# Parent  c142c250a12c75a8485cc636a9b64eab1fd82cd8
bookmark: simplify mutability check in `validdest`

There is no need to check phase by hand. We already have a ctx method for that.

diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -7,7 +7,7 @@
 
 from mercurial.i18n import _
 from mercurial.node import hex
-from mercurial import encoding, error, util, obsolete, phases
+from mercurial import encoding, error, util, obsolete
 import errno, os
 
 def read(repo):
@@ -264,7 +264,7 @@
             plen = len(validdests)
             succs = set(c.node() for c in validdests)
             for c in validdests:
-                if c.phase() > phases.public:
+                if c.mutable():
                     # obsolescence marker does not apply to public changeset
                     succs.update(obsolete.allsuccessors(repo.obsstore,
                                                         [c.node()]))


More information about the Mercurial-devel mailing list