This revision was automatically updated to reflect the committed changes. Closed by commit rHG2735d08e9788: infinitepush: look up bookmarks only among bookmarks (authored by martinvonz, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3165?vs=7820&id=7859 REVISION DETAIL https://phab.mercurial-scm.org/D3165 AFFECTED FILES hgext/infinitepush/bundleparts.py CHANGE DETAILS 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()` To: martinvonz, #hg-reviewers, indygreg Cc: indygreg, smf, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
