This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3292

bookmarks: use command executor for wire protocol commands
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGadd129811176: bookmarks: use command executor for wire protocol commands
Summary

And change the name of a variable to reflect that is is a peer.

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 8131.Apr 13 2018, 3:14 PM
durin42 added a subscriber: durin42.Apr 13 2018, 5:53 PM

btw, I don't love how this looks, it feels like we could probably revisit letting "normal" function calls work for one-shot requests like this, but let's do it later once we map the new wireproto world a little more

durin42 accepted this revision.Apr 13 2018, 5:53 PM
This revision is now accepted and ready to land.Apr 13 2018, 5:53 PM
Closed by commit rHGadd129811176: bookmarks: use command executor for wire protocol commands (authored by indygreg). · Explain WhyApr 13 2018, 6:09 PM
This revision was automatically updated to reflect the committed changes.
indygreg added a comment.Apr 13 2018, 6:11 PM
In D3292#53207, @durin42 wrote:

btw, I don't love how this looks, it feels like we could probably revisit letting "normal" function calls work for one-shot requests like this, but let's do it later once we map the new wireproto world a little more

I’m not opposed to providing a helper method that wraps and makes the consumer simpler. Where my mind is at is that proto v2 commands will be smaller and we’ll issue more of them. I wanted to make batching and transfer semantics for half-duplex connections explicit.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (16 lines)

Diff 8177

mercurial/bookmarks.py

if changed: if changed:
tr = trfunc() tr = trfunc()
changes = [] changes = []
for b, node, writer, msg in sorted(changed): for b, node, writer, msg in sorted(changed):
changes.append((b, node)) changes.append((b, node))
writer(msg) writer(msg)
localmarks.applychanges(repo, tr, changes) localmarks.applychanges(repo, tr, changes)
def incoming(ui, repo, other): def incoming(ui, repo, peer):
'''Show bookmarks incoming from other to repo '''Show bookmarks incoming from other to repo
''' '''
ui.status(_("searching for changed bookmarks\n")) ui.status(_("searching for changed bookmarks\n"))
remotemarks = unhexlifybookmarks(other.listkeys('bookmarks')) with peer.commandexecutor() as e:
remotemarks = unhexlifybookmarks(e.callcommand('listkeys', {
'namespace': 'bookmarks',
}).result())
r = comparebookmarks(repo, remotemarks, repo._bookmarks) r = comparebookmarks(repo, remotemarks, repo._bookmarks)
addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r
incomings = [] incomings = []
if ui.debugflag: if ui.debugflag:
getid = lambda id: id getid = lambda id: id
else: else:
getid = lambda id: id[:12] getid = lambda id: id[:12]
ui.status(_("no changed bookmarks found\n")) ui.status(_("no changed bookmarks found\n"))
return 1 return 1
for s in sorted(outgoings): for s in sorted(outgoings):
ui.write(s) ui.write(s)
return 0 return 0
def summary(repo, other): def summary(repo, peer):
'''Compare bookmarks between repo and other for "hg summary" output '''Compare bookmarks between repo and other for "hg summary" output
This returns "(# of incoming, # of outgoing)" tuple. This returns "(# of incoming, # of outgoing)" tuple.
''' '''
remotemarks = unhexlifybookmarks(other.listkeys('bookmarks')) with peer.commandexecutor() as e:
remotemarks = unhexlifybookmarks(e.callcommand('listkeys', {
'namespace': 'bookmarks',
}).result())
r = comparebookmarks(repo, remotemarks, repo._bookmarks) r = comparebookmarks(repo, remotemarks, repo._bookmarks)
addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r
return (len(addsrc), len(adddst)) return (len(addsrc), len(adddst))
def validdest(repo, old, new): def validdest(repo, old, new):
"""Is the new bookmark destination a valid update from the old one""" """Is the new bookmark destination a valid update from the old one"""
repo = repo.unfiltered() repo = repo.unfiltered()
if old == new: if old == new: