help = 'pull the changes from the remote repository'
-usage = """%prog [options]
+usage = """%prog [options] [<location>]
-Pull the latest changes from the parent repository. 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 (unless '--nopush' is specified). The
-'push' operation can fail if there are conflicts. They need to be
-resolved and the patch pushed again. The URL of the parent repository
-is specified in the .git/branches/<head> file.
+Pull the latest changes from the given URL or branch (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
+(unless '--nopush' is specified). The 'push' operation can fail if
+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
def func(parser, options, args):
"""Pull the changes from a remote repository
"""
- if len(args) != 0:
+ 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:
parser.error('incorrect number of arguments')
check_local_changes()
check_conflicts()
check_head_top_equal()
- branch = git.get_head_file()
- location = read_string(os.path.join(git.base_dir, 'branches', branch))
+ # pop all patches
+ applied = crt_series.get_applied()
+ if len(applied) > 0:
+ print 'Popping all patches...',
+ sys.stdout.flush()
+ crt_series.pop_patch(applied[0])
+ print 'done'
+ # pull the remote changes
print 'Pulling from "%s"...' % location
- new_head = git.fetch(location, options.head, options.tag)
+ git.pull(location, options.head, options.tag)
print 'done'
- if new_head == git_id('base'):
- print 'Branch already up-to-date'
- else:
- applied = crt_series.get_applied()
-
- if len(applied) > 0:
- print 'Popping all patches...',
- sys.stdout.flush()
- crt_series.pop_patch(applied[0])
+ # push the patches back
+ if options.nopush:
+ applied = []
+ for p in applied:
+ print 'Pushing patch "%s"...' % p,
+ sys.stdout.flush()
+ crt_series.push_patch(p)
+ if crt_series.empty_patch(p):
+ print 'done (empty patch)'
+ else:
print 'done'
- git.switch(new_head)
-
- if options.nopush:
- applied = []
- for p in applied:
- print 'Pushing patch "%s"...' % p,
- sys.stdout.flush()
- crt_series.push_patch(p)
- if crt_series.empty_patch(p):
- print 'done (empty patch)'
- else:
- print 'done'
-
print_crt_patch()
~mdw / stgit / blobdiff