Add git-reup and friends

git_rename_branch.py

Index: git_rename_branch.py
diff --git a/git_rename_branch.py b/git_rename_branch.py
new file mode 100755
index 0000000000000000000000000000000000000000..11ccb03767eb0e566720ccd49e4684d9a3302bac
--- /dev/null
+++ b/git_rename_branch.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# Copyright (c) 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.
+import sys
+import re
+
+from git_common import current_branch, branches, run
+
+def main(argv):
+	# TODO(iannucci): Use argparse

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

Do this now.

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

How is this different than just "git branch -m"?

+  assert 2 <= len(argv) < 3, "Must supply (<newname>) or (<oldname> <newname>)"
+  if len(argv) == 2:
+    old_name = current_branch()
+    new_name = argv[1]
+  else:
+    old_name = argv[1]
+    new_name = argv[2]
+  assert old_name in branches(), "<oldname> must exist"

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

Since it shells out, only make one call to branches()

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

"Error: Branch \"%s\" does not exist" % old_name

+  assert new_name not in branches(), "<newname> must not exist"

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

"Error: A branch named \"%s\" already exists" % new_name

+
+  run('branch', '-m', old_name, new_name)
+
+  matcher = re.compile(r'^branch\.(.*)\.merge$')
+  branches_to_fix = []
+  for line in run('config', '-l').splitlines():
+    key, value = line.split('=', 1)
+    if value == 'refs/heads/' + old_name:
+      m = matcher.match(key)
+      if m:
+        branch = m.group(1)
+        remote = run('config', '--get', 'branch.%s.remote' % branch)
+        if remote == '.':
+          branches_to_fix.append(branch)
+  for b in branches_to_fix:
+    run('config', 'branch.%s.merge' % b, 'refs/heads/' + new_name)
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))