Show More
@@ -69,6 +69,8 b' HGPLAINEXCEPT' | |||||
69 | Preserve internationalization. |
|
69 | Preserve internationalization. | |
70 | ``revsetalias`` |
|
70 | ``revsetalias`` | |
71 | Don't remove revset aliases. |
|
71 | Don't remove revset aliases. | |
|
72 | ``templatealias`` | |||
|
73 | Don't remove template aliases. | |||
72 | ``progress`` |
|
74 | ``progress`` | |
73 | Don't hide progress output. |
|
75 | Don't hide progress output. | |
74 |
|
76 |
@@ -192,6 +192,9 b' class ui(object):' | |||||
192 | if self.plain('revsetalias'): |
|
192 | if self.plain('revsetalias'): | |
193 | for k, v in cfg.items('revsetalias'): |
|
193 | for k, v in cfg.items('revsetalias'): | |
194 | del cfg['revsetalias'][k] |
|
194 | del cfg['revsetalias'][k] | |
|
195 | if self.plain('templatealias'): | |||
|
196 | for k, v in cfg.items('templatealias'): | |||
|
197 | del cfg['templatealias'][k] | |||
195 |
|
198 | |||
196 | if trusted: |
|
199 | if trusted: | |
197 | self._tcfg.update(cfg) |
|
200 | self._tcfg.update(cfg) |
@@ -3756,6 +3756,13 b' Aliases in formatter:' | |||||
3756 | default 6:d41e714fe50d |
|
3756 | default 6:d41e714fe50d | |
3757 | foo 4:bbe44766e73d |
|
3757 | foo 4:bbe44766e73d | |
3758 |
|
3758 | |||
|
3759 | Aliases should honor HGPLAIN: | |||
|
3760 | ||||
|
3761 | $ HGPLAIN= hg log -r0 -T 'nothing expanded:{rn}\n' | |||
|
3762 | nothing expanded: | |||
|
3763 | $ HGPLAINEXCEPT=templatealias hg log -r0 -T '{rn}\n' | |||
|
3764 | 0:1e4e1b8f71e0 | |||
|
3765 | ||||
3759 | Unparsable alias: |
|
3766 | Unparsable alias: | |
3760 |
|
3767 | |||
3761 | $ hg debugtemplate --config templatealias.bad='x(' -v '{bad}' |
|
3768 | $ hg debugtemplate --config templatealias.bad='x(' -v '{bad}' |
General Comments 0
You need to be logged in to leave comments.
Login now