Mercurial > hg
changeset 18935:e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Fri, 08 Feb 2013 16:17:46 -0600 |
| parents | 93f3a06b2035 |
| children | 1fa4edb8456e |
| files | mercurial/dispatch.py tests/test-histedit-fold.t tests/test-histedit-obsolete.t tests/test-rebase-abort.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 | 12 files changed, 21 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Fri Feb 08 16:27:49 2013 -0600 +++ b/mercurial/dispatch.py Fri Feb 08 16:17:46 2013 -0600 @@ -153,6 +153,7 @@ commands.help_(ui, 'shortlist') except error.InterventionRequired, inst: ui.warn("%s\n" % inst) + return 1 except util.Abort, inst: ui.warn(_("abort: %s\n") % inst) if inst.hint:
--- a/tests/test-histedit-fold.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-histedit-fold.t Fri Feb 08 16:17:46 2013 -0600 @@ -183,7 +183,7 @@ warning: conflicts during merge. merging file incomplete! (edit conflicts, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue - [255] + [1] There were conflicts, we keep P1 content. This should effectively drop the changes from +6. $ hg status @@ -248,7 +248,7 @@ warning: conflicts during merge. merging file incomplete! (edit conflicts, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue - [255] + [1] $ cat > file << EOF > 1 > 2
--- a/tests/test-histedit-obsolete.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-histedit-obsolete.t Fri Feb 08 16:17:46 2013 -0600 @@ -141,7 +141,7 @@ adding c Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. - [255] + [1] $ echo c >> c $ hg histedit --continue 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -280,7 +280,7 @@ adding f Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. - [255] + [1] $ echo f >> f $ hg histedit --continue 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -330,7 +330,7 @@ adding f Make changes as needed, you may commit or record as needed now. When you are finished, run hg histedit --continue to resume. - [255] + [1] $ echo f >> f $ hg histedit --continue 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rebase-abort.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-abort.t Fri Feb 08 16:17:46 2013 -0600 @@ -56,7 +56,7 @@ warning: conflicts during merge. merging common incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Abort: @@ -127,7 +127,7 @@ warning: conflicts during merge. merging c incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] $ hg tglog @ 4:draft 'C1'
--- a/tests/test-rebase-bookmarks.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-bookmarks.t Fri Feb 08 16:17:46 2013 -0600 @@ -142,7 +142,7 @@ warning: conflicts during merge. merging c incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] $ echo 'c' > c $ hg resolve --mark c $ hg rebase --continue
--- a/tests/test-rebase-check-restore.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-check-restore.t Fri Feb 08 16:17:46 2013 -0600 @@ -70,7 +70,7 @@ warning: conflicts during merge. merging A incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Solve the conflict and go on: @@ -123,7 +123,7 @@ warning: conflicts during merge. merging A incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Solve the conflict and go on:
--- a/tests/test-rebase-conflicts.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-conflicts.t Fri Feb 08 16:17:46 2013 -0600 @@ -66,7 +66,7 @@ warning: conflicts during merge. merging common incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Try to continue without solving the conflict:
--- a/tests/test-rebase-detach.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-detach.t Fri Feb 08 16:17:46 2013 -0600 @@ -373,7 +373,7 @@ warning: conflicts during merge. merging H incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] $ hg resolve --all -t internal:local $ hg rebase -c saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
--- a/tests/test-rebase-interruptions.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-interruptions.t Fri Feb 08 16:17:46 2013 -0600 @@ -62,7 +62,7 @@ warning: conflicts during merge. merging A incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Force a commit on C during the interruption: @@ -98,7 +98,7 @@ warning: conflicts during merge. merging A incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Solve the conflict and go on: @@ -152,7 +152,7 @@ warning: conflicts during merge. merging A incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Force a commit on B' during the interruption: @@ -223,7 +223,7 @@ warning: conflicts during merge. merging A incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Change phase on B and B'
--- a/tests/test-rebase-mq-skip.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-mq-skip.t Fri Feb 08 16:17:46 2013 -0600 @@ -109,7 +109,7 @@ $ HGMERGE=internal:fail hg rebase unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] $ HGMERGE=internal:local hg resolve --all
--- a/tests/test-rebase-mq.t Fri Feb 08 16:27:49 2013 -0600 +++ b/tests/test-rebase-mq.t Fri Feb 08 16:17:46 2013 -0600 @@ -64,7 +64,7 @@ warning: conflicts during merge. merging f incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Fix the 1st conflict: @@ -75,7 +75,7 @@ warning: conflicts during merge. merging f incomplete! (edit conflicts, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] + [1] Fix the 2nd conflict: