[PATCH] wireproto: rephase the error message for unknown getbundle parameters

pierre-yves.david at ens-lyon.org pierre-yves.david at ens-lyon.org
Mon Jun 2 14:48:45 CDT 2014


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1401227131 25200
#      Tue May 27 14:45:31 2014 -0700
# Node ID 044630b9aa690782ee08f523b4b8735d99f05d57
# Parent  25732fab4dc35a76cfb8f659fde48c7e0dc42dbf
wireproto: rephase the error message for unknown getbundle parameters

In case of an unknown parameter passed to ``getbundle``, the server prints a
message and ignores the parameter. This message was misleadingly prefixed with
"abort: ". The use of "abort: " here is clearly wrong as nothing is actually
aborted and the ``getbundle`` call proceeds without the parameter.

The message is now prefixed with "warning: " and rephrased to make it clearer
that the parameter was simply ignored.

diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -505,11 +505,11 @@ def options(cmd, keys, others):
     for k in keys:
         if k in others:
             opts[k] = others[k]
             del others[k]
     if others:
-        sys.stderr.write("abort: %s got unexpected arguments %s\n"
+        sys.stderr.write("warning: %s ignores unexpected arguments %s\n"
                          % (cmd, ",".join(others)))
     return opts
 
 # list of commands
 commands = {}


More information about the Mercurial-devel mailing list