android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-01-02 16:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix a few issues with dest-branch and multiples"

Browse Source
This commit is contained in:
Conley Owens 2013-06-10 14:35:13 +00:00 committed by Gerrit Code Review
commit ef668c92c2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subcmds/upload.py
View File

@ -232,12 +232,13 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
if b: if b:
script.append('#') script.append('#')
destination = opt.dest_branch or project.dest_branch or project.revisionExpr
script.append('# branch %s (%2d commit%s, %s) to remote branch %s:' % ( script.append('# branch %s (%2d commit%s, %s) to remote branch %s:' % (
name, name,
len(commit_list), len(commit_list),
len(commit_list) != 1 and 's' or '', len(commit_list) != 1 and 's' or '',
date, date,
project.revisionExpr)) destination))
for commit in commit_list: for commit in commit_list:
script.append('# %s' % commit) script.append('# %s' % commit)
b[name] = branch b[name] = branch
@ -343,7 +344,8 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
key = 'review.%s.uploadtopic' % branch.project.remote.review key = 'review.%s.uploadtopic' % branch.project.remote.review
opt.auto_topic = branch.project.config.GetBoolean(key) opt.auto_topic = branch.project.config.GetBoolean(key)
branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=opt.dest_branch) destination = opt.dest_branch or branch.project.dest_branch or branch.project.revisionExpr
branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination)
branch.uploaded = True branch.uploaded = True
except UploadError as e: except UploadError as e:
branch.error = e branch.error = e