Correctly handle refs/patches on series rename

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index 165b5a7..975ac21 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 import sys, os
 
 from stgit.utils import *
-from stgit import git
+from stgit import git, basedir
 from stgit.config import config
 
 
@@ -66,7 +66,7 @@ def __clean_comments(f):
 
 def edit_file(series, line, comment, show_patch = True):
     fname = '.stgit.msg'
-    tmpl = os.path.join(git.get_base_dir(), 'patchdescr.tmpl')
+    tmpl = os.path.join(basedir.get(), 'patchdescr.tmpl')
 
     f = file(fname, 'w+')
     if line:
@@ -188,10 +188,7 @@ class Patch:
     def set_bottom(self, value, backup = False):
         if backup:
             curr = self.__get_field('bottom')
-            if curr != value:
-                self.__set_field('bottom.old', curr)
-            else:
-                self.__set_field('bottom.old', None)
+            self.__set_field('bottom.old', curr)
         self.__set_field('bottom', value)
 
     def get_old_top(self):
@@ -203,10 +200,7 @@ class Patch:
     def set_top(self, value, backup = False):
         if backup:
             curr = self.__get_field('top')
-            if curr != value:
-                self.__set_field('top.old', curr)
-            else:
-                self.__set_field('top.old', None)
+            self.__set_field('top.old', curr)
         self.__set_field('top', value)
         self.__update_top_ref(value)
 
@@ -292,7 +286,7 @@ class Series:
                 self.__name = name
             else:
                 self.__name = git.get_head_file()
-            self.__base_dir = git.get_base_dir()
+            self.__base_dir = basedir.get()
         except git.GitException, ex:
             raise StackException, 'GIT tree not initialised: %s' % ex
 
@@ -432,13 +426,21 @@ class Series:
         """
         return os.path.isdir(self.__patch_dir)
 
-    def init(self):
+    def init(self, create_at=False):
         """Initialises the stgit series
         """
         bases_dir = os.path.join(self.__base_dir, 'refs', 'bases')
 
-        if self.is_initialised():
+        if os.path.exists(self.__patch_dir):
             raise StackException, self.__patch_dir + ' already exists'
+        if os.path.exists(self.__refs_dir):
+            raise StackException, self.__refs_dir + ' already exists'
+        if os.path.exists(self.__base_file):
+            raise StackException, self.__base_file + ' already exists'
+
+        if (create_at!=False):
+            git.create_branch(self.__name, create_at)
+
         os.makedirs(self.__patch_dir)
 
         if not os.path.isdir(bases_dir):
@@ -503,6 +505,8 @@ class Series:
             os.rename(self.__series_dir, to_stack.__series_dir)
         if os.path.exists(self.__base_file):
             os.rename(self.__base_file, to_stack.__base_file)
+        if os.path.exists(self.__refs_dir):
+            os.rename(self.__refs_dir, to_stack.__refs_dir)
 
         self.__init__(to_name)
 
@@ -510,8 +514,7 @@ class Series:
         """Clones a series
         """
         base = read_string(self.get_base_file())
-        git.create_branch(target_series, tree_id = base)
-        Series(target_series).init()
+        Series(target_series).init(create_at = base)
         new_series = Series(target_series)
 
         # generate an artificial description file
@@ -573,7 +576,8 @@ class Series:
                       cache_update = True,
                       author_name = None, author_email = None,
                       author_date = None,
-                      committer_name = None, committer_email = None):
+                      committer_name = None, committer_email = None,
+                      backup = False):
         """Generates a new commit for the given patch
         """
         name = self.get_current()
@@ -605,8 +609,10 @@ class Series:
         if not committer_email:
             committer_email = patch.get_commemail()
 
+        bottom = patch.get_bottom()
+
         commit_id = git.commit(files = files,
-                               message = descr, parents = [patch.get_bottom()],
+                               message = descr, parents = [bottom],
                                cache_update = cache_update,
                                allowempty = True,
                                author_name = author_name,
@@ -615,7 +621,8 @@ class Series:
                                committer_name = committer_name,
                                committer_email = committer_email)
 
-        patch.set_top(commit_id)
+        patch.set_bottom(bottom, backup = backup)
+        patch.set_top(commit_id, backup = backup)
         patch.set_description(descr)
         patch.set_authname(author_name)
         patch.set_authemail(author_email)
@@ -625,6 +632,25 @@ class Series:
 
         return commit_id
 
+    def undo_refresh(self):
+        """Undo the patch boundaries changes caused by 'refresh'
+        """
+        name = self.get_current()
+        assert(name)
+
+        patch = Patch(name, self.__patch_dir, self.__refs_dir)
+        old_bottom = patch.get_old_bottom()
+        old_top = patch.get_old_top()
+
+        # the bottom of the patch is not changed by refresh. If the
+        # old_bottom is different, there wasn't any previous 'refresh'
+        # command (probably only a 'push')
+        if old_bottom != patch.get_bottom() or old_top == patch.get_top():
+            raise StackException, 'No refresh undo information available'
+
+        git.reset(tree_id = old_top, check_out = False)
+        patch.restore_old_boundaries()
+
     def new_patch(self, name, message = None, can_edit = True,
                   unapplied = False, show_patch = False,
                   top = None, bottom = None,
@@ -878,6 +904,16 @@ class Series:
         assert(name)
 
         patch = Patch(name, self.__patch_dir, self.__refs_dir)
+        old_bottom = patch.get_old_bottom()
+        old_top = patch.get_old_top()
+
+        # the top of the patch is changed by a push operation only
+        # together with the bottom (otherwise the top was probably
+        # modified by 'refresh'). If they are both unchanged, there
+        # was a fast forward
+        if old_bottom == patch.get_bottom() and old_top != patch.get_top():
+            raise StackException, 'No push undo information available'
+
         git.reset()
         self.pop_patch(name)
         return patch.restore_old_boundaries()