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

Paper bag fix repo 1.3's "repo upload" without --replace

Browse Source 
If we aren't doing a replacement we do not have any
replace rules, so we cannot iterate over them.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2008-11-12 18:37:18 -08:00
parent c99883fee9
commit 34d237fbfb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit_upload.py
View File

@ -114,10 +114,11 @@ def UploadBundle(project,
req.dest_branch = str(dest_branch) req.dest_branch = str(dest_branch)
for c in revlist: for c in revlist:
req.contained_object.append(c) req.contained_object.append(c)
for change_id,commit_id in replace_changes.iteritems(): if replace_changes:
r = req.replace.add() for change_id,commit_id in replace_changes.iteritems():
r.change_id = change_id r = req.replace.add()
r.object_id = commit_id r.change_id = change_id
r.object_id = commit_id
else: else:
req = UploadBundleContinue() req = UploadBundleContinue()
req.bundle_id = bundle_id req.bundle_id = bundle_id