D3292: bookmarks: use command executor for wire protocol commands
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Fri Apr 13 18:09:50 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGadd129811176: bookmarks: use command executor for wire protocol commands (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3292?vs=8131&id=8177
REVISION DETAIL
https://phab.mercurial-scm.org/D3292
AFFECTED FILES
mercurial/bookmarks.py
CHANGE DETAILS
diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -646,12 +646,16 @@
writer(msg)
localmarks.applychanges(repo, tr, changes)
-def incoming(ui, repo, other):
+def incoming(ui, repo, peer):
'''Show bookmarks incoming from other to repo
'''
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)
addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r
@@ -733,12 +737,16 @@
return 0
-def summary(repo, other):
+def summary(repo, peer):
'''Compare bookmarks between repo and other for "hg summary" output
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)
addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r
return (len(addsrc), len(adddst))
To: indygreg, #hg-reviewers, durin42
Cc: durin42, mercurial-devel
More information about the Mercurial-devel
mailing list