summaryrefslogtreecommitdiffstats
path: root/subcmds/rebase.py
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2020-02-12 14:58:39 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2020-02-12 06:36:22 +0000
commitabdf7500612f1d115863ba8f026ddbea1e5a1f28 (patch)
tree2b87f056bdf4fb53a170fc9121c2f5d1557bb48f /subcmds/rebase.py
parent0ab95ba6d010abe5d615fa070e404582aca1d90a (diff)
downloadgit-repo-abdf7500612f1d115863ba8f026ddbea1e5a1f28.tar.gz
Fix indentation issues reported by flake8
- E121 continuation line under-indented for hanging indent - E122 continuation line missing indentation or outdented - E125 continuation line with same indent as next logical line - E126 continuation line over-indented for hanging indent - E127 continuation line over-indented for visual indent - E128 continuation line under-indented for visual indent - E129 visually indented line with same indent as next logical line - E131 continuation line unaligned for hanging indent Fixed automatically with autopep8: git ls-files | grep py$ | xargs autopep8 --in-place \ --select E121,E122,E125,E126,E127,E128,E129,E131 Change-Id: Ifd95fb8e6a1a4d6e9de187b5787d64a6326dd249 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254605 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: David Pursehouse <dpursehouse@collab.net>
Diffstat (limited to 'subcmds/rebase.py')
-rw-r--r--subcmds/rebase.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index dcb8b2a3..eb92a3c7 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -43,8 +43,8 @@ branch but need to incorporate new upstream changes "underneath" them.
43 43
44 def _Options(self, p): 44 def _Options(self, p):
45 p.add_option('-i', '--interactive', 45 p.add_option('-i', '--interactive',
46 dest="interactive", action="store_true", 46 dest="interactive", action="store_true",
47 help="interactive rebase (single project only)") 47 help="interactive rebase (single project only)")
48 48
49 p.add_option('--fail-fast', 49 p.add_option('--fail-fast',
50 dest='fail_fast', action='store_true', 50 dest='fail_fast', action='store_true',
@@ -82,7 +82,7 @@ branch but need to incorporate new upstream changes "underneath" them.
82 file=sys.stderr) 82 file=sys.stderr)
83 if len(args) == 1: 83 if len(args) == 1:
84 print('note: project %s is mapped to more than one path' % (args[0],), 84 print('note: project %s is mapped to more than one path' % (args[0],),
85 file=sys.stderr) 85 file=sys.stderr)
86 return 1 86 return 1
87 87
88 # Setup the common git rebase args that we use for all projects. 88 # Setup the common git rebase args that we use for all projects.