Add git-reup and friends

git_reparent_branch.py

+#!/usr/bin/env python
+import sys
+
+from git_common import upstream, current_branch, run
+from git_common import get_or_create_merge_base_tag
+
+def main(argv):
+  # TODO(iannucci): Add --verbose

[Ryan Tseng, 2014/02/28 21:22:05]

Add --help.  "reparent branch" also isn't self evident.  What does this do?  Is
this just an alias for "rebase --onto x y z"? Is it just an alias for
--set-upstream?

+
+  assert len(argv) == 2, "Must supply new parent"
+  branch = current_branch()
+  new_parent = argv[1]
+  cur_parent = upstream(branch)
+  assert branch != 'HEAD', 'Must be on the branch you want to reparent'

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

Could let them specify the branch they want to reparent on the command line too.

[iannucci, 2014/03/20 10:59:37]

added TODO

+  assert cur_parent != new_parent
+
+  get_or_create_merge_base_tag(branch, cur_parent)
+
+  print "Reparenting %s to track %s (was %s)" % (branch, new_parent, cur_parent)
+  run('branch', '--set-upstream-to', new_parent, branch)
+  try:
+    cmd = ['reup'] #+ (['--verbose'] if VERBOSE else [])
+    run(*cmd, stdout=None, stderr=None)
+  except:
+    print "Resetting parent back to %s" % (cur_parent)
+    run('branch', '--set-upstream-to', cur_parent, branch)
+    raise
+
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))
+
+