Write to a stack log when stack is modified
[stgit] / stgit / commands / pull.py
... / ...
CommitLineData
1__copyright__ = """
2Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
3
4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License version 2 as
6published by the Free Software Foundation.
7
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12
13You should have received a copy of the GNU General Public License
14along with this program; if not, write to the Free Software
15Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16"""
17
18import sys, os
19from stgit.argparse import opt
20from stgit.commands.common import *
21from stgit.utils import *
22from stgit.out import *
23from stgit.config import GitConfigException
24from stgit import stack, git
25
26help = 'Pull changes from a remote repository'
27kind = 'stack'
28usage = ['[options] [<repository>]']
29description = """
30Pull the latest changes from the given remote repository (defaulting
31to branch.<name>.remote, or 'origin' if not set). This command works
32by popping all the patches from the stack, pulling the changes in the
33parent repository, setting the base of the stack to the latest parent
34HEAD and pushing the patches back (unless '--nopush' is specified).
35The 'push' operation can fail if there are conflicts. They need to be
36resolved and the patch pushed again.
37
38Check the 'git fetch' documentation for the <repository> format."""
39
40options = [
41 opt('-n', '--nopush', action = 'store_true',
42 short = 'Do not push the patches back after pulling'),
43 opt('-m', '--merged', action = 'store_true',
44 short = 'Check for patches merged upstream')]
45
46directory = DirectoryGotoToplevel(log = True)
47
48def func(parser, options, args):
49 """Pull the changes from a remote repository
50 """
51 policy = config.get('branch.%s.stgit.pull-policy' % crt_series.get_name()) or \
52 config.get('stgit.pull-policy')
53
54 if policy == 'rebase':
55 # parent is local
56 if len(args) == 1:
57 parser.error('specifying a repository is meaningless for policy="%s"' % policy)
58 if len(args) > 0:
59 parser.error('incorrect number of arguments')
60
61 else:
62 # parent is remote
63 if len(args) > 1:
64 parser.error('incorrect number of arguments')
65
66 if len(args) >= 1:
67 repository = args[0]
68 else:
69 repository = crt_series.get_parent_remote()
70
71 if crt_series.get_protected():
72 raise CmdException, 'This branch is protected. Pulls are not permitted'
73
74 check_local_changes()
75 check_conflicts()
76 check_head_top_equal(crt_series)
77
78 if policy not in ['pull', 'fetch-rebase', 'rebase']:
79 raise GitConfigException, 'Unsupported pull-policy "%s"' % policy
80
81 applied = prepare_rebase(crt_series)
82
83 # pull the remote changes
84 if policy == 'pull':
85 out.info('Pulling from "%s"' % repository)
86 git.pull(repository)
87 elif policy == 'fetch-rebase':
88 out.info('Fetching from "%s"' % repository)
89 git.fetch(repository)
90 try:
91 target = git.fetch_head()
92 except git.GitException:
93 out.error('Could not find the remote head to rebase onto - fix branch.%s.merge in .git/config' % crt_series.get_name())
94 out.error('Pushing any patches back...')
95 post_rebase(crt_series, applied, False, False)
96 raise
97
98 rebase(crt_series, target)
99 elif policy == 'rebase':
100 rebase(crt_series, crt_series.get_parent_branch())
101
102 post_rebase(crt_series, applied, options.nopush, options.merged)
103
104 # maybe tidy up
105 if config.get('stgit.keepoptimized') == 'yes':
106 git.repack()
107
108 print_crt_patch(crt_series)