The user does not want to mess with the refspecs.

[stgit] / stgit / commands / pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 227249e..f837fd4 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -24,7 +24,7 @@ from stgit import stack, git
 
 
 help = 'pull the changes from the remote repository'
 
 
 help = 'pull the changes from the remote repository'

-usage = """%prog [options] [<repository>] [<refspec>]
+usage = """%prog [options] [<repository>]

 
 Pull the latest changes from the given repository (defaulting to
 'origin'). This command works by popping all the patches from the
 
 Pull the latest changes from the given repository (defaulting to
 'origin'). This command works by popping all the patches from the


@@ -34,8 +34,7 @@ of the stack to the latest parent HEAD and pushing the patches back
 there are conflicts. They need to be resolved and the patch pushed
 again.
 
 there are conflicts. They need to be resolved and the patch pushed
 again.
 

-Check the 'git pull' documentation for the <repository> and <refspec>
-format."""
+Check the 'git pull' documentation for the <repository> format."""

 
 options = [make_option('-n', '--nopush',
                        help = 'do not push the patches back after pulling',
 
 options = [make_option('-n', '--nopush',
                        help = 'do not push the patches back after pulling',


@@ -47,15 +46,13 @@ options = [make_option('-n', '--nopush',
 def func(parser, options, args):
     """Pull the changes from a remote repository
     """
 def func(parser, options, args):
     """Pull the changes from a remote repository
     """

-    if len(args) > 2:
+    if len(args) > 1:

         parser.error('incorrect number of arguments')
 
         parser.error('incorrect number of arguments')
 

-    repository = 'origin'
-    refspec = None

     if len(args) >= 1:
         repository = args[0]
     if len(args) >= 1:
         repository = args[0]

-    if len(args) == 2:
-        refspec = args[1]
+    else:
+        repository = crt_series.get_parent_remote()

 
     if crt_series.get_protected():
         raise CmdException, 'This branch is protected. Pulls are not permitted'
 
     if crt_series.get_protected():
         raise CmdException, 'This branch is protected. Pulls are not permitted'


@@ -74,7 +71,7 @@ def func(parser, options, args):
 
     # pull the remote changes
     print 'Pulling from "%s"...' % repository
 
     # pull the remote changes
     print 'Pulling from "%s"...' % repository

-    git.pull(repository, refspec)
+    git.pull(repository)

     print 'done'
 
     # push the patches back
     print 'done'
 
     # push the patches back


@@ -82,8 +79,7 @@ def func(parser, options, args):
         push_patches(applied, options.merged)
 
     # maybe tidy up
         push_patches(applied, options.merged)
 
     # maybe tidy up

-    repack = config.get('stgit', 'keepoptimized')
-    if repack == 'yes':
+    if config.get('stgit.keepoptimized') == 'yes':

         git.repack()
 
     print_crt_patch()
         git.repack()
 
     print_crt_patch()