Add git method for switching to a different branch

Signed-off-by: Chuck Lever <cel@netapp.com>

diff --git a/stgit/git.py b/stgit/git.py
index bd93330826a3a094abaeaffc13e31d548b316cd8..cc3b55becccb4502e47c1b3a49e66080476a17b9 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -290,6 +290,23 @@ def create_branch(new_branch, tree_id = None):
     if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')):
         os.remove(os.path.join(base_dir, 'MERGE_HEAD'))
 
     if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')):
         os.remove(os.path.join(base_dir, 'MERGE_HEAD'))
 

+def switch_branch(name):
+    """Switch to a git branch
+    """
+    new_head = os.path.join('refs', 'heads', name)
+    if not branch_exists(new_head):
+        raise GitException, 'Branch "%s" does not exist' % name
+
+    tree_id = rev_parse(new_head + '^0')
+    if tree_id != get_head():
+        if __run('git-read-tree -u -m', [get_head(), tree_id]) != 0:
+            raise GitException, 'git-read-tree failed (local changes maybe?)'
+        __head = tree_id
+    set_head_file(new_head)
+
+    if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')):
+        os.remove(os.path.join(base_dir, 'MERGE_HEAD'))
+

 def add(names):
     """Add the files or recursively add the directory contents
     """
 def add(names):
     """Add the files or recursively add the directory contents
     """