diff options
| author | Conley Owens <cco3@android.com> | 2012-10-09 14:29:46 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-09 14:29:46 -0700 |
| commit | 3a6cd4200e42fbb5a21b3fb8d3c9738c0320cc63 (patch) | |
| tree | 68ae5094d6530453887fb35a73fd5fa55f55a034 /subcmds/rebase.py | |
| parent | 25f17682ca4ecd8acc887462d4bebc7c429cf110 (diff) | |
| parent | 8a68ff96057ec58e524a3e41a2d8dca7b5d016bc (diff) | |
| download | git-repo-3a6cd4200e42fbb5a21b3fb8d3c9738c0320cc63.tar.gz | |
Merge "Coding style cleanup"
Diffstat (limited to 'subcmds/rebase.py')
| -rw-r--r-- | subcmds/rebase.py | 6 |
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: |