Don't use refs/bases/<branchname>

It's silly to save the stack base in a ref when it can trivially be
computed from the bottommost applied patch, if any. (If there are no
applied patches, it's simply equal to HEAD.)

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 5899c38225df2244c7b09015f5b754d9735415d5..2b8e4e782aa827de3be31f43af312ab2a03401d8 100644 (file)
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -387,9 +387,6 @@ Layout of the .git directory
     heads/
       master           - the master commit id
       ...
     heads/
       master           - the master commit id
       ...

-    bases/
-      master           - the bottom id of the stack (to get a big diff)
-      ...

     tags/
       ...
     branches/
     tags/
       ...
     branches/

diff --git a/stgit/commands/uncommit.py b/stgit/commands/uncommit.py
index 0ee15858d8279d58f7c6210bf7d8016dc53a1ed3..462846cc2160379698e44297c90aeed996555e59 100644 (file)
--- a/stgit/commands/uncommit.py
+++ b/stgit/commands/uncommit.py
@@ -80,11 +80,9 @@ def func(parser, options, args):
     print 'Uncommitting %d patches...' % patch_nr,
     sys.stdout.flush()
 
     print 'Uncommitting %d patches...' % patch_nr,
     sys.stdout.flush()
 

-    base_file = crt_series.get_base_file()
-

     for n in xrange(0, patch_nr):
         # retrieve the commit (only commits with a single parent are allowed)
     for n in xrange(0, patch_nr):
         # retrieve the commit (only commits with a single parent are allowed)

-        commit_id = read_string(base_file)
+        commit_id = crt_series.get_base()

         commit = git.Commit(commit_id)
         try:
             parent, = commit.get_parents()
         commit = git.Commit(commit_id)
         try:
             parent, = commit.get_parents()


@@ -107,6 +105,5 @@ def func(parser, options, args):
                              author_name = author_name,
                              author_email = author_email,
                              author_date = author_date)
                              author_name = author_name,
                              author_email = author_email,
                              author_date = author_date)

-        write_string(base_file, parent)

 
     print 'done'
 
     print 'done'

diff --git a/stgit/stack.py b/stgit/stack.py
index b0a01dd76ab7742d213ba689a579ef61eb221523..2477ac66a196b8dbbc1fb8fc1ef445a48e2482b6 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -291,8 +291,6 @@ class Series(StgitObject):
         self._set_dir(os.path.join(self.__base_dir, 'patches', self.__name))
         self.__refs_dir = os.path.join(self.__base_dir, 'refs', 'patches',
                                        self.__name)
         self._set_dir(os.path.join(self.__base_dir, 'patches', self.__name))
         self.__refs_dir = os.path.join(self.__base_dir, 'refs', 'patches',
                                        self.__name)

-        self.__base_file = os.path.join(self.__base_dir, 'refs', 'bases',
-                                        self.__name)

 
         self.__applied_file = os.path.join(self._dir(), 'applied')
         self.__unapplied_file = os.path.join(self._dir(), 'unapplied')
 
         self.__applied_file = os.path.join(self._dir(), 'applied')
         self.__unapplied_file = os.path.join(self._dir(), 'unapplied')


@@ -378,12 +376,14 @@ class Series(StgitObject):
         f.close()
         return names
 
         f.close()
         return names
 

-    def get_base_file(self):
-        self.__begin_stack_check()
-        return self.__base_file
-

     def get_base(self):
     def get_base(self):

-        return read_string(self.get_base_file())
+        # Return the parent of the bottommost patch, if there is one.
+        if os.path.isfile(self.__applied_file):
+            bottommost = file(self.__applied_file).readline().strip()
+            if bottommost:
+                return self.get_patch(bottommost).get_bottom()
+        # No bottommost patch, so just return HEAD
+        return git.get_head()

 
     def get_head(self):
         """Return the head of the branch
 
     def get_head(self):
         """Return the head of the branch


@@ -482,22 +482,6 @@ class Series(StgitObject):
         otherwise."""
         return self.patch_applied(name) or self.patch_unapplied(name)
 
         otherwise."""
         return self.patch_applied(name) or self.patch_unapplied(name)
 

-    def __begin_stack_check(self):
-        """Save the current HEAD into .git/refs/heads/base if the stack
-        is empty
-        """
-        if len(self.get_applied()) == 0:
-            head = git.get_head()
-            write_string(self.__base_file, head)
-
-    def __end_stack_check(self):
-        """Remove .git/refs/heads/base if the stack is empty.
-        This warning should never happen
-        """
-        if len(self.get_applied()) == 0 \
-           and read_string(self.__base_file) != git.get_head():
-            print 'Warning: stack empty but the HEAD and base are different'
-

     def head_top_equal(self):
         """Return true if the head and the top are the same
         """
     def head_top_equal(self):
         """Return true if the head and the top are the same
         """


@@ -519,8 +503,6 @@ class Series(StgitObject):
             raise StackException, self.__patch_dir + ' already exists'
         if os.path.exists(self.__refs_dir):
             raise StackException, self.__refs_dir + ' already exists'
             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)
 
         if (create_at!=False):
             git.create_branch(self.__name, create_at)


@@ -528,15 +510,12 @@ class Series(StgitObject):
         os.makedirs(self.__patch_dir)
 
         self.set_parent(parent_remote, parent_branch)
         os.makedirs(self.__patch_dir)
 
         self.set_parent(parent_remote, parent_branch)

-        
-        create_dirs(os.path.join(self.__base_dir, 'refs', 'bases'))

 
         self.create_empty_field('applied')
         self.create_empty_field('unapplied')
         self.create_empty_field('description')
         os.makedirs(os.path.join(self._dir(), 'patches'))
         os.makedirs(self.__refs_dir)
 
         self.create_empty_field('applied')
         self.create_empty_field('unapplied')
         self.create_empty_field('description')
         os.makedirs(os.path.join(self._dir(), 'patches'))
         os.makedirs(self.__refs_dir)

-        self.__begin_stack_check()

         self._set_field('orig-base', git.get_head())
 
     def convert(self):
         self._set_field('orig-base', git.get_head())
 
     def convert(self):


@@ -582,17 +561,12 @@ class Series(StgitObject):
 
         if to_stack.is_initialised():
             raise StackException, '"%s" already exists' % to_stack.get_branch()
 
         if to_stack.is_initialised():
             raise StackException, '"%s" already exists' % to_stack.get_branch()

-        if os.path.exists(to_stack.__base_file):
-            os.remove(to_stack.__base_file)

 
         git.rename_branch(self.__name, to_name)
 
         if os.path.isdir(self._dir()):
             rename(os.path.join(self.__base_dir, 'patches'),
                    self.__name, to_stack.__name)
 
         git.rename_branch(self.__name, to_name)
 
         if os.path.isdir(self._dir()):
             rename(os.path.join(self.__base_dir, 'patches'),
                    self.__name, to_stack.__name)

-        if os.path.exists(self.__base_file):
-            rename(os.path.join(self.__base_dir, 'refs', 'bases'),
-                   self.__name, to_stack.__name)

         if os.path.exists(self.__refs_dir):
             rename(os.path.join(self.__base_dir, 'refs', 'patches'),
                    self.__name, to_stack.__name)
         if os.path.exists(self.__refs_dir):
             rename(os.path.join(self.__base_dir, 'refs', 'patches'),
                    self.__name, to_stack.__name)


@@ -698,10 +672,6 @@ class Series(StgitObject):
             except OSError:
                 print 'Refs directory %s is not empty.' % self.__refs_dir
 
             except OSError:
                 print 'Refs directory %s is not empty.' % self.__refs_dir
 

-        if os.path.exists(self.__base_file):
-            remove_file_and_dirs(
-                os.path.join(self.__base_dir, 'refs', 'bases'), self.__name)
-

         # Cleanup parent informations
         # FIXME: should one day make use of git-config --section-remove,
         # scheduled for 1.5.1
         # Cleanup parent informations
         # FIXME: should one day make use of git-config --section-remove,
         # scheduled for 1.5.1


@@ -824,8 +794,6 @@ class Series(StgitObject):
 
         head = git.get_head()
 
 
         head = git.get_head()
 

-        self.__begin_stack_check()
-

         patch = Patch(name, self.__patch_dir, self.__refs_dir)
         patch.create()
 
         patch = Patch(name, self.__patch_dir, self.__refs_dir)
         patch.create()
 


@@ -893,8 +861,6 @@ class Series(StgitObject):
         if self.patch_hidden(name):
             self.unhide_patch(name)
 
         if self.patch_hidden(name):
             self.unhide_patch(name)
 

-        self.__begin_stack_check()
-

     def forward_patches(self, names):
         """Try to fast-forward an array of patches.
 
     def forward_patches(self, names):
         """Try to fast-forward an array of patches.
 


@@ -902,7 +868,6 @@ class Series(StgitObject):
         stack. Apply the rest with push_patch
         """
         unapplied = self.get_unapplied()
         stack. Apply the rest with push_patch
         """
         unapplied = self.get_unapplied()

-        self.__begin_stack_check()

 
         forwarded = 0
         top = git.get_head()
 
         forwarded = 0
         top = git.get_head()


@@ -1001,8 +966,6 @@ class Series(StgitObject):
         unapplied = self.get_unapplied()
         assert(name in unapplied)
 
         unapplied = self.get_unapplied()
         assert(name in unapplied)
 

-        self.__begin_stack_check()
-

         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 
         head = git.get_head()
         patch = Patch(name, self.__patch_dir, self.__refs_dir)
 
         head = git.get_head()


@@ -1140,8 +1103,6 @@ class Series(StgitObject):
         else:
             self.__set_current(applied[-1])
 
         else:
             self.__set_current(applied[-1])
 

-        self.__end_stack_check()
-

     def empty_patch(self, name):
         """Returns True if the patch is empty
         """
     def empty_patch(self, name):
         """Returns True if the patch is empty
         """

diff --git a/t/t1000-branch-create.sh b/t/t1000-branch-create.sh
index f0c23678e8b741a714bdc03549adc5c8b928f906..58209e73f7ad172ee4f4f3dab045efd15b611952 100755 (executable)
--- a/t/t1000-branch-create.sh
+++ b/t/t1000-branch-create.sh
@@ -38,20 +38,6 @@ test_expect_success \
      ( grep foo .git/HEAD; test $? = 1 )
 '
 
      ( grep foo .git/HEAD; test $? = 1 )
 '
 

-test_expect_failure \
-    'Try to create an stgit branch with a spurious refs/bases/ entry' \
-    'find .git -name foo | xargs rm -rf &&
-     touch .git/refs/bases/foo &&
-     stg branch -c foo
-'
-
-test_expect_success \
-    'Check no part of the branch was created' \
-    'test "`find .git -name foo | tee /dev/stderr`" = ".git/refs/bases/foo" &&
-     ( grep foo .git/HEAD; test $? = 1 )
-'
-
-

 test_expect_failure \
     'Try to create an stgit branch with an existing git branch by that name' \
     'find .git -name foo | xargs rm -rf &&
 test_expect_failure \
     'Try to create an stgit branch with an existing git branch by that name' \
     'find .git -name foo | xargs rm -rf &&

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index 7847a38dd186cfe69828339e24d5cf9e10c9014a..6769667fc6003945da33790b43cffb5802572949 100755 (executable)
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh
@@ -30,11 +30,12 @@ test_expect_success \
 
 test_expect_success \
     'Port those patches to orig tree' \
 
 test_expect_success \
     'Port those patches to orig tree' \

-    "(cd foo &&
-      GIT_DIR=../bar/.git git-format-patch --stdout bases/master..HEAD |
+    '(cd foo &&
+      GIT_DIR=../bar/.git git-format-patch --stdout \
+          $(cd ../bar && stg id base@master)..HEAD |

       git-am -3 -k
      )
       git-am -3 -k
      )

-"
+    '

 
 test_expect_success \
     'Pull to sync with parent, preparing for the problem' \
 
 test_expect_success \
     'Pull to sync with parent, preparing for the problem' \

diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh
index 42c6619112566d9e17706d2e3fa40753aab5aeb0..46d9f825479c75608c99ad987e39c208e8459aa9 100755 (executable)
--- a/t/t1201-pull-trailing.sh
+++ b/t/t1201-pull-trailing.sh
@@ -28,11 +28,12 @@ test_expect_success \
 
 test_expect_success \
     'Port those patches to orig tree' \
 
 test_expect_success \
     'Port those patches to orig tree' \

-    "(cd foo &&
-      GIT_DIR=../bar/.git git-format-patch --stdout bases/master..HEAD |
+    '(cd foo &&
+      GIT_DIR=../bar/.git git-format-patch --stdout \
+          $(cd ../bar && stg id base@master)..HEAD |

       git-am -3 -k
      )
       git-am -3 -k
      )

-"
+    '

 
 test_expect_success \
     'Pull those patches applied upstream, without pushing' \
 
 test_expect_success \
     'Pull those patches applied upstream, without pushing' \

diff --git a/t/t2200-rebase.sh b/t/t2200-rebase.sh
index e2d9d9a01553209defecf9449720ab475785718e..52462dd94926e9340d9cd19855644a1cd984b9f4 100755 (executable)
--- a/t/t2200-rebase.sh
+++ b/t/t2200-rebase.sh
@@ -27,7 +27,7 @@ test_expect_success \
        'Rebase to previous commit' \
        '
        stg rebase master~1 &&
        'Rebase to previous commit' \
        '
        stg rebase master~1 &&

-       test `git rev-parse bases/stack` = `git rev-parse master~1`
+       test `stg id base@stack` = `git rev-parse master~1`

        '
 
 test_done
        '
 
 test_done