Mercurial > evolve
changeset 4403:8b3172c8f753
evolve: unindent some lines caught by flake8
The message was: "E117 over-indented".
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 13 Feb 2019 21:39:10 +0800 |
parents | cdc095c32e01 |
children | 51b0185a0e7b |
files | hgext3rd/evolve/cmdrewrite.py hgext3rd/evolve/evolvecmd.py |
diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py Wed Feb 13 12:46:57 2019 +0100 +++ b/hgext3rd/evolve/cmdrewrite.py Wed Feb 13 21:39:10 2019 +0800 @@ -168,7 +168,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")) @@ -204,7 +204,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: @@ -580,7 +580,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) @@ -611,7 +611,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 12:46:57 2019 +0100 +++ b/hgext3rd/evolve/evolvecmd.py Wed Feb 13 21:39:10 2019 +0800 @@ -165,7 +165,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) @@ -963,7 +963,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())