Patchwork D11693: backout: backed out changeset 6edc8800dbc3

login
register
mail settings
Submitter phabricator
Date Oct. 19, 2021, 5:05 p.m.
Message ID <differential-rev-PHID-DREV-ypq2hlnvwoi76xy4m5co-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50017/
State Superseded
Headers show

Comments

phabricator - Oct. 19, 2021, 5:05 p.m.
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Same as the previous changeset.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11693

AFFECTED FILES
  mercurial/dispatch.py
  tests/test-chg.t
  tests/test-commandserver.t
  tests/test-nointerrupt.t

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-nointerrupt.t b/tests/test-nointerrupt.t
--- a/tests/test-nointerrupt.t
+++ b/tests/test-nointerrupt.t
@@ -66,7 +66,7 @@ 
   $ sh -c "../send-signal.sh INT" &
   $ hg wait-signal
   interrupted!
-  [250]
+  [255]
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
@@ -77,7 +77,7 @@ 
   $ sh -c "../send-signal.sh INT" &
   $ hg wait-signal
   interrupted!
-  [250]
+  [255]
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
@@ -91,4 +91,4 @@ 
   press ^C again to terminate immediately (dangerous)
   end of unsafe operation
   interrupted!
-  [250]
+  [255]
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -792,7 +792,7 @@ 
   *** runcommand debugsuicide
   interrupted!
   killed!
-   [250]
+   [255]
 
 #endif
 
diff --git a/tests/test-chg.t b/tests/test-chg.t
--- a/tests/test-chg.t
+++ b/tests/test-chg.t
@@ -188,12 +188,12 @@ 
   $ chg bulkwrite --pager=on --color no --config ui.formatted=True
   paged! 'going to write massive data\n'
   killed! (?)
-  [250]
+  [255]
 
   $ chg bulkwrite --pager=on --color no --config ui.formatted=True
   paged! 'going to write massive data\n'
   killed! (?)
-  [250]
+  [255]
 
   $ cd ..
 
diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -311,10 +311,7 @@ 
             except IOError as inst:
                 if inst.errno != errno.EPIPE:
                     raise
-            if req.ui.configbool(b'ui', b'detailed-exit-code'):
-                ret = 250
-            else:
-                ret = -1
+            ret = -1
         finally:
             duration = util.timer() - starttime
             req.ui.flush()  # record blocked times