Bazaar Support For upload.py

static/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 558 matching lines @@
   p.wait()
   errout = p.stderr.read()
   if print_output and errout:
     print >>sys.stderr, errout
   p.stdout.close()
   p.stderr.close()
   return output, p.returncode
 
 
 def RunShell(command, silent_ok=False, universal_newlines=True,
-             print_output=False):
+             print_output=False,check_returncode=True):
   data, retcode = RunShellWithReturnCode(command, print_output,
                                          universal_newlines)
-  if retcode:
+  
+  if retcode and check_returncode:
     ErrorExit("Got error status from %s:\n%s" % (command, data))
   if not silent_ok and not data:
     ErrorExit("No output from %s" % command)
   return data
 
 
 class VersionControlSystem(object):
   """Abstract base class providing an interface to the VCS."""
 
   def __init__(self, options):
@@ skipping 311 matching lines @@
     # If a file is copied its status will be "A  +", which signifies
     # "addition-with-history".  See "svn st" for more information.  We need to
     # upload the original file or else diff parsing will fail if the file was
     # edited.
     if status[0] == "A" and status[3] != "+":
       # We'll need to upload the new content if we're adding a binary file
       # since diff's output won't contain it.
       mimetype = RunShell(["svn", "propget", "svn:mime-type", filename],
                           silent_ok=True)
       base_content = ""
-      is_binary = mimetype and not mimetype.startswith("text/")
+      is_binary = bool(mimetype) and not mimetype.startswith("text/")
       if is_binary and self.IsImage(filename):
         new_content = self.ReadFile(filename)
     elif (status[0] in ("M", "D", "R") or
           (status[0] == "A" and status[3] == "+") or  # Copied file.
           (status[0] == " " and status[1] == "M")):  # Property change.
       args = []
       if self.options.revision:
         url = "%s/%s@%s" % (self.svn_base, filename, self.rev_start)
       else:
         # Don't change filename, it's needed later.
         url = filename
         args += ["-r", "BASE"]
       cmd = ["svn"] + args + ["propget", "svn:mime-type", url]
       mimetype, returncode = RunShellWithReturnCode(cmd)
       if returncode:
         # File does not exist in the requested revision.
         # Reset mimetype, it contains an error message.
         mimetype = ""
       get_base = False
-      is_binary = mimetype and not mimetype.startswith("text/")
+      is_binary = bool(mimetype) and not mimetype.startswith("text/")
       if status[0] == " ":
         # Empty base content just to force an upload.
         base_content = ""
       elif is_binary:
         if self.IsImage(filename):
           get_base = True
           if status[0] == "M":
             if not self.rev_end:
               new_content = self.ReadFile(filename)
             else:
@@ skipping 199 matching lines @@
   def GenerateDiff(self, args):
     """Return the current diff as a string.
 
     Args:
       args: Extra arguments to pass to the diff command.
     """
     if self.options.revision:
       args = ["-r", self.options.revision] + args
     # We need check_returncode = False because bzr diff returns 1 if changes
     # are found.
-    data = RunShell(["bzr", "diff"] + args, silent_ok=True,
-                    check_returncode=False)
+
+    data,retcode = RunShellWithReturnCode(["bzr", "diff"] + args, True)
     filecount = 0
     lines = data.splitlines()
     for i, line in enumerate(lines):
       match = re.match(r"^=== (added|removed|modified) file '(.*)'$", line)
       if match:
         # Modify line to make it look like as it comes from svn diff.
         lines[i] = "Index: %s" % match.group(2)
         filecount += 1
         logging.info(line)
     if not filecount:
@@ skipping 14 matching lines @@
 
   def GetBaseFile(self, filename):
     """Get the content of the upstream version of a file.
 
     Returns:
       A tuple (content, status) representing the file content and the status of
       the file.
     """
     st_args = []
     cat_args = []
+    new_content = None
     if self.options.revision:
       if '..' in self.options.revision:
         start_rev = self.options.revision.split('..', 1)[0]
         cat_args += ["-r", start_rev]
       else:
         cat_args += ["-r", self.options.revision]
       st_args += ["-r", self.options.revision]
     status = RunShell(["bzr", "status", "-S"] + st_args + [filename])
     if status[1] == "N":
       content = ""
     else:
       content = RunShell(["bzr", "cat"] + cat_args + [filename])
-    return content, status[0:4]
+    return content, new_content, False, status[0:4]
 
 
 # NOTE: The SplitPatch function is duplicated in engine.py, keep them in sync.
 def SplitPatch(data):
   """Splits a patch into separate pieces for each file.
 
   Args:
     data: A string containing the output of svn diff.
 
   Returns:
@@ skipping 71 matching lines @@
   # Mercurial has a command to get the base directory of a repository
   # Try running it, but don't die if we don't have hg installed.
   # NOTE: we try Mercurial first as it can sit on top of an SVN working copy.
   try:
     out, returncode = RunShellWithReturnCode(["hg", "root"])
     if returncode == 0:
       return MercurialVCS(options, out.strip())
   except OSError, (errno, message):
     if errno != 2:  # ENOENT -- they don't have hg installed.
       raise
-
+  try:

[bialix, 2009/03/24 22:49:23]

I think you need either use command ["bzr", "--no-plugins", "root"] OR move bzr
detection down to the end of this function, at least it should be after
hg/svn/git. Because if user has bzr-svn or bzr-git plugin installed, then bzr
can open foreign branches and provide support for them.

Other changes looks good for me.

+    out, returncode = RunShellWithReturnCode(["bzr", "root"])
+    if returncode == 0:
+      os.chdir(out.strip())
+      return BazaarVCS(options)
+  except OSError, (errno, message):
+    if errno != 2:  # ENOENT -- they don't have bzr installed.
+      raise
   # Subversion has a .svn in all working directories.
   if os.path.isdir('.svn'):
     logging.info("Guessed VCS = Subversion")
     return SubversionVCS(options)
-  elif os.path.isdir(".bzr"):
-    logging.info("Guessed VCS = Bazaar")
-    return BazaarVCS(options)
+  
   # Git has a command to test if you're in a git tree.
   # Try running it, but don't die if we don't have git installed.
   try:
     out, returncode = RunShellWithReturnCode(["git", "rev-parse",
                                               "--is-inside-work-tree"])
     if returncode == 0:
       return GitVCS(options)
   except OSError, (errno, message):
     if errno != 2:  # ENOENT -- they don't have git installed.
       raise
@@ skipping 120 matching lines @@
   try:
     RealMain(sys.argv)
   except KeyboardInterrupt:
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()