Fix the rebasing with an external command

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index e61d45be40a494313b81e6d034b3b2c6074af4e3..bd08b35ffede59286893b4b67271f579ab816431 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -23,6 +23,7 @@ from email.Utils import formatdate
 
 from stgit.utils import *
 from stgit.out import *
 
 from stgit.utils import *
 from stgit.out import *

+from stgit.run import *

 from stgit import git, basedir, templates
 from stgit.config import config
 from shutil import copyfile
 from stgit import git, basedir, templates
 from stgit.config import config
 from shutil import copyfile


@@ -841,9 +842,16 @@ class Series(PatchSet):
                   author_name = None, author_email = None, author_date = None,
                   committer_name = None, committer_email = None,
                   before_existing = False):
                   author_name = None, author_email = None, author_date = None,
                   committer_name = None, committer_email = None,
                   before_existing = False):

-        """Creates a new patch
+        """Creates a new patch, either pointing to an existing commit object,
+        or by creating a new commit object.

         """
 
         """
 

+        assert commit or (top and bottom)
+        assert not before_existing or (top and bottom)
+        assert not (commit and before_existing)
+        assert (top and bottom) or (not top and not bottom)
+        assert not top or (bottom == git.get_commit(top).get_parent())
+

         if name != None:
             self.__patch_name_valid(name)
             if self.patch_exists(name):
         if name != None:
             self.__patch_name_valid(name)
             if self.patch_exists(name):


@@ -867,13 +875,6 @@ class Series(PatchSet):
         patch = self.get_patch(name)
         patch.create()
 
         patch = self.get_patch(name)
         patch.create()
 

-        if not bottom:
-            bottom = head
-        if not top:
-            top = head
-
-        patch.set_bottom(bottom)
-        patch.set_top(top)

         patch.set_description(descr)
         patch.set_authname(author_name)
         patch.set_authemail(author_email)
         patch.set_description(descr)
         patch.set_authname(author_name)
         patch.set_authemail(author_email)


@@ -883,9 +884,6 @@ class Series(PatchSet):
 
         if before_existing:
             insert_string(self.__applied_file, patch.get_name())
 
         if before_existing:
             insert_string(self.__applied_file, patch.get_name())

-            # no need to commit anything as the object is already
-            # present (mainly used by 'uncommit')
-            commit = False

         elif unapplied:
             patches = [patch.get_name()] + self.get_unapplied()
             write_strings(self.__unapplied_file, patches)
         elif unapplied:
             patches = [patch.get_name()] + self.get_unapplied()
             write_strings(self.__unapplied_file, patches)


@@ -895,10 +893,15 @@ class Series(PatchSet):
             set_head = True
 
         if commit:
             set_head = True
 
         if commit:

+            if top:
+                top_commit = git.get_commit(top)
+            else:
+                bottom = head
+                top_commit = git.get_commit(head)
+

             # create a commit for the patch (may be empty if top == bottom);
             # only commit on top of the current branch
             assert(unapplied or bottom == head)
             # create a commit for the patch (may be empty if top == bottom);
             # only commit on top of the current branch
             assert(unapplied or bottom == head)

-            top_commit = git.get_commit(top)

             commit_id = git.commit(message = descr, parents = [bottom],
                                    cache_update = False,
                                    tree_id = top_commit.get_tree(),
             commit_id = git.commit(message = descr, parents = [bottom],
                                    cache_update = False,
                                    tree_id = top_commit.get_tree(),


@@ -909,7 +912,12 @@ class Series(PatchSet):
                                    committer_name = committer_name,
                                    committer_email = committer_email)
             # set the patch top to the new commit
                                    committer_name = committer_name,
                                    committer_email = committer_email)
             # set the patch top to the new commit

+            patch.set_bottom(bottom)

             patch.set_top(commit_id)
             patch.set_top(commit_id)

+        else:
+            assert top != bottom
+            patch.set_bottom(bottom)
+            patch.set_top(top)

 
         self.log_patch(patch, 'new')
 
 
         self.log_patch(patch, 'new')