git_cl sanity checks

scm.py

 # Copyright (c) 2012 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 94 matching lines @@
   def CaptureStatus(files, cwd, upstream_branch):
     """Returns git status.
 
     @files can be a string (one file) or a list of files.
 
     Returns an array of (status, file) tuples."""
     if upstream_branch is None:
       upstream_branch = GIT.GetUpstreamBranch(cwd)
       if upstream_branch is None:
         raise gclient_utils.Error('Cannot determine upstream branch')
-    command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
+      upstream_branch += '...'

[M-A Ruel, 2012/10/28 20:53:02]

A quick "git gs CaptureStatus" tells me this will affect trychange.py:291 and
presubmit_support.py:1192 in addition to git_cl.py. Can you make sure both call
won't be badly affected?

[Isaac (away), 2012/10/28 21:16:42]

I wanted to make this change to avoid an extra merge-base call, which would be a
no-op.  But given GenerateDiff has the same behavior, I've reverted changes to
this file.  I think it is preferable to not do implicit calls to merge base but
it is outside the scope of this CL.

+    command = ['diff', '--name-status', '-r', upstream_branch]
     if not files:
       pass
     elif isinstance(files, basestring):
       command.append(files)
     else:
       command.extend(files)
     status = GIT.Capture(command, cwd).rstrip()
     results = []
     if status:
       for statusline in status.splitlines():
@@ skipping 970 matching lines @@
         # revert, like for properties.
         if not os.path.isdir(cwd):
           # '.' was deleted. It's not worth continuing.
           return
         try:
           SVN.Capture(['revert', file_status[1]], cwd=cwd)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise