comparison mercurial/exchange.py @ 29704:b8f9cdca8807 stable

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
comparison
equal deleted inserted replaced
29668:09a5699cc3cb 29704:b8f9cdca8807
854 if bundler.nbparts <= 1: 854 if bundler.nbparts <= 1:
855 return 855 return
856 stream = util.chunkbuffer(bundler.getchunks()) 856 stream = util.chunkbuffer(bundler.getchunks())
857 try: 857 try:
858 try: 858 try:
859 reply = pushop.remote.unbundle(stream, ['force'], 'push') 859 reply = pushop.remote.unbundle(
860 stream, ['force'], pushop.remote.url())
860 except error.BundleValueError as exc: 861 except error.BundleValueError as exc:
861 raise error.Abort(_('missing support for %s') % exc) 862 raise error.Abort(_('missing support for %s') % exc)
862 try: 863 try:
863 trgetter = None 864 trgetter = None
864 if pushback: 865 if pushback: