# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1393829451 -32400
# Node ID 5d4606bec54ca81274ac3d70e48c7d01f0209e23
# Parent  0b04ee8e789df77f7fdfac6635e0f5d652196283
cmdserver: mask return code of runcommand in the same way as dispatch.run

"hg help" does not state that the code for abort is 255, but it's confusing
to have different code between hg command and command server.

Tests of python-hglib 1.2 passed with this change.

diff -r 0b04ee8e789d -r 5d4606bec54c mercurial/commandserver.py
--- a/mercurial/commandserver.py	Mon Mar 03 15:50:48 2014 +0900
+++ b/mercurial/commandserver.py	Mon Mar 03 15:50:51 2014 +0900
@@ -193,7 +193,7 @@
         req = dispatch.request(args[:], copiedui, self.repo, self.cin,
                                self.cout, self.cerr)
 
-        ret = dispatch.dispatch(req) or 0 # might return None
+        ret = (dispatch.dispatch(req) or 0) & 255 # might return None
 
         # restore old cwd
         if '--cwd' in args:
diff -r 0b04ee8e789d -r 5d4606bec54c tests/test-commandserver.py
--- a/tests/test-commandserver.py	Mon Mar 03 15:50:48 2014 +0900
+++ b/tests/test-commandserver.py	Mon Mar 03 15:50:51 2014 +0900
@@ -104,6 +104,9 @@
     # make sure --config doesn't stick
     runcommand(server, ['id'])
 
+    # negative return code should be masked
+    runcommand(server, ['id', '-runknown'])
+
 def inputeof(server):
     readchannel(server)
     server.stdin.write('runcommand\n')
diff -r 0b04ee8e789d -r 5d4606bec54c tests/test-commandserver.py.out
--- a/tests/test-commandserver.py.out	Mon Mar 03 15:50:48 2014 +0900
+++ b/tests/test-commandserver.py.out	Mon Mar 03 15:50:51 2014 +0900
@@ -43,6 +43,9 @@
 000000000000
  runcommand id
 000000000000 tip
+ runcommand id -runknown
+abort: unknown revision 'unknown'!
+ [255]
 
 testing inputeof: