Mercurial > hg
changeset 13774:1ce0e80799c0
ui: label prompts, default to yellow prompts
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 27 Mar 2011 12:59:25 +0200 |
| parents | e5390a8b56db |
| children | 930efdc6bfa4 |
| files | hgext/color.py mercurial/ui.py tests/test-diff-color.t |
| diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/color.py Sun Mar 27 12:41:55 2011 +0200 +++ b/hgext/color.py Sun Mar 27 12:59:25 2011 +0200 @@ -107,6 +107,7 @@ 'diff.trailingwhitespace': 'bold red_background', 'diffstat.deleted': 'red', 'diffstat.inserted': 'green', + 'ui.prompt': 'yellow', 'log.changeset': 'yellow', 'resolve.resolved': 'green bold', 'resolve.unresolved': 'red bold',
--- a/mercurial/ui.py Sun Mar 27 12:41:55 2011 +0200 +++ b/mercurial/ui.py Sun Mar 27 12:59:25 2011 +0200 @@ -483,7 +483,7 @@ self.write(msg, ' ', default, "\n") return default try: - r = self._readline(msg + ' ') + r = self._readline(self.label(msg, 'ui.prompt') + ' ') if not r: return default return r
--- a/tests/test-diff-color.t Sun Mar 27 12:41:55 2011 +0200 +++ b/tests/test-diff-color.t Sun Mar 27 12:59:25 2011 +0200 @@ -81,7 +81,7 @@ \x1b[0;36;1mold mode 100644\x1b[0m (esc) \x1b[0;36;1mnew mode 100755\x1b[0m (esc) 1 hunks, 1 lines changed - examine changes to 'a'? [Ynsfdaq?] + \x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m (esc) \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) c a @@ -91,7 +91,7 @@ a a c - record this change to 'a'? [Ynsfdaq?] + \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) $ echo $ echo "[extensions]" >> $HGRCPATH @@ -110,7 +110,7 @@ \x1b[0;36;1mold mode 100644\x1b[0m (esc) \x1b[0;36;1mnew mode 100755\x1b[0m (esc) 1 hunks, 1 lines changed - examine changes to 'a'? [Ynsfdaq?] + \x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m (esc) \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) c a @@ -120,6 +120,6 @@ a a c - record this change to 'a'? [Ynsfdaq?] + \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) $ echo