evolve: unindent some lines caught by flake8 stable
authorAnton Shestakov <av6@dwimlabs.net>
Wed, 13 Feb 2019 21:39:10 +0800
branchstable
changeset 4463 7d54a538dd1e
parent 4462 7b13256a6a8e
child 4464 05f8908df4ce
child 4479 2db0aca03a88
evolve: unindent some lines caught by flake8 The message was: "E117 over-indented".
hgext3rd/evolve/cmdrewrite.py
hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/cmdrewrite.py	Wed Feb 13 21:56:29 2019 +0800
+++ b/hgext3rd/evolve/cmdrewrite.py	Wed Feb 13 21:39:10 2019 +0800
@@ -169,7 +169,7 @@
         for chunk, label in patch.diffui(repo, p1.node(), old.node(),
                                          match=matcher,
                                          opts=diffopts):
-                fp.write(chunk)
+            fp.write(chunk)
         newnode = _editandapply(ui, repo, pats, old, p1, fp, diffopts)
         if newnode == old.node():
             raise error.Abort(_("nothing changed"))
@@ -205,7 +205,7 @@
             for chunk, label in patch.diffui(repo, p1.node(), old.node(),
                                              match=restmatcher,
                                              opts=diffopts):
-                    afp.write(chunk)
+                afp.write(chunk)
 
         user_patch = afp.getvalue()
         if not user_patch:
@@ -582,7 +582,7 @@
     fp = stringio()
     for chunk, label in patch.diffui(repo, tempnode, old.node(), None,
                                      opts=diffopts):
-            fp.write(chunk)
+        fp.write(chunk)
 
     fp.seek(0)
     newnode = _patchtocommit(ui, repo, old, fp)
@@ -613,7 +613,7 @@
         raise error.Abort(_("nothing selected to uncommit"))
     fp = stringio()
     for c in chunks:
-            c.write(fp)
+        c.write(fp)
 
     fp.seek(0)
     oldnode = node.hex(old.node())[:12]
--- a/hgext3rd/evolve/evolvecmd.py	Wed Feb 13 21:56:29 2019 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Feb 13 21:39:10 2019 +0800
@@ -172,7 +172,7 @@
             repo.ui.write(_('atop:'))
             displayer.show(target)
     if confirm and ui.prompt('perform evolve? [Ny]', 'n') != 'y':
-            raise error.Abort(_('evolve aborted by user'))
+        raise error.Abort(_('evolve aborted by user'))
     if progresscb:
         progresscb()
     todo = 'hg rebase -r %s -d %s\n' % (orig, target)
@@ -897,7 +897,7 @@
         # uurrgs
         # there no other topic setter yet
         if not orig.topic() and repo.vfs.exists('topic'):
-                repo.vfs.unlink('topic')
+            repo.vfs.unlink('topic')
         else:
             with repo.vfs.open('topic', 'w') as f:
                 f.write(orig.topic())