Update 'stg pull' to the latest 'git pull' API

The --head and --tag options are no longer available.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 2aba4440c266420e3a0797df7567ed61b1c646c6..f4e0005e9793dc995391e90caeb34b91e7732f58 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -24,9 +24,9 @@ from stgit import stack, git
 
 
 help = 'pull the changes from the remote repository'
 
 
 help = 'pull the changes from the remote repository'

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

 
 

-Pull the latest changes from the given URL or branch (defaulting to
+Pull the latest changes from the given repository (defaulting to

 'origin'). This command works by popping all the patches from the
 stack, pulling the changes in the parent repository, setting the base
 of the stack to the latest parent HEAD and pusing the patches back
 'origin'). This command works by popping all the patches from the
 stack, pulling the changes in the parent repository, setting the base
 of the stack to the latest parent HEAD and pusing the patches back


@@ -34,33 +34,26 @@ of the stack to the latest parent HEAD and pusing 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.
 

-Note that this command doesn't perform any merge operation for the
-base of the stack, it only performs merges with the patches being
-pushed."""
+Check the 'git pull' documentation for the <repository> and <refspec>
+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',

-                       action = 'store_true'),
-           make_option('--head', metavar='OTHER_HEAD',
-                       help = 'pull OTHER_HEAD instead of HEAD'),
-           make_option('--tag',
-                       help = 'pull TAG')]
-
+                       action = 'store_true')]

 
 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) == 0:
-        location = read_string(os.path.join(git.base_dir, 'branches',
-                                            'origin'))
-    elif len(args) == 1:
-        location = args[0]
-        branch = os.path.join(git.base_dir, 'branches', location)
-        if os.path.isfile(branch):
-            location = read_string(branch)
-    else:
+    if len(args) > 2:

         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) == 2:
+        refspec = args[1]
+

     check_local_changes()
     check_conflicts()
     check_head_top_equal()
     check_local_changes()
     check_conflicts()
     check_head_top_equal()


@@ -74,8 +67,8 @@ def func(parser, options, args):
         print 'done'
 
     # pull the remote changes
         print 'done'
 
     # pull the remote changes

-    print 'Pulling from "%s"...' % location
-    git.pull(location, options.head, options.tag)
+    print 'Pulling from "%s"...' % repository
+    git.pull(repository, refspec)

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

diff --git a/stgit/git.py b/stgit/git.py
index fd64ca5c6a6305d4792ea17eeb7a3d52afbec3d3..e4aacd59f96af67fd079124c63ead292622f1e69 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -457,18 +457,16 @@ def reset(tree_id = None):
     # checkout doesn't remove files
     map(os.remove, rm_files)
 
     # checkout doesn't remove files
     map(os.remove, rm_files)
 

-def pull(location, head = None, tag = None):
-    """Fetch changes from the remote repository. At the moment, just
-    use the 'git fetch' scripts
+def pull(repository = 'origin', refspec = None):
+    """Pull changes from the remote repository. At the moment, just
+    use the 'git pull' command

     """
     """

-    args = [location]
-    if head:
-        args += [head]
-    elif tag:
-        args += ['tag', tag]
+    args = [repository]
+    if refspec:
+        args.append(refspec)

 
     if __run('git pull', args) != 0:
 
     if __run('git pull', args) != 0:

-        raise GitException, 'Failed "git fetch %s"' % location
+        raise GitException, 'Failed "git pull %s"' % repository

 
 def apply_patch(filename = None):
     """Apply a patch onto the current index. There must not be any
 
 def apply_patch(filename = None):
     """Apply a patch onto the current index. There must not be any