Support getting changes of non-HEAD branches

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 104 matching lines @@
 
   @staticmethod
   def Capture(args, cwd, strip_out=True, **kwargs):
     env = GIT.ApplyEnvVars(kwargs)
     output = subprocess2.check_output(
         ['git'] + args,
         cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
     return output.strip() if strip_out else output
 
   @staticmethod
-  def CaptureStatus(files, cwd, upstream_branch):
+  def CaptureStatus(files, cwd, upstream_branch, local_branch='HEAD'):
     """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', '--no-renames',
-               '-r', '%s...' % upstream_branch]
+               '-r', '%s...%s' % (upstream_branch, local_branch)]
     if not files:
       pass
     elif isinstance(files, basestring):
       command.append(files)
     else:
       command.extend(files)
     status = GIT.Capture(command, cwd)
     results = []
     if status:
       for statusline in status.splitlines():
@@ skipping 1023 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