Mercurial > hg
changeset 27626:157675d0f600
rebase: hook afterresolvedstates
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 20:41:40 +0000 |
| parents | cdb9493a7e2f |
| children | dcbba68e076f |
| files | hgext/rebase.py tests/test-largefiles-update.t tests/test-rebase-bookmarks.t tests/test-rebase-check-restore.t tests/test-rebase-conflicts.t tests/test-rebase-detach.t tests/test-rebase-interruptions.t tests/test-rebase-mq-skip.t tests/test-rebase-mq.t tests/test-rebase-parameters.t |
| diffstat | 10 files changed, 13 insertions(+), 0 deletions(-) [+] |
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()
--- a/tests/test-largefiles-update.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-largefiles-update.t Thu Dec 24 20:41:40 2015 +0000 @@ -590,6 +590,7 @@ $ echo "manually modified before 'hg rebase --continue'" > large1 $ hg resolve -m normal1 (no more unresolved files) + continue: hg rebase --continue $ hg rebase --continue --config ui.interactive=True <<EOF > c > EOF
--- a/tests/test-rebase-bookmarks.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-bookmarks.t Thu Dec 24 20:41:40 2015 +0000 @@ -176,6 +176,7 @@ $ echo 'c' > c $ hg resolve --mark c (no more unresolved files) + continue: hg rebase --continue $ hg rebase --continue rebasing 3:3d5fa227f4b5 "C" (Y Z) saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-backup.hg (glob)
--- a/tests/test-rebase-check-restore.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-check-restore.t Thu Dec 24 20:41:40 2015 +0000 @@ -78,6 +78,7 @@ $ rm A.orig $ hg resolve -m A (no more unresolved files) + continue: hg rebase --continue $ hg rebase --continue already rebased 1:27547f69f254 "B" as 45396c49d53b rebasing 2:965c486023db "C" @@ -134,6 +135,7 @@ $ rm A.orig $ hg resolve -m A (no more unresolved files) + continue: hg rebase --continue $ hg rebase --continue rebasing 5:01e6ebbd8272 "F" (tip) saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob)
--- a/tests/test-rebase-conflicts.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-conflicts.t Thu Dec 24 20:41:40 2015 +0000 @@ -83,6 +83,7 @@ $ echo 'resolved merge' >common $ hg resolve -m common (no more unresolved files) + continue: hg rebase --continue $ hg rebase --continue already rebased 3:3163e20567cc "L1" as 3e046f2ecedb rebasing 4:46f0b057b5c0 "L2"
--- a/tests/test-rebase-detach.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-detach.t Thu Dec 24 20:41:40 2015 +0000 @@ -391,6 +391,7 @@ [1] $ hg resolve --all -t internal:local (no more unresolved files) + continue: hg rebase --continue $ hg rebase -c rebasing 8:6215fafa5447 "H2" (tip) note: rebase of 8:6215fafa5447 created no changes to commit
--- a/tests/test-rebase-interruptions.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-interruptions.t Thu Dec 24 20:41:40 2015 +0000 @@ -107,6 +107,7 @@ $ rm A.orig $ hg resolve -m A (no more unresolved files) + continue: hg rebase --continue $ hg rebase --continue already rebased 1:27547f69f254 "B" as 45396c49d53b
--- a/tests/test-rebase-mq-skip.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-mq-skip.t Thu Dec 24 20:41:40 2015 +0000 @@ -155,6 +155,7 @@ $ HGMERGE=internal:local hg resolve --all (no more unresolved files) + continue: hg rebase --continue $ hg rebase --continue already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44
--- a/tests/test-rebase-mq.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-mq.t Thu Dec 24 20:41:40 2015 +0000 @@ -70,6 +70,7 @@ $ echo mq1r1 > f $ hg resolve -m f (no more unresolved files) + continue: hg rebase --continue $ hg rebase -c rebasing 2:3504f44bffc0 "P0" (f.patch qbase) rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) @@ -83,6 +84,7 @@ $ echo mq1r1mq2 > f $ hg resolve -m f (no more unresolved files) + continue: hg rebase --continue $ hg rebase -c already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c rebasing 3:929394423cd3 "P1" (f2.patch qtip)
--- a/tests/test-rebase-parameters.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-parameters.t Thu Dec 24 20:41:40 2015 +0000 @@ -484,6 +484,7 @@ $ hg resolve -m c2 (no more unresolved files) + continue: hg rebase --continue $ hg rebase -c --tool internal:fail rebasing 2:e4e3f3546619 "c2b" (tip) note: rebase of 2:e4e3f3546619 created no changes to commit