Patchwork D3289: streamclone: use command executor for wire protocol commands

login
register
mail settings
Submitter phabricator
Date April 13, 2018, 7:14 p.m.
Message ID <86e22a37906f3be8466c3972a62e69b5@localhost.localdomain>
Download mbox | patch
Permalink /patch/30869/
State Not Applicable
Headers show

Comments

phabricator - April 13, 2018, 7:14 p.m.
indygreg updated this revision to Diff 8128.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3289?vs=8082&id=8128

REVISION DETAIL
  https://phab.mercurial-scm.org/D3289

AFFECTED FILES
  mercurial/streamclone.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py
--- a/mercurial/streamclone.py
+++ b/mercurial/streamclone.py
@@ -126,11 +126,18 @@ 
     # creation.
     rbranchmap = None
     if remote.capable('branchmap'):
-        rbranchmap = remote.branchmap()
+        with remote.commandexecutor() as e:
+            rbranchmap = e.callcommand('branchmap', {}).result()
 
     repo.ui.status(_('streaming all changes\n'))
 
-    fp = remote.stream_out()
+    with remote.commandexecutor() as e:
+        fp = e.callcommand('stream_out', {}).result()
+
+    # TODO strictly speaking, this code should all be inside the context
+    # manager because the context manager is supposed to ensure all wire state
+    # is flushed when exiting. But the legacy peers don't do this, so it
+    # doesn't matter.
     l = fp.readline()
     try:
         resp = int(l)