| | 1 | __copyright__ = """ |
| | 2 | Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com> |
| | 3 | |
| | 4 | This program is free software; you can redistribute it and/or modify |
| | 5 | it under the terms of the GNU General Public License version 2 as |
| | 6 | published by the Free Software Foundation. |
| | 7 | |
| | 8 | This program is distributed in the hope that it will be useful, |
| | 9 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| | 10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| | 11 | GNU General Public License for more details. |
| | 12 | |
| | 13 | You should have received a copy of the GNU General Public License |
| | 14 | along with this program; if not, write to the Free Software |
| | 15 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| | 16 | """ |
| | 17 | |
| | 18 | import sys, os |
| | 19 | from optparse import OptionParser, make_option |
| | 20 | |
| | 21 | from stgit.commands.common import * |
| | 22 | from stgit.utils import * |
| | 23 | from stgit import stack, git |
| | 24 | |
| | 25 | |
| | 26 | help = 'pull the changes from the remote repository' |
| | 27 | usage = """%prog [options] [<repository>] |
| | 28 | |
| | 29 | Pull the latest changes from the given remote repository (defaulting |
| | 30 | to branch.<name>.remote, or 'origin' if not set). This command works |
| | 31 | by popping all the patches from the stack, pulling the changes in the |
| | 32 | parent repository, setting the base of the stack to the latest parent |
| | 33 | HEAD and pushing the patches back (unless '--nopush' is specified). |
| | 34 | The 'push' operation can fail if there are conflicts. They need to be |
| | 35 | resolved and the patch pushed again. |
| | 36 | |
| | 37 | Check the 'git fetch' documentation for the <repository> format.""" |
| | 38 | |
| | 39 | options = [make_option('-n', '--nopush', |
| | 40 | help = 'do not push the patches back after pulling', |
| | 41 | action = 'store_true'), |
| | 42 | make_option('-m', '--merged', |
| | 43 | help = 'check for patches merged upstream', |
| | 44 | action = 'store_true')] |
| | 45 | |
| | 46 | def func(parser, options, args): |
| | 47 | """Pull the changes from a remote repository |
| | 48 | """ |
| | 49 | if len(args) > 1: |
| | 50 | parser.error('incorrect number of arguments') |
| | 51 | |
| | 52 | if len(args) >= 1: |
| | 53 | repository = args[0] |
| | 54 | else: |
| | 55 | repository = crt_series.get_parent_remote() |
| | 56 | |
| | 57 | if crt_series.get_protected(): |
| | 58 | raise CmdException, 'This branch is protected. Pulls are not permitted' |
| | 59 | |
| | 60 | check_local_changes() |
| | 61 | check_conflicts() |
| | 62 | check_head_top_equal() |
| | 63 | |
| | 64 | # pop all patches |
| | 65 | applied = crt_series.get_applied() |
| | 66 | if len(applied) > 0: |
| | 67 | print 'Popping all applied patches...', |
| | 68 | sys.stdout.flush() |
| | 69 | crt_series.pop_patch(applied[0]) |
| | 70 | print 'done' |
| | 71 | |
| | 72 | # pull the remote changes |
| | 73 | print 'Pulling from "%s"...' % repository |
| | 74 | git.fetch(repository) |
| | 75 | if (config.get('stgit.pull-does-rebase') == 'yes'): |
| | 76 | print "rebasing to '%s'..." % crt_series.get_parent_branch() |
| | 77 | git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch())) |
| | 78 | print 'done' |
| | 79 | |
| | 80 | # push the patches back |
| | 81 | if not options.nopush: |
| | 82 | push_patches(applied, options.merged) |
| | 83 | |
| | 84 | # maybe tidy up |
| | 85 | if config.get('stgit.keepoptimized') == 'yes': |
| | 86 | git.repack() |
| | 87 | |
| | 88 | print_crt_patch() |
~mdw / stgit / blame_incremental