comparison mercurial/revset.py @ 15326:8ae2900d6d9b stable

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 5edaf47cd462
comparison
equal deleted inserted replaced
15325:cdf1daa3b83f 15326:8ae2900d6d9b
4 # 4 #
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 import re 8 import re
9 import parser, util, error, discovery, hbisect, node 9 import parser, util, error, discovery, hbisect
10 import node as nodemod
10 import bookmarks as bookmarksmod 11 import bookmarks as bookmarksmod
11 import match as matchmod 12 import match as matchmod
12 from i18n import _ 13 from i18n import _
13 14
14 elements = { 15 elements = {
1090 return quote(arg) 1091 return quote(arg)
1091 elif c == 'r': 1092 elif c == 'r':
1092 parse(arg) # make sure syntax errors are confined 1093 parse(arg) # make sure syntax errors are confined
1093 return '(%s)' % arg 1094 return '(%s)' % arg
1094 elif c == 'n': 1095 elif c == 'n':
1095 return quote(node.hex(arg)) 1096 return quote(nodemod.hex(arg))
1096 elif c == 'b': 1097 elif c == 'b':
1097 return quote(arg.branch()) 1098 return quote(arg.branch())
1098 1099
1099 ret = '' 1100 ret = ''
1100 pos = 0 1101 pos = 0