Mercurial > public > mercurial-scm > hg-stable

diff mercurial/exchange.py @ 29659:b8f9cdca8807 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: correctly specify url to unbundle (issue5145) This parameter is slightly confusingly named in wireproto, so it got mis-specified from the start as 'push' instead of the URL to which we are pushing. Sigh. I've got a patch for that which I'll mail separately since it's not really appropriate for stable. Fixes a regression in bundle2 from bundle1.
author Augie Fackler <augie@google.com>
date Fri, 05 Aug 2016 16:25:15 -0400
parents 98e8313dcd9e
children 531e85eec23c
line wrap: on
line diff
--- a/mercurial/exchange.py	Mon Aug 01 17:38:01 2016 -0700
+++ b/mercurial/exchange.py	Fri Aug 05 16:25:15 2016 -0400
@@ -856,7 +856,8 @@
     stream = util.chunkbuffer(bundler.getchunks())
     try:
         try:
-            reply = pushop.remote.unbundle(stream, ['force'], 'push')
+            reply = pushop.remote.unbundle(
+                stream, ['force'], pushop.remote.url())
         except error.BundleValueError as exc:
             raise error.Abort(_('missing support for %s') % exc)
         try: