Introduct git-auto-svn

git_common.py

 # Copyright 2014 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.
 
 # Monkeypatch IMapIterator so that Ctrl-C can kill everything properly.
 # Derived from https://gist.github.com/aljungberg/626518
 import multiprocessing.pool
 from multiprocessing.pool import IMapIterator
 def wrapper(func):
   def wrap(self, timeout=None):
@@ skipping 301 matching lines @@
       git config %s <new_limit>
     """ % (num, limit, key))
     sys.exit(1)
 
   for line in raw_branches:
     if line.startswith(NO_BRANCH):
       continue
     yield line.split()[-1]
 
 
-def run_with_retcode(*cmd, **kwargs):
-  """Run a command but only return the status code."""
-  try:
-    run(*cmd, **kwargs)
-    return 0
-  except subprocess2.CalledProcessError as cpe:
-    return cpe.returncode
-
-
 def config(option, default=None):
   try:
     return run('config', '--get', option) or default
   except subprocess2.CalledProcessError:
     return default
 
 
 def config_list(option):
   try:
     return run('config', '--get-all', option).split()
@@ skipping 203 matching lines @@
 
 def root():
   return config('depot-tools.upstream', 'origin/master')
 
 
 def run(*cmd, **kwargs):
   """The same as run_with_stderr, except it only returns stdout."""
   return run_with_stderr(*cmd, **kwargs)[0]
 
 
+def run_with_retcode(*cmd, **kwargs):
+  """Run a command but only return the status code."""
+  try:
+    run(*cmd, **kwargs)
+    return 0
+  except subprocess2.CalledProcessError as cpe:
+    return cpe.returncode
+
+
 def run_stream(*cmd, **kwargs):
   """Runs a git command. Returns stdout as a PIPE (file-like object).
 
   stderr is dropped to avoid races if the process outputs to both stdout and
   stderr.
   """
   kwargs.setdefault('stderr', subprocess2.VOID)
   kwargs.setdefault('stdout', subprocess2.PIPE)
   cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd
   proc = subprocess2.Popen(cmd, **kwargs)
@@ skipping 29 matching lines @@
   return ret, err
 
 
 def set_branch_config(branch, option, value, scope='local'):
   set_config('branch.%s.%s' % (branch, option), value, scope=scope)
 
 
 def set_config(option, value, scope='local'):
   run('config', '--' + scope, option, value)
 
+
 def squash_current_branch(header=None, merge_base=None):
   header = header or 'git squash commit.'
   merge_base = merge_base or get_or_create_merge_base(current_branch())
   log_msg = header + '\n'
   if log_msg:
     log_msg += '\n'
   log_msg += run('log', '--reverse', '--format=%H%n%B', '%s..HEAD' % merge_base)
   run('reset', '--soft', merge_base)
   run('commit', '-a', '-F', '-', indata=log_msg)
 
@@ skipping 103 matching lines @@
   return ret
 
 
 def upstream(branch):
   try:
     return run('rev-parse', '--abbrev-ref', '--symbolic-full-name',
                branch+'@{upstream}')
   except subprocess2.CalledProcessError:
     return None
 
+
 def get_git_version():
   """Returns a tuple that contains the numeric components of the current git
   version."""
   version_string = run('--version')
   version_match = re.search(r'(\d+.)+(\d+)', version_string)
   version = version_match.group() if version_match else ''
 
   return tuple(int(x) for x in version.split('.'))
 
 
@@ skipping 23 matching lines @@
         hash=branch_hash, upstream=upstream_branch, ahead=ahead, behind=behind)
 
   # Set None for upstreams which are not branches (e.g empty upstream, remotes
   # and deleted upstream branches).
   missing_upstreams = {}
   for info in info_map.values():
     if info.upstream not in info_map and info.upstream not in missing_upstreams:
       missing_upstreams[info.upstream] = None
 
   return dict(info_map.items() + missing_upstreams.items())