summaryrefslogtreecommitdiffstats
path: root/subcmds/rebase.py
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2012-09-24 12:15:13 +0900
committerGustaf Lundh <gustaf.lundh@sonymobile.com>2012-10-09 12:45:30 +0200
commit8a68ff96057ec58e524a3e41a2d8dca7b5d016bc (patch)
tree22f6971e8d3c4a90d11d3704602d073a852328b4 /subcmds/rebase.py
parente3b1c45aebed329cbc9ad172b1d8e812cf208117 (diff)
downloadgit-repo-8a68ff96057ec58e524a3e41a2d8dca7b5d016bc.tar.gz
Coding style cleanup
Fix the following issues reported by pylint: C0321: More than one statement on a single line W0622: Redefining built-in 'name' W0612: Unused variable 'name' W0613: Unused argument 'name' W0102: Dangerous default value 'value' as argument W0105: String statement has no effect Also fixed a few cases of inconsistent indentation. Change-Id: Ie0db839e7c57d576cff12d8c055fe87030d00744
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 2c1752d7..a8d58cdb 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -55,14 +55,14 @@ branch but need to incorporate new upstream changes "underneath" them.
55 help='Stash local modifications before starting') 55 help='Stash local modifications before starting')
56 56
57 def Execute(self, opt, args): 57 def Execute(self, opt, args):
58 all = self.GetProjects(args) 58 all_projects = self.GetProjects(args)
59 one_project = len(all) == 1 59 one_project = len(all_projects) == 1
60 60
61 if opt.interactive and not one_project: 61 if opt.interactive and not one_project:
62 print >>sys.stderr, 'error: interactive rebase not supported with multiple projects' 62 print >>sys.stderr, 'error: interactive rebase not supported with multiple projects'
63 return -1 63 return -1
64 64
65 for project in all: 65 for project in all_projects:
66 cb = project.CurrentBranch 66 cb = project.CurrentBranch
67 if not cb: 67 if not cb:
68 if one_project: 68 if one_project: