Rename Repository.head to Repository.head_ref

This is to avoid confusion with the Stack.head function which returns
a commit object rather than a file name. The patch also changes the
"new" function to use stack.head directly rather than via the
Repository.refs... object.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Acked-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/new.py b/stgit/commands/new.py
index 15bb2e0f426b366e8a042d236d04dc98ef8b0357..c4ee4e141dc8e2d62a40d46b2634df4a391204a0 100644 (file)
--- a/stgit/commands/new.py
+++ b/stgit/commands/new.py
@@ -58,9 +58,8 @@ def func(parser, options, args):
     else:
         parser.error('incorrect number of arguments')
 
     else:
         parser.error('incorrect number of arguments')
 

-    head = directory.repository.refs.get(directory.repository.head)

     cd = gitlib.CommitData(
     cd = gitlib.CommitData(

-        tree = head.data.tree, parents = [head], message = '',
+        tree = stack.head.data.tree, parents = [stack.head], message = '',

         author = gitlib.Person.author(), committer = gitlib.Person.committer())
 
     # Set patch commit message from commandline.
         author = gitlib.Person.author(), committer = gitlib.Person.committer())
 
     # Set patch commit message from commandline.

diff --git a/stgit/lib/git.py b/stgit/lib/git.py
index c9f01e38f18f40243f1e2a6777b235f306ed1357..fd66f6d18e028dda3eeb880fa2c77952956ae63e 100644 (file)
--- a/stgit/lib/git.py
+++ b/stgit/lib/git.py
@@ -443,13 +443,13 @@ class Repository(RunWithEnv):
                                                 ).output_one_line()
         return self.get_commit(sha1)
     @property
                                                 ).output_one_line()
         return self.get_commit(sha1)
     @property

-    def head(self):
+    def head_ref(self):

         try:
             return self.run(['git', 'symbolic-ref', '-q', 'HEAD']
                             ).output_one_line()
         except run.RunException:
             raise DetachedHeadException()
         try:
             return self.run(['git', 'symbolic-ref', '-q', 'HEAD']
                             ).output_one_line()
         except run.RunException:
             raise DetachedHeadException()

-    def set_head(self, ref, msg):
+    def set_head_ref(self, ref, msg):

         self.run(['git', 'symbolic-ref', '-m', msg, 'HEAD', ref]).no_output()
     def simple_merge(self, base, ours, theirs):
         """Given three L{Tree}s, tries to do an in-index merge with a
         self.run(['git', 'symbolic-ref', '-m', msg, 'HEAD', ref]).no_output()
     def simple_merge(self, base, ours, theirs):
         """Given three L{Tree}s, tries to do an in-index merge with a

diff --git a/stgit/lib/stack.py b/stgit/lib/stack.py
index bdd21b1e24a75846ecf7c38e2d0439d8e0ed199a..b1544a5e41886d39f9d9750694bc43c9e5af8bc7 100644 (file)
--- a/stgit/lib/stack.py
+++ b/stgit/lib/stack.py
@@ -178,7 +178,7 @@ class Repository(git.Repository):
         self.__stacks = {} # name -> Stack
     @property
     def current_branch(self):
         self.__stacks = {} # name -> Stack
     @property
     def current_branch(self):

-        return utils.strip_leading('refs/heads/', self.head)
+        return utils.strip_leading('refs/heads/', self.head_ref)

     @property
     def current_stack(self):
         return self.get_stack()
     @property
     def current_stack(self):
         return self.get_stack()