[PATCH] wireproto: clarify cryptic 'unsynced changes' error message

Mads Kiilerich mads at kiilerich.com
Thu Apr 11 15:35:54 CDT 2013

# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1365684858 -7200
#      Thu Apr 11 14:54:18 2013 +0200
# Node ID e34e55c1738d828cd8406b234beae3ab8469ec16
# Parent  33c8339a9bcc40714df865a5bdc4cf9b1e669c48
wireproto: clarify cryptic 'unsynced changes' error message

The message was not very much to the point and did not in any way help an
ordinary user.

'repository changed while preparing/uploading bundle - please try again'
is more correct, gives the user some understanding of what is going on, and
tells how to 'recover' from the situation.

The 'bundle' aspect could be seen as an implementation detail that shouldn't be
mentioned, but I think it helps giving an exact error message.

The message could still leave the user wondering why Mercurial doesn't lock the
repo and how unsafe it thus is. Explaining that is however too much detail.

diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -602,7 +602,8 @@
     # fail early if possible
     if not check_heads():
-        return pusherr('unsynced changes')
+        return pusherr('repository changed while preparing bundle - '
+                       'please try again')
     # write bundle data to temporary file because it can be big
     fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
@@ -615,7 +616,8 @@
             if not check_heads():
                 # someone else committed/pushed/unbundled while we
                 # were transferring data
-                return pusherr('unsynced changes')
+                return pusherr('repository changed while uploading bundle - '
+                               'please try again')
             # push can proceed
diff --git a/tests/test-push-cgi.t b/tests/test-push-cgi.t
--- a/tests/test-push-cgi.t
+++ b/tests/test-push-cgi.t
@@ -35,17 +35,17 @@
   1 changesets found
-expect unsynced changes
+expect failure because heads doesn't match (formerly known as 'unsynced changes')
   $ QUERY_STRING="cmd=unbundle&heads=0000000000000000000000000000000000000000"; export QUERY_STRING
   $ python hgweb.cgi <bundle.hg >page1 2>&1
   $ cat page1
   Status: 200 Script output follows\r (esc)
   Content-Type: application/mercurial-0.1\r (esc)
-  Content-Length: 19\r (esc)
+  Content-Length: 63\r (esc)
   \r (esc)
-  unsynced changes
+  repository changed while preparing bundle - please try again
 successful force push

More information about the Mercurial-devel mailing list