Mercurial > hg-stable
changeset 27627:dcbba68e076f
histedit: hook afterresolvedstates
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 20:41:17 +0000 |
| parents | 157675d0f600 |
| children | 707d66afce21 |
| files | hgext/histedit.py tests/test-histedit-base.t tests/test-histedit-fold-non-commute.t tests/test-histedit-fold.t tests/test-histedit-non-commute.t |
| diffstat | 5 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Thu Dec 24 20:41:40 2015 +0000 +++ b/hgext/histedit.py Thu Dec 24 20:41:17 2015 +0000 @@ -1457,5 +1457,7 @@ cmdutil.unfinishedstates.append( ['histedit-state', False, True, _('histedit in progress'), _("use 'hg histedit --continue' or 'hg histedit --abort'")]) + cmdutil.afterresolvedstates.append( + ['histedit-state', _('hg histedit --continue')]) if ui.configbool("experimental", "histeditng"): globals()['base'] = addhisteditaction(['base', 'b'])(base)
--- a/tests/test-histedit-base.t Thu Dec 24 20:41:40 2015 +0000 +++ b/tests/test-histedit-base.t Thu Dec 24 20:41:17 2015 +0000 @@ -178,6 +178,7 @@ $ echo b2 > B $ hg resolve --mark B (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue | fixbundle $ hg tglog @ 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X'
--- a/tests/test-histedit-fold-non-commute.t Thu Dec 24 20:41:40 2015 +0000 +++ b/tests/test-histedit-fold-non-commute.t Thu Dec 24 20:41:17 2015 +0000 @@ -95,6 +95,7 @@ $ echo 'I can haz no commute' > e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ cat > cat.py <<EOF > import sys > print open(sys.argv[1]).read() @@ -128,6 +129,7 @@ $ hg revert -r 'p1()' e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle 7b4e2f4b7bcd: empty changeset @@ -255,6 +257,7 @@ $ echo 'I can haz no commute' > e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -266,6 +269,7 @@ $ hg revert -r 'p1()' e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle 7b4e2f4b7bcd: empty changeset
--- a/tests/test-histedit-fold.t Thu Dec 24 20:41:40 2015 +0000 +++ b/tests/test-histedit-fold.t Thu Dec 24 20:41:17 2015 +0000 @@ -305,6 +305,7 @@ $ hg revert -r 'p1()' file $ hg resolve --mark file (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 251d831eeec5: empty changeset saved backup bundle to $TESTTMP/*-backup.hg (glob) @@ -364,6 +365,7 @@ > EOF $ hg resolve --mark file (no more unresolved files) + continue: hg histedit --continue $ hg commit -m '+5.2' created new head $ echo 6 >> file
--- a/tests/test-histedit-non-commute.t Thu Dec 24 20:41:40 2015 +0000 +++ b/tests/test-histedit-non-commute.t Thu Dec 24 20:41:17 2015 +0000 @@ -153,6 +153,7 @@ $ echo 'I can haz no commute' > e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') @@ -165,6 +166,7 @@ $ hg revert -r 'p1()' e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle 7b4e2f4b7bcd: empty changeset @@ -236,6 +238,7 @@ $ echo 'I can haz no commute' > e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') @@ -244,6 +247,7 @@ $ hg revert -r 'p1()' e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle 7b4e2f4b7bcd: empty changeset