This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3165

infinitepush: look up bookmarks only among bookmarks
ClosedPublic

Authored by martinvonz on Apr 6 2018, 1:59 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2735d08e9788: infinitepush: look up bookmarks only among bookmarks
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 6 2018, 1:59 PM
martinvonz updated this revision to Diff 7820.Apr 6 2018, 7:42 PM
indygreg added subscribers: smf, indygreg.Apr 7 2018, 1:36 AM
indygreg accepted this revision.

These changes all seem reasonable to me. And I'm pretty sure I use you and @smf discussing this in IRC. So LGTM.

This revision is now accepted and ready to land.Apr 7 2018, 1:36 AM
Closed by commit rHG2735d08e9788: infinitepush: look up bookmarks only among bookmarks (authored by martinvonz). · Explain WhyApr 7 2018, 1:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/infinitepush/bundleparts.py (5 lines)

Diff 7859

hgext/infinitepush/bundleparts.py

cg = changegroup.makestream(repo, outgoing, cgversion, 'push') cg = changegroup.makestream(repo, outgoing, cgversion, 'push')
params = {} params = {}
params['cgversion'] = cgversion params['cgversion'] = cgversion
if bookmark: if bookmark:
params['bookmark'] = bookmark params['bookmark'] = bookmark
# 'prevbooknode' is necessary for pushkey reply part # 'prevbooknode' is necessary for pushkey reply part
params['bookprevnode'] = '' params['bookprevnode'] = ''
if bookmark in repo: bookmarks = repo._bookmarks
params['bookprevnode'] = repo[bookmark].hex() if bookmark in bookmarks:
params['bookprevnode'] = bookmarks.changectx(bookmark).hex()
# Do not send pushback bundle2 part with bookmarks if remotenames extension # Do not send pushback bundle2 part with bookmarks if remotenames extension
# is enabled. It will be handled manually in `_push()` # is enabled. It will be handled manually in `_push()`
if not isremotebooksenabled(ui): if not isremotebooksenabled(ui):
params['pushbackbookmarks'] = '1' params['pushbackbookmarks'] = '1'
parts = [] parts = []