Add git-reup and friends

git_common.py

 # Copyright 2013 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):
     return func(self, timeout=timeout or 1e100)
   return wrap
 IMapIterator.next = wrapper(IMapIterator.next)
 IMapIterator.__next__ = IMapIterator.next
 # TODO(iannucci): Monkeypatch all other 'wait' methods too.
 
 
 import binascii
 import contextlib
 import functools
 import logging
 import signal
 import sys
 import tempfile
 import threading
 
 import subprocess2
 
 
+MERGE_BASE_TAG_FMT = "gitscripts.merge_base_for_%s"

[agable, 2014/02/28 20:14:16]

Ugly that some of these are using a gitscripts config namespace and some are
using a depot_tools namespace.

+
+
 class DEFAULT(object):
   def __init__(self, constructor):
     self.constructor = constructor
 
   @staticmethod
   def get_from(inst_or_obj):
     if isinstance(inst_or_obj, DEFAULT):
       return inst_or_obj.constructor()
     else:
       return inst_or_obj
@@ skipping 177 matching lines @@
   return run('rev-parse', '--abbrev-ref', ref)
 
 
 def branches(*args):
   for line in run('branch', *args).splitlines():
     if line.startswith(NO_BRANCH):
       continue
     yield line.split()[-1]
 
 
+def clean_refs():

[agable, 2014/02/28 20:14:16]

This is really only cleaning tags, not refs...

+  run('tag', '-d',
+      *[t.strip() for t in run('tag', '-l', 'gitscripts.*').split()])
+
+
 def config_list(option, default=DEFAULT(list)):
   try:
     return run('config', '--get-all', option).split()
   except subprocess2.CalledProcessError:
     return DEFAULT.get_from(default)
 
 
 def current_branch():
   return abbrev('HEAD')
 
 
 def parse_commitrefs(*commitrefs):
   """Returns binary encoded commit hashes for one or more commitrefs.
 
   A commitref is anything which can resolve to a commit. Popular examples:
     * 'HEAD'
     * 'origin/master'
     * 'cool_branch~2'
   """
   try:
     return map(binascii.unhexlify, hash_multi(*commitrefs))
   except subprocess2.CalledProcessError:
     raise BadCommitRefException(commitrefs)
 
 
+def root():
+  return run('config', 'depot_tools.upstream') or 'origin/master'
+
+
 def run(*cmd, **kwargs):
   """Runs a git command. Returns stdout as a string.
 
   If logging is DEBUG, we'll print the command before we run it.
 
   kwargs
     autostrip (bool) - Strip the output. Defaults to True.
   """
   autostrip = kwargs.pop('autostrip', True)
   ret = stream(*cmd, **kwargs).read()
   if autostrip:
     ret = (ret or '').strip()
   return ret
 
 
 def stream(*cmd, **kwargs):
   """Runs a git command. Returns stdout as a file.
 
   If logging is DEBUG, we'll print the command before we run it.
   """
   cmd = (GIT_EXE,) + cmd
   logging.debug('Running %s', ' '.join(repr(tok) for tok in cmd))
   proc = subprocess2.Popen(cmd, stderr=subprocess2.VOID,
                            stdout=subprocess2.PIPE, **kwargs)
   return proc.stdout
 
 
+def get_or_create_merge_base_tag(branch, parent):
+  tag = MERGE_BASE_TAG_FMT % hash_one(branch)
+  tagval = None
+  try:
+    tagval = hash_one(tag)
+    logging.debug('Found tagged merge-base for %s: %s', branch, tagval)
+  except subprocess2.CalledProcessError:
+    pass
+  if not tagval:
+    run('tag', '-m', tag, tag, run('merge-base', parent, branch))
+    tagval = hash_one(tag)
+  return tagval+'^{}'  # this lets rev-parse know this is actually a tag
+
+
 def hash_one(reflike):
   return run('rev-parse', reflike)
 
 
 def hash_multi(*reflike):
   return run('rev-parse', *reflike).splitlines()
 
 
 def intern_f(f, kind='blob'):
   """Interns a file object into the git object store.
 
   Args:
     f (file-like object) - The file-like object to intern
     kind (git object type) - One of 'blob', 'commit', 'tree', 'tag'.
 
   Returns the git hash of the interned object (hex encoded).
   """
   ret = run('hash-object', '-t', kind, '-w', '--stdin', stdin=f)
   f.close()
   return ret
 
 
+def manual_merge_base_tag(branch, base):
+  tag = MERGE_BASE_TAG_FMT % hash_one(branch)
+  run('tag', '-f', '-m', tag, tag, hash_one(base))
+
+
+def nuke_merge_base_tag(branch):

[agable, 2014/02/28 20:14:16]

s/nuke/remove/

+  tag = MERGE_BASE_TAG_FMT % hash_one(branch)
+  run('tag', '-d', tag)
+
+
 def tags(*args):
   for line in run('tag', *args).splitlines():
     if line.startswith(NO_BRANCH):
       continue
     yield line.split()[-1]
 
 
 def tree(treeref, recurse=False):
   """Returns a dict representation of a git tree object.
 
@@ skipping 45 matching lines @@
   See |tree()| for the values of mode, type, and ref.
 
   Args:
     treedict - { name: (mode, type, ref) }
   """
   with tempfile.TemporaryFile() as f:
     for name, (mode, typ, ref) in treedict.iteritems():
       f.write('%s %s %s\t%s\0' % (mode, typ, ref, name))
     f.seek(0)
     return run('mktree', '-z', stdin=f)