[PATCH] revset: disambiguous the node variable

pierre-yves.david at logilab.fr pierre-yves.david at logilab.fr
Fri Oct 21 11:49:59 CDT 2011


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1319199358 -7200
# Branch stable
# Node ID e810e28d0b191450e88132288c5d12881dc226df
# Parent  1ae824142c0157f350e1e01cf3e23fbf01a1f722
revset: disambiguous the node variable

The module could be confused with the function.

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -4,11 +4,12 @@
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 import re
-import parser, util, error, discovery, hbisect, node
+import parser, util, error, discovery, hbisect
+import node as nodemod
 import bookmarks as bookmarksmod
 import match as matchmod
 from i18n import _
 
 elements = {
@@ -1088,11 +1089,11 @@ def formatspec(expr, *args):
             return quote(arg)
         elif c == 'r':
             parse(arg) # make sure syntax errors are confined
             return '(%s)' % arg
         elif c == 'n':
-            return quote(node.hex(arg))
+            return quote(nodemod.hex(arg))
         elif c == 'b':
             return quote(arg.branch())
 
     ret = ''
     pos = 0


More information about the Mercurial-devel mailing list