# HG changeset patch # User Pierre-Yves David # Date 2011-10-21 12:15:58 # Node ID 8ae2900d6d9b47486dbb8c9c21bb0d425680eb82 # Parent cdf1daa3b83f6b0d56f9b84722421ae2172e80bc 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 @@ -6,7 +6,8 @@ # 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 _ @@ -1092,7 +1093,7 @@ def formatspec(expr, *args): 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())