Show More
@@ -398,13 +398,11 b' class colorui(uimod.ui):' | |||||
398 | *[self.label(str(a), label) for a in args], **opts) |
|
398 | *[self.label(str(a), label) for a in args], **opts) | |
399 |
|
399 | |||
400 | def showlabel(self, msg, label): |
|
400 | def showlabel(self, msg, label): | |
401 | if ' ' in label: |
|
|||
402 | label = '[' + label + ']' |
|
|||
403 | if label: |
|
401 | if label: | |
404 | if msg and msg[-1] == '\n': |
|
402 | if msg and msg[-1] == '\n': | |
405 |
return "%s |
|
403 | return "[%s|%s]\n" % (label, msg[:-1]) | |
406 | else: |
|
404 | else: | |
407 |
return "%s |
|
405 | return "[%s|%s]" % (label, msg) | |
408 | else: |
|
406 | else: | |
409 | return msg |
|
407 | return msg | |
410 |
|
408 |
@@ -21,12 +21,12 b' hg status in repo root:' | |||||
21 | \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4min_root\x1b[0m (esc) |
|
21 | \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4min_root\x1b[0m (esc) | |
22 |
|
22 | |||
23 | $ hg status --color=debug |
|
23 | $ hg status --color=debug | |
24 |
status.unknown |
|
24 | [status.unknown|? ][status.unknown|a/1/in_a_1] | |
25 |
status.unknown |
|
25 | [status.unknown|? ][status.unknown|a/in_a] | |
26 |
status.unknown |
|
26 | [status.unknown|? ][status.unknown|b/1/in_b_1] | |
27 |
status.unknown |
|
27 | [status.unknown|? ][status.unknown|b/2/in_b_2] | |
28 |
status.unknown |
|
28 | [status.unknown|? ][status.unknown|b/in_b] | |
29 |
status.unknown |
|
29 | [status.unknown|? ][status.unknown|in_root] | |
30 |
|
30 | |||
31 | hg status . in repo root: |
|
31 | hg status . in repo root: | |
32 |
|
32 | |||
@@ -146,11 +146,11 b' Make sure ui.formatted=False works' | |||||
146 | adding modified |
|
146 | adding modified | |
147 | adding removed |
|
147 | adding removed | |
148 | $ hg log --color=debug |
|
148 | $ hg log --color=debug | |
149 |
[log.changeset changeset.draft |
|
149 | [log.changeset changeset.draft|changeset: 0:389aef86a55e] | |
150 |
log.tag |
|
150 | [log.tag|tag: tip] | |
151 |
log.user |
|
151 | [log.user|user: test] | |
152 |
log.date |
|
152 | [log.date|date: Thu Jan 01 00:00:00 1970 +0000] | |
153 |
log.summary |
|
153 | [log.summary|summary: initial checkin] | |
154 |
|
154 | |||
155 | $ touch modified added unknown ignored |
|
155 | $ touch modified added unknown ignored | |
156 | $ hg add added |
|
156 | $ hg add added |
General Comments 0
You need to be logged in to leave comments.
Login now