threads / patch / 6640

patch, 2 partsMinor stgit touches

Subject: [PATCH 0/2] Minor stgit touches

## tl;dr

3 messages between Feb 3, 2007 and Feb 3, 2007. Diffs are folded; open one to read it.

replies: 2people: 1as markdown or json

Yann Dirson· Feb 3, 2007, 16:04 UTC · lore

Here is one bugfix, and the addition of a notice to the user when we fallback to "origin" as a parent because of the lack of config parameters.

-- 
Yann Dirson    <ydirson@altern.org> |
Debian-related: <dirson@debian.org> |   Support Debian GNU/Linux:
                                    |  Freedom, Power, Stability, Gratis
     http://ydirson.free.fr/        | Check <http://www.debian.org/>

Yann Dirson· Feb 3, 2007, 16:04 UTC · re: Yann Dirson · lore

[PATCH 1/2] Correctly check the pull-does-rebase parameter in 'stg pull'.

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

 stgit/commands/pull.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Show changes to stgit/commands/pull.py +2 −1

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 15bbed6..330cc25 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -72,7 +72,8 @@ def func(parser, options, args):
     # pull the remote changes
     print 'Pulling from "%s"...' % repository
     git.fetch(repository)
-    if (config.get('stgit.pull-does-rebase')):
+    if (config.get('stgit.pull-does-rebase') == 'yes'):
+        print "rebasing to '%s'..." % crt_series.get_parent_branch()
         git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch()))
     print 'done'

Yann Dirson· Feb 3, 2007, 16:04 UTC · re: Yann Dirson · lore

[PATCH 2/2] Warn the user when there is no parent information in the config.

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

 stgit/stack.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Show changes to stgit/stack.py +2 −4

diff --git a/stgit/stack.py b/stgit/stack.py
index 3960729..9609ed3 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -418,8 +418,7 @@ class Series(StgitObject):
         if value:
             return value
         elif 'origin' in git.remotes_list():
-            # FIXME: this is for compatibility only.  Should be
-            # dropped when all relevant commands record this info.
+            print "Notice: no parent remote declared for stack '%s', defaulting to 'origin'.  Consider setting 'branch.%s.remote' with 'git repo-config'." % (self.__name, self.__name)
             return 'origin'
         else:
             raise StackException, 'Cannot find a parent remote for "%s"' % self.__name
@@ -432,8 +431,7 @@ class Series(StgitObject):
         if value:
             return value
         elif git.rev_parse('heads/origin'):
-            # FIXME: this is for compatibility only.  Should be
-            # dropped when all relevant commands record this info.
+            print "Notice: no parent branch declared for stack '%s', defaulting to 'heads/origin'.  Consider setting 'branch.%s.merge' with 'git repo-config'." % (self.__name, self.__name)
             return 'heads/origin'
         else:
             raise StackException, 'Cannot find a parent branch for "%s"' % self.__name