Mercurial > hg
changeset 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 | 09a5699cc3cb |
| children | a12d13eac513 |
| files | mercurial/exchange.py tests/test-bundle2-exchange.t tests/test-hook.t |
| diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
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:
--- a/tests/test-bundle2-exchange.t Mon Aug 01 17:38:01 2016 -0700 +++ b/tests/test-bundle2-exchange.t Fri Aug 05 16:25:15 2016 -0400 @@ -257,7 +257,7 @@ remote: lock: free remote: wlock: free remote: postclose-tip:eea13746799a public book_eea1 - remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob) + remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/other (glob) updating bookmark book_eea1 pre-close-tip:02de42196ebe draft book_02de postclose-tip:02de42196ebe draft book_02de
--- a/tests/test-hook.t Mon Aug 01 17:38:01 2016 -0700 +++ b/tests/test-hook.t Fri Aug 05 16:25:15 2016 -0400 @@ -236,9 +236,9 @@ searching for changes no changes found pretxnopen hook: HG_TXNID=TXN:* HG_TXNNAME=push (glob) - pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_PENDING=$TESTTMP/a HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob) + pretxnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_PENDING=$TESTTMP/a HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/a (glob) pushkey hook: HG_KEY=foo HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_RET=1 - txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob) + txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=file:$TESTTMP/a (glob) exporting bookmark foo [1] $ cd ../a @@ -271,7 +271,7 @@ listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} no changes found pretxnopen hook: HG_TXNID=TXN:* HG_TXNNAME=push (glob) - prepushkey.forbid hook: HG_BUNDLE2=1 HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_SOURCE=push HG_TXNID=TXN:* HG_URL=push (glob) + prepushkey.forbid hook: HG_BUNDLE2=1 HG_KEY=baz HG_NAMESPACE=bookmarks HG_NEW=0000000000000000000000000000000000000000 HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/a (glob) pushkey-abort: prepushkey hook exited with status 1 abort: exporting bookmark baz failed! [255]