##// END OF EJS Templates
parser: shorten prefix of alias parsing errors...
Yuya Nishihara -
r29059:8eba4cdc default
parent child Browse files
Show More
@@ -447,15 +447,13 class basealiasrules(object):
447 447 repl = efmt = None
448 448 name, args, err = cls._builddecl(decl)
449 449 if err:
450 efmt = _('failed to parse the declaration of %(section)s '
451 '"%(name)s": %(error)s')
450 efmt = _('bad declaration of %(section)s "%(name)s": %(error)s')
452 451 else:
453 452 try:
454 453 repl = cls._builddefn(defn, args)
455 454 except error.ParseError as inst:
456 455 err = parseerrordetail(inst)
457 efmt = _('failed to parse the definition of %(section)s '
458 '"%(name)s": %(error)s')
456 efmt = _('bad definition of %(section)s "%(name)s": %(error)s')
459 457 if err:
460 458 err = efmt % {'section': cls._section, 'name': name, 'error': err}
461 459 return alias(name, args, err, repl)
@@ -3768,10 +3768,10 Unparsable alias:
3768 3768 $ hg debugtemplate --config templatealias.bad='x(' -v '{bad}'
3769 3769 (template
3770 3770 ('symbol', 'bad'))
3771 abort: failed to parse the definition of template alias "bad": at 2: not a prefix: end
3771 abort: bad definition of template alias "bad": at 2: not a prefix: end
3772 3772 [255]
3773 3773 $ hg log --config templatealias.bad='x(' -T '{bad}'
3774 abort: failed to parse the definition of template alias "bad": at 2: not a prefix: end
3774 abort: bad definition of template alias "bad": at 2: not a prefix: end
3775 3775 [255]
3776 3776
3777 3777 $ cd ..
@@ -1967,12 +1967,12 test unknown reference:
1967 1967 (func
1968 1968 ('symbol', 'unknownref')
1969 1969 ('symbol', '0'))
1970 abort: failed to parse the definition of revset alias "unknownref": invalid symbol '$2'
1970 abort: bad definition of revset alias "unknownref": invalid symbol '$2'
1971 1971 [255]
1972 1972
1973 1973 $ hg debugrevspec --debug --config revsetalias.anotherbadone='branch(' "tip"
1974 1974 ('symbol', 'tip')
1975 warning: failed to parse the definition of revset alias "anotherbadone": at 7: not a prefix: end
1975 warning: bad definition of revset alias "anotherbadone": at 7: not a prefix: end
1976 1976 * set:
1977 1977 <baseset [9]>
1978 1978 9
@@ -1985,7 +1985,7 test unknown reference:
1985 1985
1986 1986 $ hg debugrevspec --debug --config revsetalias.'bad name'='tip' "tip"
1987 1987 ('symbol', 'tip')
1988 warning: failed to parse the declaration of revset alias "bad name": at 4: invalid token
1988 warning: bad declaration of revset alias "bad name": at 4: invalid token
1989 1989 * set:
1990 1990 <baseset [9]>
1991 1991 9
General Comments 0
You need to be logged in to leave comments. Login now