##// END OF EJS Templates
summary: indicate if a rebase is underway
Bryan O'Sullivan -
r19214:0250047a default
parent child Browse files
Show More
@@ -60,6 +60,9 b' Default effects may be overridden from y'
60 60 tags.normal = green
61 61 tags.local = black bold
62 62
63 rebase.rebased = blue
64 rebase.remaining = red bold
65
63 66 The available effects in terminfo mode are 'blink', 'bold', 'dim',
64 67 'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
65 68 ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and
@@ -250,6 +253,8 b' except ImportError:'
250 253 'diffstat.inserted': 'green',
251 254 'ui.prompt': 'yellow',
252 255 'log.changeset': 'yellow',
256 'rebase.rebased': 'blue',
257 'rebase.remaining': 'red bold',
253 258 'resolve.resolved': 'green bold',
254 259 'resolve.unresolved': 'red bold',
255 260 'status.added': 'green bold',
@@ -779,6 +779,17 b' def pullrebase(orig, ui, repo, *args, **'
779 779 raise util.Abort(_('--tool can only be used with --rebase'))
780 780 orig(ui, repo, *args, **opts)
781 781
782 def summaryhook(ui, repo):
783 if not os.path.exists(repo.join('rebasestate')):
784 return
785 state = restorestatus(repo)[2]
786 numrebased = len([i for i in state.itervalues() if i != -1])
787 # i18n: column positioning for "hg summary"
788 ui.write(_('rebase: %s, %s (rebase --continue)\n') %
789 (ui.label(_('%d rebased'), 'rebase.rebased') % numrebased,
790 ui.label(_('%d remaining'), 'rebase.remaining') %
791 (len(state) - numrebased)))
792
782 793 def uisetup(ui):
783 794 'Replace pull with a decorator to provide --rebase option'
784 795 entry = extensions.wrapcommand(commands.table, 'pull', pullrebase)
@@ -786,3 +797,4 b' def uisetup(ui):'
786 797 _("rebase working directory to branch head")))
787 798 entry[1].append(('t', 'tool', '',
788 799 _("specify merge tool for rebase")))
800 cmdutil.summaryhooks.add('rebase', summaryhook)
@@ -427,6 +427,7 b' Test --tool parameter:'
427 427 branch: default
428 428 commit: 1 modified, 1 unresolved (merge)
429 429 update: (current)
430 rebase: 0 rebased, 1 remaining (rebase --continue)
430 431
431 432 $ hg resolve -l
432 433 U c2
General Comments 0
You need to be logged in to leave comments. Login now