Submitter | Boris Feld |
---|---|
Date | Nov. 2, 2017, 1:18 p.m. |
Message ID | <1d6e6f7bf4dd82ebb78e.1509628685@FB> |
Download | mbox | patch |
Permalink | /patch/25336/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -896,8 +896,10 @@ def _pushb2bookmarks(pushop, bundler): if 'bookmarks' in pushop.stepsdone: return b2caps = bundle2.bundle2caps(pushop.remote) - if 'pushkey' not in b2caps: - return + if 'pushkey' in b2caps: + return _pushb2bookmarkspushkey(pushop, bundler) + +def _pushb2bookmarkspushkey(pushop, bundler): pushop.stepsdone.add('bookmarks') part2book = [] enc = pushkey.encode