wireproto: do not hash when heads == ['force']
authorMartin Geisler <mg@aragost.com>
Tue, 24 May 2011 16:12:01 +0200
changeset 14419 ede7cea1550f
parent 14418 0174d1f79280
child 14420 137b03b5aea1
wireproto: do not hash when heads == ['force'] Changeset 88f0e41d8802 introduced the unbundlehash capability and unconditionally hashed the heads on the client side. By mistake, the heads were also cased in the heads == ['force'] case.
mercurial/wireproto.py
--- a/mercurial/wireproto.py	Tue May 24 14:21:04 2011 +0200
+++ b/mercurial/wireproto.py	Tue May 24 16:12:01 2011 +0200
@@ -139,7 +139,7 @@
         remote server as a bundle. Return an integer indicating the
         result of the push (see localrepository.addchangegroup()).'''
 
-        if self.capable('unbundlehash'):
+        if heads != ['force'] and self.capable('unbundlehash'):
             heads = encodelist(['hashed',
                                 util.sha1(''.join(sorted(heads))).digest()])
         else: