diff options
Diffstat (limited to 'subcmds/upload.py')
| -rw-r--r-- | subcmds/upload.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py index c9312973..685e3420 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py | |||
| @@ -40,8 +40,8 @@ def _die(fmt, *args): | |||
| 40 | 40 | ||
| 41 | def _SplitEmails(values): | 41 | def _SplitEmails(values): |
| 42 | result = [] | 42 | result = [] |
| 43 | for str in values: | 43 | for value in values: |
| 44 | result.extend([s.strip() for s in str.split(',')]) | 44 | result.extend([s.strip() for s in value.split(',')]) |
| 45 | return result | 45 | return result |
| 46 | 46 | ||
| 47 | class Upload(InteractiveCommand): | 47 | class Upload(InteractiveCommand): |
| @@ -174,15 +174,15 @@ Gerrit Code Review: http://code.google.com/p/gerrit/ | |||
| 174 | 174 | ||
| 175 | if answer is None: | 175 | if answer is None: |
| 176 | date = branch.date | 176 | date = branch.date |
| 177 | list = branch.commits | 177 | commit_list = branch.commits |
| 178 | 178 | ||
| 179 | print 'Upload project %s/ to remote branch %s:' % (project.relpath, project.revisionExpr) | 179 | print 'Upload project %s/ to remote branch %s:' % (project.relpath, project.revisionExpr) |
| 180 | print ' branch %s (%2d commit%s, %s):' % ( | 180 | print ' branch %s (%2d commit%s, %s):' % ( |
| 181 | name, | 181 | name, |
| 182 | len(list), | 182 | len(commit_list), |
| 183 | len(list) != 1 and 's' or '', | 183 | len(commit_list) != 1 and 's' or '', |
| 184 | date) | 184 | date) |
| 185 | for commit in list: | 185 | for commit in commit_list: |
| 186 | print ' %s' % commit | 186 | print ' %s' % commit |
| 187 | 187 | ||
| 188 | sys.stdout.write('to %s (y/N)? ' % remote.review) | 188 | sys.stdout.write('to %s (y/N)? ' % remote.review) |
| @@ -212,17 +212,17 @@ Gerrit Code Review: http://code.google.com/p/gerrit/ | |||
| 212 | for branch in avail: | 212 | for branch in avail: |
| 213 | name = branch.name | 213 | name = branch.name |
| 214 | date = branch.date | 214 | date = branch.date |
| 215 | list = branch.commits | 215 | commit_list = branch.commits |
| 216 | 216 | ||
| 217 | if b: | 217 | if b: |
| 218 | script.append('#') | 218 | script.append('#') |
| 219 | script.append('# branch %s (%2d commit%s, %s) to remote branch %s:' % ( | 219 | script.append('# branch %s (%2d commit%s, %s) to remote branch %s:' % ( |
| 220 | name, | 220 | name, |
| 221 | len(list), | 221 | len(commit_list), |
| 222 | len(list) != 1 and 's' or '', | 222 | len(commit_list) != 1 and 's' or '', |
| 223 | date, | 223 | date, |
| 224 | project.revisionExpr)) | 224 | project.revisionExpr)) |
| 225 | for commit in list: | 225 | for commit in commit_list: |
| 226 | script.append('# %s' % commit) | 226 | script.append('# %s' % commit) |
| 227 | b[name] = branch | 227 | b[name] = branch |
| 228 | 228 | ||
