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@xxxxxxxxxx> --- stgit/commands/pull.py | 6 +----- stgit/stack.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py index 7c5db22..1a948be 100644 --- a/stgit/commands/pull.py +++ b/stgit/commands/pull.py @@ -53,11 +53,7 @@ def func(parser, options, args): if len(args) >= 1: repository = args[0] else: - section = 'branch "%s"' % git.get_head_file() - if config.has_option(section, 'remote'): - repository = config.get(section, 'remote') - else: - repository = 'origin' + repository = crt_series.get_parent_remote() refspec = None if len(args) == 2: diff --git a/stgit/stack.py b/stgit/stack.py index 2ae4dd5..e801f42 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -397,6 +397,19 @@ class Series(StgitObject): def set_description(self, line): self._set_field('description', line) + def get_parent_remote(self): + section = 'branch "%s"' % self.__name + if config.has_option(section, 'remote'): + return config.get(section, 'remote') + else: + return 'origin' + + def __set_parent_remote(self, remote): + section = 'branch "%s"' % self.__name + if not config.has_section(section): + config.add_section(section) + config.set(section, 'remote', remote) + def __patch_is_current(self, patch): return patch.get_name() == self.get_current() - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html