changeset 26272:59c410db8c68

readbundle: fix typo of None compression The test simulates pre-d1b16a746db6 hgweb that sends "unbundle" capability with no argument.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 18 Sep 2015 21:32:43 +0900
parents a0eff7ebc2ae
children 8d49d4899b0f
files mercurial/changegroup.py tests/test-push-http-bundle1.t
diffstat 2 files changed, 31 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/changegroup.py	Fri Sep 11 17:06:56 2015 -0700
+++ b/mercurial/changegroup.py	Fri Sep 18 21:32:43 2015 +0900
@@ -80,7 +80,7 @@
     return result
 
 bundletypes = {
-    "": ("", 'None'),     # only when using unbundle on ssh and old http servers
+    "": ("", None),       # only when using unbundle on ssh and old http servers
                           # since the unification ssh accepts a header but there
                           # is no capability signaling it.
     "HG20": (), # special-cased below
--- a/tests/test-push-http-bundle1.t	Fri Sep 11 17:06:56 2015 -0700
+++ b/tests/test-push-http-bundle1.t	Fri Sep 18 21:32:43 2015 +0900
@@ -114,6 +114,36 @@
   $ hg rollback
   repository tip rolled back to revision 0 (undo serve)
 
+expect success, pre-d1b16a746db6 server supports the unbundle capability, but
+has no parameter
+
+  $ cat <<EOF > notcapable-unbundleparam.py
+  > from mercurial import extensions, httppeer
+  > def capable(orig, self, name):
+  >     if name == 'unbundle':
+  >         return True
+  >     return orig(self, name)
+  > def uisetup(ui):
+  >     extensions.wrapfunction(httppeer.httppeer, 'capable', capable)
+  > EOF
+  $ cp $HGRCPATH $HGRCPATH.orig
+  $ cat <<EOF >> $HGRCPATH
+  > [extensions]
+  > notcapable-unbundleparam = `pwd`/notcapable-unbundleparam.py
+  > EOF
+  $ req
+  pushing to http://localhost:$HGPORT/
+  searching for changes
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
+  remote: changegroup hook: * (glob)
+  % serve errors
+  $ hg rollback
+  repository tip rolled back to revision 0 (undo serve)
+  $ mv $HGRCPATH.orig $HGRCPATH
+
 expect push success, phase change failure
 
   $ cat > .hg/hgrc <<EOF