Patchwork [5,of,5,more-in-stack] readbundle: map 'HG10UN' to None compression

login
register
mail settings
Submitter Pierre-Yves David
Date Sept. 18, 2015, 12:18 a.m.
Message ID <53cbea54e9ed42f147b5.1442535526@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/10533/
State Accepted
Headers show

Comments

Pierre-Yves David - Sept. 18, 2015, 12:18 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1442016416 25200
#      Fri Sep 11 17:06:56 2015 -0700
# Node ID 53cbea54e9ed42f147b5d83dd7efeda3cb2fe2cb
# Parent  c337ca94e665c36bdf3eb5053d061148cbf333b2
readbundle: map 'HG10UN' to None compression

In line with the other previous changes
Matt Mackall - Sept. 18, 2015, 12:34 a.m.
On Thu, 2015-09-17 at 17:18 -0700, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1442016416 25200
> #      Fri Sep 11 17:06:56 2015 -0700
> # Node ID 53cbea54e9ed42f147b5d83dd7efeda3cb2fe2cb
> # Parent  c337ca94e665c36bdf3eb5053d061148cbf333b2
> readbundle: map 'HG10UN' to None compression

These are queued for default, thanks.

Patch

diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -78,15 +78,15 @@  def combineresults(results):
     elif changedheads < 0:
         result = -1 + changedheads
     return result
 
 bundletypes = {
-    "": ("", 'UN'),       # 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
-    "HG10UN": ("HG10UN", 'UN'),
+    "HG10UN": ("HG10UN", None),
     "HG10BZ": ("HG10", 'BZ'),
     "HG10GZ": ("HG10GZ", 'GZ'),
 }
 
 # hgweb uses this list to communicate its preferred type