Improve GIT.CaptureStatus() to work with incorrectly merged local branches.

scm.py

 # Copyright (c) 2006-2009 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 os
 import re
@@ skipping 74 matching lines @@
     if not files:
       pass
     elif isinstance(files, basestring):
       command.append(files)
     else:
       command.extend(files)
     status = GIT.Capture(command).rstrip()
     results = []
     if status:
       for statusline in status.splitlines():
-        m = re.match('^(\w)\t(.+)$', statusline)
+        # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
+        # can happen when the user has 2 local branches and he diffs between
+        # these 2 branches instead diffing to upstream.
+        m = re.match('^(\w)+\t(.+)$', statusline)
         if not m:
           raise gclient_utils.Error(
               'status currently unsupported: %s' % statusline)
-        results.append(('%s      ' % m.group(1), m.group(2)))
+        # Only grab the first letter.
+        results.append(('%s      ' % m.group(1)[0], m.group(2)))
     return results
 
   @staticmethod
   def GetEmail(cwd):
     """Retrieves the user email address if known."""
     # We could want to look at the svn cred when it has a svn remote but it
     # should be fine for now, users should simply configure their git settings.
     try:
       return GIT.Capture(['config', 'user.email'], cwd=cwd).strip()
     except gclient_utils.CheckCallError:
@@ skipping 703 matching lines @@
     if not SVN.current_version:
       SVN.current_version = SVN.Capture(['--version']).split()[2]
     current_version_list = map(only_int, SVN.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, SVN.current_version)
       elif ver > min_ver:
         return (True, SVN.current_version)
     return (True, SVN.current_version)