Fix bug introduced in r51121: gcl upload crashes on a 'revived' file.

scm.py

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import logging
 import os
@@ skipping 641 matching lines @@
 
   @staticmethod
   def GenerateDiff(filenames, root=None, full_move=False, revision=None):
     """Returns a string containing the diff for the given file list.
 
     The files in the list should either be absolute paths or relative to the
     given root. If no root directory is provided, the repository root will be
     used.
     The diff will always use relative paths.
     """
+    assert isinstance(filenames, (list, tuple))
     previous_cwd = os.getcwd()
     root = root or SVN.GetCheckoutRoot(previous_cwd)
     root = os.path.normcase(os.path.join(root, ''))
     def RelativePath(path, root):
       """We must use relative paths."""
       if os.path.normcase(path).startswith(root):
         return path[len(root):]
       return path
     # If the user specified a custom diff command in their svn config file,
     # then it'll be used when we do svn diff, which we don't want to happen
@@ skipping 24 matching lines @@
         metaheaders = []
         for (filename, info) in data.iteritems():
           if SVN.IsMovedInfo(info):
             # for now, the most common case is a head copy,
             # so let's just encode that as a straight up cp.
             srcurl = info.get('Copied From URL')
             root = info.get('Repository Root')
             rev = int(info.get('Copied From Rev'))
             assert srcurl.startswith(root)
             src = srcurl[len(root)+1:]
-            srcinfo = SVN.CaptureInfo(srcurl)
+            try:
+              srcinfo = SVN.CaptureInfo(srcurl)
+            except gclient_utils.CheckCallError, e:
+              if not 'Not a valid URL' in e.stderr:
+                raise
+              # Assume the file was deleted. No idea how to figure out at which
+              # revision the file was deleted.

[nsylvain, 2011/02/23 22:08:35]

The new file most likely has a mergeinfo property you could look at. But i would
not worry too much about it.
You may also want to just use "cat" instead of "diff" when this happens.

[M-A Ruel, 2011/02/24 01:37:58]

The idea is to not use the svn:mergeinfo metadata since I'd like to know which
revision the file was deleted at. I'll keep 'diff' to use a single code path.

+              srcinfo = {'Revision': rev}
             if (srcinfo.get('Revision') != rev and
                 SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl])):
               metaheaders.append("#$ svn cp -r %d %s %s "
                                  "### WARNING: note non-trunk copy\n" %
                                  (rev, src, filename))
             else:
               metaheaders.append("#$ cp %s %s\n" % (src,
                                                     filename))
 
         if metaheaders:
@@ skipping 150 matching lines @@
         elif os.path.isfile(file_path) or os.path.islink(file_path):
           logging.info('os.remove(%s)' % file_path)
           os.remove(file_path)
         elif os.path.isdir(file_path):
           logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
           gclient_utils.RemoveDirectory(file_path)
         else:
           logging.critical(
             ('No idea what is %s.\nYou just found a bug in gclient'
              ', please ping maruel@chromium.org ASAP!') % file_path)