Patchwork D3165: infinitepush: look up bookmarks only among bookmarks

login
register
mail settings
Submitter phabricator
Date April 6, 2018, 11:42 p.m.
Message ID <559d84ec787fda202e25a13297729e6d@localhost.localdomain>
Download mbox | patch
Permalink /patch/30478/
State Not Applicable
Headers show

Comments

phabricator - April 6, 2018, 11:42 p.m.
martinvonz updated this revision to Diff 7820.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3165?vs=7792&id=7820

REVISION DETAIL
  https://phab.mercurial-scm.org/D3165

AFFECTED FILES
  hgext/infinitepush/bundleparts.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/infinitepush/bundleparts.py b/hgext/infinitepush/bundleparts.py
--- a/hgext/infinitepush/bundleparts.py
+++ b/hgext/infinitepush/bundleparts.py
@@ -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()`