Move stack-base querying into Series class.

Signed-off-by: Yann Dirson <ydirson@altern.org>

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index aa0409a7fc1fa4d81c04771d9f4b586cd56903b2..c2c99e2640bd05a5f0b337bca7dc4923d056b11d 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -101,7 +101,7 @@ def git_id(rev):
             elif patch_id == 'log':
                 return series.get_patch(patch).get_log()
         if patch == 'base' and patch_id == None:
             elif patch_id == 'log':
                 return series.get_patch(patch).get_log()
         if patch == 'base' and patch_id == None:

-            return read_string(series.get_base_file())
+            return series.get_base()

     except RevParseException:
         pass
     return git.rev_parse(rev + '^{commit}')
     except RevParseException:
         pass
     return git.rev_parse(rev + '^{commit}')

diff --git a/stgit/stack.py b/stgit/stack.py
index 3632aa1b94a25e58c13cfd3dc496e0681bc2a460..dc6caa6d6820db55afb27c5a194b1806ec70141f 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -394,6 +394,9 @@ class Series(StgitObject):
         self.__begin_stack_check()
         return self.__base_file
 
         self.__begin_stack_check()
         return self.__base_file
 

+    def get_base(self):
+        return read_string(self.get_base_file())
+

     def get_protected(self):
         return os.path.isfile(os.path.join(self._dir(), 'protected'))
 
     def get_protected(self):
         return os.path.isfile(os.path.join(self._dir(), 'protected'))
 


@@ -609,7 +612,7 @@ class Series(StgitObject):
         """
         try:
             # allow cloning of branches not under StGIT control
         """
         try:
             # allow cloning of branches not under StGIT control

-            base = read_string(self.get_base_file())
+            base = self.get_base()

         except:
             base = git.get_head()
         Series(target_series).init(create_at = base)
         except:
             base = git.get_head()
         Series(target_series).init(create_at = base)