Support for internal SVN servers and patch sets based in explicit revision range

upload.py

 #!/usr/bin/env python
 #
 # Copyright 2007 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 447 matching lines @@
 def GetContentType(filename):
 """Helper to guess the content-type from the filename."""
 return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
 
 
 def RunShell(command, args=(), silent_ok=False):
 command = "%s %s" % (command, " ".join(args))
 logging.info("Running %s", command)
 stream = os.popen(command, "r")
 data = stream.read()
- if stream.close():
- ErrorExit("Got error status from %s" % command)
+ status = stream.close()
+ logging.info(status)
+ if status:
+ ErrorExit("Got error status %s from %s" % (status,command))
 if not silent_ok and not data:
 ErrorExit("No output from %s" % command)
 return data
 
 
-def GuessBase():
+def GuessBase(allow_other=False):
 info = RunShell("svn info")
 for line in info.splitlines():
 words = line.split()
 if len(words) == 2 and words[0] == "URL:":
 url = words[1]
 scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
 if netloc.endswith("svn.python.org"):
 if netloc == "svn.python.org":
 if path.startswith("/projects/"):
 path = path[9:]
 elif netloc != "pythondev@svn.python.org":
 ErrorExit("Unrecognized Python URL: %s" % url)
 base = "http://svn.python.org/view/*checkout*%s/" % path
 logging.info("Guessed Python base = %s", base)
 elif netloc.endswith("svn.collab.net"):
 if path.startswith("/repos/"):
 path = path[6:]
 base = "http://svn.collab.net/viewvc/*checkout*%s/" % path
 logging.info("Guessed CollabNet base = %s", base)
 elif netloc.endswith(".googlecode.com"):
 base = url + "/"
 if base.startswith("https"):
 base = "http" + base[5:]
 logging.info("Guessed Google Code base = %s", base)
+elif allow_other:
+return url
 else:
 ErrorExit("Unrecognized svn project root: %s" % url)
 return base
 ErrorExit("Can't find URL in output from svn info")
 
 
 def RealMain(argv):
 logging.basicConfig(format=("%(asctime).19s %(levelname)s %(filename)s:"
 "%(lineno)s %(message)s "))
 os.environ['LC_ALL'] = 'C'
 options, args = parser.parse_args(sys.argv[1:])
 global verbosity
 verbosity = options.verbose
 if verbosity >= 3:
 logging.getLogger().setLevel(logging.DEBUG)
 elif verbosity >= 2:
 logging.getLogger().setLevel(logging.INFO)
 if options.local_base:
- base = None
+ base = GuessBase(allow_other=True)
 else:
 base = GuessBase()
 if not options.assume_yes:
 CheckForUnknownFiles()
 cmd = "svn diff"
 if not sys.platform.startswith("win"):
 cmd += " --diff-cmd=diff"
 data = RunShell(cmd, args)
 count = 0
+revisions = dict()
 for line in data.splitlines():
 if line.startswith("Index:"):
 count += 1
 logging.info(line)
+if line.startswith("--"):
+file = line.split(" ",1)[1].split("\t",1)[0]
+revision = line[line.rfind("(revision ")+10:].replace(")","")
+revisions[file] = revision

[Janusz, 2008/07/28 21:13:21]

I'm sure ther is better way to do this. I'm new to pyhton... 

 if not count:
 ErrorExit("No valid patches found in output from svn diff")
 if options.issue:
 prompt = "Message describing this patch set: "
 else:
 prompt = "New issue subject: "
 message = options.message or raw_input(prompt).strip()
 if not message:
 ErrorExit("A non-empty message is required")
 rpc_server = GetRpcServer(options)
@@ skipping 28 matching lines @@
 else:
 msg = response_body
 else:
 msg = response_body
 StatusUpdate(msg)
 if not response_body.startswith("Issue created.") and \
 not response_body.startswith("Issue updated."):
 sys.exit(0)
 if options.local_base:
 issue = msg[msg.rfind("/")+1:]
-  UploadBaseFiles(issue, rpc_server, patches, patchset, options)
+ UploadBaseFiles(issue, rpc_server, patches, patchset, options, base, revisions  )
 
-def UploadBaseFiles(issue, rpc_server, patch_list, patchset, options):
+def UploadBaseFiles(issue, rpc_server, patch_list, patchset, options, base, revi  sions):
 """Uploads the base files using svn cat."""
 patches = dict()
 [patches.setdefault(v, k) for k, v in patch_list]
 for filename in patches.keys():
- status = RunShell("svn status --ignore-externals", [filename])
+ status = RunShell("svn status --ignore-externals", [filename], silent_ok=Tru  e)
+ use_revision = False

[Janusz, 2008/07/28 21:13:21]

used, will purge 

 if not status:
 StatusUpdate("svn status returned no output for %s" % filename)
- sys.exit(False)
- if status[0] == "A":
+ status = "^"
+ if status and status[0] == "A":
 content = ""
- elif status[0] in ["M", "D"]:
- content = RunShell("svn cat", [filename])
- keywords = RunShell("svn -rBASE propget svn:keywords", [filename],
-  silent_ok=True)
+ elif status and (status[0] in ["M", "D", "^"]):
+ file_url = str(base)+"/"+filename+"@"+str(revisions[filename])
+ content = RunShell("svn cat", [file_url])
+ keywords = RunShell("svn propget svn:keywords", [file_url], silent_ok=True  )
 if keywords:
- content = CollapseKeywords(content, keywords)
+ content = CollapseKeywords(content, keywords)  
 else:
 StatusUpdate("svn status returned unexpected output: %s" % status)
 sys.exit(False)
 checksum = md5.new(content).hexdigest()
 parts = []
 while content:
 parts.append(content[:800000])
 content = content[800000:]
 if not parts:
 parts = [""] # empty file
@@ skipping 67 matching lines @@
 try:
 RealMain(sys.argv)
 except KeyboardInterrupt:
 print
 StatusUpdate("Interrupted.")
 sys.exit(1)
 
 
 if __name__ == "__main__":
 main()