[PATCH 2 of 3 RFC] streamclone: indent code

Gregory Szorc gregory.szorc at gmail.com
Sat Jan 2 21:15:52 CST 2016


# HG changeset patch
# User Gregory Szorc <gregory.szorc at gmail.com>
# Date 1451779896 28800
#      Sat Jan 02 16:11:36 2016 -0800
# Node ID 59042fecfa95376b35b22c97b8b71d3a02d26832
# Parent  db897fc9ce7714b016a5a87e239d2e4ff95839bd
streamclone: indent code

This will make the subsequent patch easier to read.

diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py
--- a/mercurial/streamclone.py
+++ b/mercurial/streamclone.py
@@ -301,35 +301,36 @@ def consumev1(repo, fp, filecount, bytec
         repo.ui.status(_('%d files to transfer, %s of data\n') %
                        (filecount, util.bytecount(bytecount)))
         handled_bytes = 0
         repo.ui.progress(_('clone'), 0, total=bytecount)
         start = time.time()
 
         tr = repo.transaction(_('clone'))
         try:
-            for i in xrange(filecount):
-                # XXX doesn't support '\n' or '\r' in filenames
-                l = fp.readline()
-                try:
-                    name, size = l.split('\0', 1)
-                    size = int(size)
-                except (ValueError, TypeError):
-                    raise error.ResponseError(
-                        _('unexpected response from remote server:'), l)
-                if repo.ui.debugflag:
-                    repo.ui.debug('adding %s (%s)\n' %
-                                  (name, util.bytecount(size)))
-                # for backwards compat, name was partially encoded
-                with repo.svfs(store.decodedir(name), 'w') as ofp:
-                    for chunk in util.filechunkiter(fp, limit=size):
-                        handled_bytes += len(chunk)
-                        repo.ui.progress(_('clone'), handled_bytes,
-                                         total=bytecount)
-                        ofp.write(chunk)
+            if True:
+                for i in xrange(filecount):
+                    # XXX doesn't support '\n' or '\r' in filenames
+                    l = fp.readline()
+                    try:
+                        name, size = l.split('\0', 1)
+                        size = int(size)
+                    except (ValueError, TypeError):
+                        raise error.ResponseError(
+                            _('unexpected response from remote server:'), l)
+                    if repo.ui.debugflag:
+                        repo.ui.debug('adding %s (%s)\n' %
+                                      (name, util.bytecount(size)))
+                    # for backwards compat, name was partially encoded
+                    with repo.svfs(store.decodedir(name), 'w') as ofp:
+                        for chunk in util.filechunkiter(fp, limit=size):
+                            handled_bytes += len(chunk)
+                            repo.ui.progress(_('clone'), handled_bytes,
+                                             total=bytecount)
+                            ofp.write(chunk)
             tr.close()
         finally:
             tr.release()
 
         # Writing straight to files circumvented the inmemory caches
         repo.invalidate()
 
         elapsed = time.time() - start


More information about the Mercurial-devel mailing list