android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few issues with dest-branch and multiples

Browse Source 
This fixes dest-branch display with >1 branch being uploaded to at
once, and correctly handles setting the target branch in that case.

Change-Id: If5e9c7ece02cc0d903e2cb377485ebea73a07107
This commit is contained in:
Bryan Jacobs 2013-05-31 15:45:28 -04:00
parent a1f77d92c6
commit 691a75936d
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

@ -230,12 +230,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
@ -341,7 +342,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