Mercurial > hg

changeset 15326:8ae2900d6d9b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: disambiguous the node variable The module could be confused with the function.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Fri, 21 Oct 2011 14:15:58 +0200
parents cdf1daa3b83f
children 67e92d29ecb5
files mercurial/revset.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revset.py	Fri Oct 21 12:12:21 2011 -0500
+++ b/mercurial/revset.py	Fri Oct 21 14:15:58 2011 +0200
@@ -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 @@
             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())