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