This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3288

discovery: use command executor interface
ClosedPublic

Authored by indygreg on Apr 12 2018, 3:59 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1964d2d1f421: discovery: use command executor interface
Summary

We're trying to port all wire protocol code to use the new
interface so we can implement wire protocol version 2 clients.

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

indygreg created this revision.Apr 12 2018, 3:59 PM
indygreg updated this revision to Diff 8127.Apr 13 2018, 3:14 PM
durin42 accepted this revision.Apr 13 2018, 5:48 PM
This revision is now accepted and ready to land.Apr 13 2018, 5:48 PM
Closed by commit rHG1964d2d1f421: discovery: use command executor interface (authored by indygreg). · Explain WhyApr 13 2018, 6:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/discovery.py (12 lines)

Diff 8173

mercurial/discovery.py

""" """
repo = pushop.repo.unfiltered() repo = pushop.repo.unfiltered()
remote = pushop.remote remote = pushop.remote
outgoing = pushop.outgoing outgoing = pushop.outgoing
cl = repo.changelog cl = repo.changelog
headssum = {} headssum = {}
# A. Create set of branches involved in the push. # A. Create set of branches involved in the push.
branches = set(repo[n].branch() for n in outgoing.missing) branches = set(repo[n].branch() for n in outgoing.missing)
remotemap = remote.branchmap()
with remote.commandexecutor() as e:
remotemap = e.callcommand('branchmap', {}).result()
newbranches = branches - set(remotemap) newbranches = branches - set(remotemap)
branches.difference_update(newbranches) branches.difference_update(newbranches)
# A. register remote heads # A. register remote heads
remotebranches = set() remotebranches = set()
for branch, heads in remotemap.iteritems(): for branch, heads in remotemap.iteritems():
remotebranches.add(branch) remotebranches.add(branch)
known = [] known = []
unsynced = [] unsynced = []
return {None: (oldheads, newheads, unsynced, [])} return {None: (oldheads, newheads, unsynced, [])}
def _nowarnheads(pushop): def _nowarnheads(pushop):
# Compute newly pushed bookmarks. We don't warn about bookmarked heads. # Compute newly pushed bookmarks. We don't warn about bookmarked heads.
repo = pushop.repo.unfiltered() repo = pushop.repo.unfiltered()
remote = pushop.remote remote = pushop.remote
localbookmarks = repo._bookmarks localbookmarks = repo._bookmarks
remotebookmarks = remote.listkeys('bookmarks')
with remote.commandexecutor() as e:
remotebookmarks = e.callcommand('listkeys', {
'namespace': 'bookmarks',
}).result()
bookmarkedheads = set() bookmarkedheads = set()
# internal config: bookmarks.pushing # internal config: bookmarks.pushing
newbookmarks = [localbookmarks.expandname(b) newbookmarks = [localbookmarks.expandname(b)
for b in pushop.ui.configlist('bookmarks', 'pushing')] for b in pushop.ui.configlist('bookmarks', 'pushing')]
for bm in localbookmarks: for bm in localbookmarks:
rnode = remotebookmarks.get(bm) rnode = remotebookmarks.get(bm)