Move identification of parent branch's remote def up into stack class.

Also adds the __set_parent_remote() counterpart method, but only
private since it is expected to be called only through set_parent, to
be introduced in subsequent patch.

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

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index e47858a732159d70c8d0bfb58b85ac02c9b75d48..0608fb60390f70db36ca682c1fe140575fc8d965 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -53,7 +53,7 @@ def func(parser, options, args):
     if len(args) >= 1:
         repository = args[0]
     else:
-        repository = config.get('branch.%s.remote' % git.get_head_file()) or 'origin'
+        repository = crt_series.get_parent_remote()
 
     refspec = None
     if len(args) == 2:

diff --git a/stgit/stack.py b/stgit/stack.py
index 6281f368b2b3668bcec21f7ca7124052e1cee6f1..947b416e9e171f0c57c89838bf6f2698ae5fe92d 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -407,6 +407,12 @@ class Series(StgitObject):
     def set_description(self, line):
         self._set_field('description', line)
 
+    def get_parent_remote(self):
+        return config.get('branch.%s.remote' % self.__name) or 'origin'
+
+    def __set_parent_remote(self, remote):
+        value = config.set('branch.%s.remote' % self.__name, remote)
+
     def __patch_is_current(self, patch):
         return patch.get_name() == self.get_current()