Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 27626:157675d0f600
rebase: hook afterresolvedstates
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 20:41:40 +0000 |
| parents | 42910f9fffeb |
| children | f2b8b4e2de20 |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Dec 24 20:46:06 2015 +0000 +++ b/hgext/rebase.py Thu Dec 24 20:41:40 2015 +0000 @@ -1239,6 +1239,8 @@ cmdutil.unfinishedstates.append( ['rebasestate', False, False, _('rebase in progress'), _("use 'hg rebase --continue' or 'hg rebase --abort'")]) + cmdutil.afterresolvedstates.append( + ['rebasestate', _('hg rebase --continue')]) # ensure rebased rev are not hidden extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible) revsetpredicate.setup()