Mercurial > hg

changeset 13747:cede00420e1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
code indentation fixes
author Patrick Mezard <pmezard@gmail.com>
date Wed, 23 Mar 2011 23:33:14 +0100
parents d80b768545cb
children 26f8844d1757
files mercurial/commands.py mercurial/repair.py
diffstat 2 files changed, 29 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Jul 07 00:06:59 2010 +0200
+++ b/mercurial/commands.py	Wed Mar 23 23:33:14 2011 +0100
@@ -1234,39 +1234,39 @@
     """lists the contents of a bundle"""
     f = url.open(ui, bundlepath)
     try:
-            gen = changegroup.readbundle(f, bundlepath)
-            if all:
-                ui.write("format: id, p1, p2, cset, len(delta)\n")
-
-                def showchunks(named):
-                    ui.write("\n%s\n" % named)
-                    while 1:
-                        chunkdata = gen.parsechunk()
-                        if not chunkdata:
-                            break
-                        node = chunkdata['node']
-                        p1 = chunkdata['p1']
-                        p2 = chunkdata['p2']
-                        cs = chunkdata['cs']
-                        delta = chunkdata['data']
-                        ui.write("%s %s %s %s %s\n" %
-                                 (hex(node), hex(p1), hex(p2),
-                                  hex(cs), len(delta)))
-
-                showchunks("changelog")
-                showchunks("manifest")
-                while 1:
-                    fname = gen.chunk()
-                    if not fname:
-                        break
-                    showchunks(fname)
-            else:
+        gen = changegroup.readbundle(f, bundlepath)
+        if all:
+            ui.write("format: id, p1, p2, cset, len(delta)\n")
+
+            def showchunks(named):
+                ui.write("\n%s\n" % named)
                 while 1:
                     chunkdata = gen.parsechunk()
                     if not chunkdata:
                         break
                     node = chunkdata['node']
-                    ui.write("%s\n" % hex(node))
+                    p1 = chunkdata['p1']
+                    p2 = chunkdata['p2']
+                    cs = chunkdata['cs']
+                    delta = chunkdata['data']
+                    ui.write("%s %s %s %s %s\n" %
+                             (hex(node), hex(p1), hex(p2),
+                              hex(cs), len(delta)))
+
+            showchunks("changelog")
+            showchunks("manifest")
+            while 1:
+                fname = gen.chunk()
+                if not fname:
+                    break
+                showchunks(fname)
+        else:
+            while 1:
+                chunkdata = gen.parsechunk()
+                if not chunkdata:
+                    break
+                node = chunkdata['node']
+                ui.write("%s\n" % hex(node))
     finally:
         f.close()
 
--- a/mercurial/repair.py	Wed Jul 07 00:06:59 2010 +0200
+++ b/mercurial/repair.py	Wed Mar 23 23:33:14 2011 +0100
@@ -46,7 +46,7 @@
         # less than striprev (those will be broken by strip)
         for lrev in links:
             if lrev < striprev:
-                        s.add(lrev)
+                s.add(lrev)
 
     collectone(repo.manifest)
     for fname in files: