Make repo's editor work when the editor is a commandline with

multiple args.
Paper bag fix repo 1.3's "repo upload" without --replace
2025-07-02 20:17:19 +00:00 · 2008-11-14 21:12:44 -05:00 · 2008-11-12 18:37:18 -08:00
2 changed files with 7 additions and 6 deletions
--- a/editor.py
+++ b/editor.py
@ -69,14 +69,14 @@ least one of these before using this command."""
      Returns:
        new value of edited text; None if editing did not succeed
    """
-    editor = cls._GetEditor()
+    editor = cls._GetEditor().split()
    fd, path = tempfile.mkstemp()
    try:
      os.write(fd, data)
      os.close(fd)
      fd = None

-      if subprocess.Popen([editor, path]).wait() != 0:
+      if subprocess.Popen(editor + [path]).wait() != 0:
        raise EditorError()
      return open(path).read()
    finally:
--- a/gerrit_upload.py
+++ b/gerrit_upload.py
@ -114,10 +114,11 @@ def UploadBundle(project,
        req.dest_branch = str(dest_branch)
        for c in revlist:
          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:
        req = UploadBundleContinue()
        req.bundle_id = bundle_id
Author	SHA1	Message	Date
Joe Onorato	8c6eef4713	Make repo's editor work when the editor is a commandline with multiple args.	2008-11-14 21:12:44 -05:00
Shawn O. Pearce	34d237fbfb	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>	2008-11-12 18:37:18 -08:00