Commit | Line | Data |
---|---|---|
f338c3c0 CM |
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' | |
3899a8e2 | 27 | usage = """%prog [options] [<location>] |
26aab5b0 | 28 | |
3899a8e2 CM |
29 | Pull the latest changes from the given URL or branch (defaulting to |
30 | 'origin'). This command works by popping all the patches from the | |
31 | stack, pulling the changes in the parent repository, setting the base | |
32 | of the stack to the latest parent HEAD and pusing the patches back | |
33 | (unless '--nopush' is specified). The 'push' operation can fail if | |
34 | there are conflicts. They need to be resolved and the patch pushed | |
35 | again. | |
26aab5b0 CM |
36 | |
37 | Note that this command doesn't perform any merge operation for the | |
38 | base of the stack, it only performs merges with the patches being | |
39 | pushed.""" | |
f338c3c0 CM |
40 | |
41 | options = [make_option('-n', '--nopush', | |
42 | help = 'do not push the patches back after pulling', | |
43 | action = 'store_true'), | |
44 | make_option('--head', metavar='OTHER_HEAD', | |
45 | help = 'pull OTHER_HEAD instead of HEAD'), | |
46 | make_option('--tag', | |
47 | help = 'pull TAG')] | |
48 | ||
49 | ||
50 | def func(parser, options, args): | |
51 | """Pull the changes from a remote repository | |
52 | """ | |
3899a8e2 CM |
53 | if len(args) == 0: |
54 | location = read_string(os.path.join(git.base_dir, 'branches', | |
55 | 'origin')) | |
56 | elif len(args) == 1: | |
57 | location = args[0] | |
58 | branch = os.path.join(git.base_dir, 'branches', location) | |
59 | if os.path.isfile(branch): | |
60 | location = read_string(branch) | |
61 | else: | |
f338c3c0 CM |
62 | parser.error('incorrect number of arguments') |
63 | ||
64 | check_local_changes() | |
65 | check_conflicts() | |
66 | check_head_top_equal() | |
67 | ||
5b0f1eaa | 68 | orig_head = git_id('base') |
f338c3c0 CM |
69 | |
70 | print 'Pulling from "%s"...' % location | |
71 | new_head = git.fetch(location, options.head, options.tag) | |
72 | print 'done' | |
73 | ||
5b0f1eaa | 74 | if new_head == orig_head: |
f338c3c0 CM |
75 | print 'Branch already up-to-date' |
76 | else: | |
5b0f1eaa CM |
77 | write_string(os.path.join(git.base_dir, 'ORIG_HEAD'), orig_head) |
78 | ||
f338c3c0 CM |
79 | applied = crt_series.get_applied() |
80 | ||
81 | if len(applied) > 0: | |
82 | print 'Popping all patches...', | |
83 | sys.stdout.flush() | |
84 | crt_series.pop_patch(applied[0]) | |
85 | print 'done' | |
86 | ||
87 | git.switch(new_head) | |
88 | ||
89 | if options.nopush: | |
90 | applied = [] | |
91 | for p in applied: | |
92 | print 'Pushing patch "%s"...' % p, | |
93 | sys.stdout.flush() | |
94 | crt_series.push_patch(p) | |
95 | if crt_series.empty_patch(p): | |
96 | print 'done (empty patch)' | |
97 | else: | |
98 | print 'done' | |
99 | ||
100 | print_crt_patch() |