infinitepush: look up bookmarks only among bookmarks
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 05 Apr 2018 16:50:19 -0700
changeset 37453 2735d08e9788
parent 37452 2b38c80557a4
child 37454 0a9751ece252
infinitepush: look up bookmarks only among bookmarks Differential Revision: https://phab.mercurial-scm.org/D3165
hgext/infinitepush/bundleparts.py
--- a/hgext/infinitepush/bundleparts.py	Fri Apr 06 10:48:11 2018 -0700
+++ b/hgext/infinitepush/bundleparts.py	Thu Apr 05 16:50:19 2018 -0700
@@ -46,8 +46,9 @@
         params['bookmark'] = bookmark
         # 'prevbooknode' is necessary for pushkey reply part
         params['bookprevnode'] = ''
-        if bookmark in repo:
-            params['bookprevnode'] = repo[bookmark].hex()
+        bookmarks = repo._bookmarks
+        if bookmark in bookmarks:
+            params['bookprevnode'] = bookmarks.changectx(bookmark).hex()
 
     # Do not send pushback bundle2 part with bookmarks if remotenames extension
     # is enabled. It will be handled manually in `_push()`