Patchwork [09,of,14,V3] pull: preindent some code

login
register
mail settings
Submitter Boris Feld
Date Jan. 19, 2018, 11:47 p.m.
Message ID <1bbb83b1ccd5ff07b4d9.1516405634@FB>
Download mbox | patch
Permalink /patch/26993/
State Accepted
Headers show

Comments

Boris Feld - Jan. 19, 2018, 11:47 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1516194826 -3600
#      Wed Jan 17 14:13:46 2018 +0100
# Node ID 1bbb83b1ccd5ff07b4d9863f6fa1472bd2ffb34a
# Parent  6c54ed31dd5dbc8ba7de011517ce9c595787ad7d
# EXP-Topic b2-stream
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 1bbb83b1ccd5
pull: preindent some code

Next changesets will add support for using stream cloning with bundle2. We
introduce indentation change first for clarity.

Patch

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1461,10 +1461,11 @@  def _pullbundle2(pullop):
     kwargs['common'] = pullop.common
     kwargs['heads'] = pullop.heads or pullop.rheads
 
-    # pulling changegroup
-    pullop.stepsdone.add('changegroup')
+    if True:
+        # pulling changegroup
+        pullop.stepsdone.add('changegroup')
 
-    kwargs['cg'] = pullop.fetch
+        kwargs['cg'] = pullop.fetch
 
     legacyphase = 'phases' in ui.configlist('devel', 'legacy.exchange')
     hasbinaryphase = 'heads' in pullop.remotebundle2caps.get('phases', ())