Show More
@@ -63,6 +63,8 b' Default effects may be overridden from y' | |||||
63 | rebase.rebased = blue |
|
63 | rebase.rebased = blue | |
64 | rebase.remaining = red bold |
|
64 | rebase.remaining = red bold | |
65 |
|
65 | |||
|
66 | histedit.remaining = red bold | |||
|
67 | ||||
66 | The available effects in terminfo mode are 'blink', 'bold', 'dim', |
|
68 | The available effects in terminfo mode are 'blink', 'bold', 'dim', | |
67 | 'inverse', 'invisible', 'italic', 'standout', and 'underline'; in |
|
69 | 'inverse', 'invisible', 'italic', 'standout', and 'underline'; in | |
68 | ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and |
|
70 | ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and | |
@@ -251,6 +253,7 b' except ImportError:' | |||||
251 | 'diff.trailingwhitespace': 'bold red_background', |
|
253 | 'diff.trailingwhitespace': 'bold red_background', | |
252 | 'diffstat.deleted': 'red', |
|
254 | 'diffstat.deleted': 'red', | |
253 | 'diffstat.inserted': 'green', |
|
255 | 'diffstat.inserted': 'green', | |
|
256 | 'histedit.remaining': 'red bold', | |||
254 | 'ui.prompt': 'yellow', |
|
257 | 'ui.prompt': 'yellow', | |
255 | 'log.changeset': 'yellow', |
|
258 | 'log.changeset': 'yellow', | |
256 | 'rebase.rebased': 'blue', |
|
259 | 'rebase.rebased': 'blue', |
@@ -856,3 +856,16 b' def cleanupnode(ui, repo, name, nodes):' | |||||
856 | repair.strip(ui, repo, c) |
|
856 | repair.strip(ui, repo, c) | |
857 | finally: |
|
857 | finally: | |
858 | lockmod.release(lock) |
|
858 | lockmod.release(lock) | |
|
859 | ||||
|
860 | def summaryhook(ui, repo): | |||
|
861 | if not os.path.exists(repo.join('histedit-state')): | |||
|
862 | return | |||
|
863 | (parentctxnode, rules, keep, topmost, replacements) = readstate(repo) | |||
|
864 | if rules: | |||
|
865 | # i18n: column positioning for "hg summary" | |||
|
866 | ui.write(_('hist: %s (histedit --continue)\n') % | |||
|
867 | (ui.label(_('%d remaining'), 'histedit.remaining') % | |||
|
868 | len(rules))) | |||
|
869 | ||||
|
870 | def extsetup(ui): | |||
|
871 | cmdutil.summaryhooks.add('histedit', summaryhook) |
@@ -159,6 +159,7 b' check histedit_source' | |||||
159 | branch: default |
|
159 | branch: default | |
160 | commit: 1 added (new branch head) |
|
160 | commit: 1 added (new branch head) | |
161 | update: 1 new changesets (update) |
|
161 | update: 1 new changesets (update) | |
|
162 | hist: 1 remaining (histedit --continue) | |||
162 |
|
163 | |||
163 | $ HGEDITOR='true' hg histedit --continue |
|
164 | $ HGEDITOR='true' hg histedit --continue | |
164 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
165 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now