dispatch: exit with status 1 for an InterventionRequired exception (bc)

mercurial/dispatch.py

@@ -153,6 +153,7 b' def _runcatch(req):'
             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:

tests/test-histedit-fold.t

@@ -183,7 +183,7 b' folding and creating no new change doesn'
   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 b' dropped revision.'
   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

tests/test-histedit-obsolete.t

@@ -141,7 +141,7 b' Test that rewriting leaving instability '
   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 b' New-commit as draft (default)'
   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 b' New-commit as draft (default)'
   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

tests/test-rebase-abort.t

@@ -56,7 +56,7 b' Conflicting rebase:'
   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 b' Rebase and abort without generating new '
   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'

tests/test-rebase-bookmarks.t

@@ -142,7 +142,7 b' rebase --continue with bookmarks present'
   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

tests/test-rebase-check-restore.t

@@ -70,7 +70,7 b' Rebasing B onto E - check keep: and phas'
   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 b' Rebase F onto E - check keepbranches:'
   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:
 

tests/test-rebase-conflicts.t

@@ -66,7 +66,7 b' Conflicting rebase:'
   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:
 

tests/test-rebase-detach.t

@@ -373,7 +373,7 b' Ensure --continue restores a correct sta'
   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)

tests/test-rebase-interruptions.t

@@ -62,7 +62,7 b' Rebasing B onto E:'
   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 b' Resume the rebasing:'
   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 b' Rebasing B onto E:'
   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 b' Rebasing B onto E:'
   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'
 

tests/test-rebase-mq-skip.t

@@ -109,7 +109,7 b' already has one local mq patch'
 
   $ HGMERGE=internal:fail hg rebase
   unresolved conflicts (see hg resolve, then hg rebase --continue)
-  [255]
+  [1]
 
   $ HGMERGE=internal:local hg resolve --all
 

tests/test-rebase-mq.t

@@ -64,7 +64,7 b' Rebase - generate a conflict:'
   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 b' Fix the 1st conflict:'
   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:
 

tests/test-rebase-parameters.t

@@ -417,7 +417,7 b' Test --tool parameter:'
 
   $ hg rebase -s 2 -d 1 --tool internal:fail
   unresolved conflicts (see hg resolve, then hg rebase --continue)
-  [255]
+  [1]
 
   $ hg resolve -l
   U c2