Просмотр исходного кода

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

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>
Shawn O. Pearce 17 лет назад
Родитель
Сommit
34d237fbfb
1 измененных файлов с 5 добавлено и 4 удалено
  1. 5 4
      gerrit_upload.py

+ 5 - 4
gerrit_upload.py

@@ -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():
-          r = req.replace.add()
-          r.change_id = change_id
-          r.object_id = commit_id
+        if replace_changes:
+          for change_id,commit_id in replace_changes.iteritems():
+            r = req.replace.add()
+            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