Mercurial > hg

changeset 3614:fd7a018b7db7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try hgweb unbundle methods in the order presented by the server. If no common bundle format is found, push is aborted.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 02 Nov 2006 15:30:45 +0100
parents cbf352b9a3cd
children 1d2fdea875bc
files mercurial/httprepo.py
diffstat 1 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/httprepo.py	Thu Nov 02 14:58:55 2006 +0100
+++ b/mercurial/httprepo.py	Thu Nov 02 15:30:45 2006 +0100
@@ -350,14 +350,25 @@
         except AttributeError:
             unbundleversions = [""]
 
-        if "HG10GZ" in unbundleversions:
-            header = "HG10GZ"
-            z = zlib.compressobj()
-        else:
-            self.ui.note(_("server has no compression support, "
-                           "sending uncompressed"))
-            header = ""
-            z = nocompress()
+        while unbundleversions:
+            header = unbundleversions[0]
+            if header == "HG10GZ":
+                self.ui.note(_("using zlib compression\n"))
+                z = zlib.compressobj()
+                break
+            elif header == "HG10UN":
+                self.ui.note(_("using no compression\n"))
+                z = nocompress()
+                break
+            elif header == "":
+                self.ui.note(_("old server without compression support,"
+                               " sending uncompressed\n"))
+                z = nocompress()
+                break
+            unbundleversions.pop(0)
+        if not unbundleversions:
+            raise util.Abort(_("The server doesn't accept any bundle format"
+                               " method we know."))
 
         fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
         fp = os.fdopen(fd, 'wb+')