Add git-reup and friends

git_reparent_branch.py

Index: git_reparent_branch.py
diff --git a/git_reparent_branch.py b/git_reparent_branch.py
new file mode 100755
index 0000000000000000000000000000000000000000..f7b6033146f399d055fbea214576d87149587805
--- /dev/null
+++ b/git_reparent_branch.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+# 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.
+

[agable, 2014/03/25 19:37:23]

still no docstring

[iannucci, 2014/03/26 01:39:49]

Done.

+import argparse
+import sys
+
+import subprocess2
+
+from git_common import upstream, current_branch, run, tags, set_branch_config
+from git_common import get_or_create_merge_base
+
+import git_rebase_update
+
+def main(args):
+  parser = argparse.ArgumentParser()
+  parser.add_argument('new_parent')
+  opts = parser.parse_args(args)
+
+  # TODO(iannucci): Allow specification of the branch-to-reparent
+
+  branch = current_branch()
+  new_parent = opts.new_parent
+  cur_parent = upstream(branch)
+
+  if branch == 'HEAD' or not branch:
+    parser.error('Must be on the branch you want to reparent')
+  if new_parent == cur_parent:
+    parser.error('Cannot reparent a branch to its existing parent')
+
+  get_or_create_merge_base(branch, cur_parent)
+
+  all_tags = tags()
+  if cur_parent in all_tags:
+    cur_parent += ' [tag]'
+
+  try:
+    run('show-ref', new_parent)
+  except subprocess2.CalledProcessError:
+    print >> sys.stderr, 'fatal: invalid reference: %s' % new_parent
+    return 1
+
+  if new_parent in all_tags:
+    print ("Reparenting %s to track %s [tag] (was %s)"
+           % (branch, new_parent, cur_parent))
+    set_branch_config(branch, 'remote', '.')
+    set_branch_config(branch, 'merge', new_parent)
+  else:
+    print ("Reparenting %s to track %s (was %s)"
+           % (branch, new_parent, cur_parent))
+    run('branch', '--set-upstream-to', new_parent, branch)
+
+  # TODO(iannucci): ONLY rebase-update the branch which moved (and dependants)
+  return git_rebase_update.main(['--no_fetch'])

[agable, 2014/03/25 19:37:23]

directly calling another script's main() method makes me a little sad. These
scripts should interface with each other in two ways: through git_common, and
through their respective command line interfaces.

[iannucci, 2014/03/26 01:39:49]

done as much as I'm going to :p

+
+
+if __name__ == '__main__':  # pragma: no cover
+  sys.exit(main(sys.argv[1:]))