Allow user to protect some branches against "stg pull"

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index cc3b55b..55f06c1 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -307,6 +307,28 @@ def switch_branch(name):
     if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')):
         os.remove(os.path.join(base_dir, 'MERGE_HEAD'))
 
+def delete_branch(name):
+    """Delete a git branch
+    """
+    branch_head = os.path.join('refs', 'heads', name)
+    if not branch_exists(branch_head):
+        raise GitException, 'Branch "%s" does not exist' % name
+    os.remove(os.path.join(base_dir, branch_head))
+
+def rename_branch(from_name, to_name):
+    """Rename a git branch
+    """
+    from_head = os.path.join(base_dir, 'refs', 'heads', from_name)
+    if not branch_exists(from_head):
+        raise GitException, 'Branch "%s" does not exist' % from_name
+    to_head = os.path.join(base_dir, 'refs', 'heads', to_name)
+    if branch_exists(to_head):
+        raise GitException, 'Branch "%s" already exists' % to_name
+
+    if get_head_file() == from_name:
+        set_head_file(os.path.join('refs', 'heads', to_name))
+    os.rename(from_head, to_head)
+
 def add(names):
     """Add the files or recursively add the directory contents
     """