Fix exception error message in git.merge()

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index 55f06c1..d5bd724 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
-import sys, os, glob, popen2
+import sys, os, popen2
 
 from stgit.utils import *
 
@@ -236,6 +236,9 @@ def get_head_file():
 def set_head_file(ref):
     """Resets HEAD to point to a new ref
     """
+    # head cache flushing is needed since we might have a different value
+    # in the new head
+    __clear_head_cache()
     if __run('git-symbolic-ref HEAD', [ref]) != 0:
         raise GitException, 'Could not set head to "%s"' % ref
 
@@ -285,7 +288,7 @@ def create_branch(new_branch, tree_id = None):
 
     # a checkout isn't needed if new branch points to the current head
     if tree_id:
-        git.switch(tree_id)
+        switch(tree_id)
 
     if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')):
         os.remove(os.path.join(base_dir, 'MERGE_HEAD'))
@@ -293,6 +296,8 @@ def create_branch(new_branch, tree_id = None):
 def switch_branch(name):
     """Switch to a git branch
     """
+    global __head
+
     new_head = os.path.join('refs', 'heads', name)
     if not branch_exists(new_head):
         raise GitException, 'Branch "%s" does not exist' % name
@@ -318,16 +323,16 @@ def delete_branch(name):
 def rename_branch(from_name, to_name):
     """Rename a git branch
     """
-    from_head = os.path.join(base_dir, 'refs', 'heads', from_name)
+    from_head = os.path.join('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)
+    to_head = os.path.join('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)
+        set_head_file(to_head)
+    os.rename(os.path.join(base_dir, from_head), os.path.join(base_dir, to_head))
 
 def add(names):
     """Add the files or recursively add the directory contents
@@ -356,11 +361,6 @@ def add(names):
 def rm(files, force = False):
     """Remove a file from the repository
     """
-    if force:
-        git_opt = '--force-remove'
-    else:
-        git_opt = '--remove'
-
     if not force:
         for f in files:
             if os.path.exists(f):
@@ -464,7 +464,7 @@ def merge(base, head1, head2):
 
     # this can fail if there are conflicts
     if os.system('git-merge-index -o -q gitmergeonefile.py -a') != 0:
-        raise GitException, 'git-merge-cache failed (possible conflicts)'
+        raise GitException, 'git-merge-index failed (possible conflicts)'
 
 def status(files = [], modified = False, new = False, deleted = False,
            conflict = False, unknown = False, noexclude = False):