Infrastructure for current directory handling
[stgit] / stgit / commands / sync.py
1 __copyright__ = """
2 Copyright (C) 2006, 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 import stgit.commands.common
22 from stgit.commands.common import *
23 from stgit.utils import *
24 from stgit.out import *
25 from stgit import stack, git
26
27
28 help = 'synchronise patches with a branch or a series'
29 usage = """%prog [options] [<patch1>] [<patch2>] [<patch3>..<patch4>]
30
31 For each of the specified patches perform a three-way merge with the
32 same patch in the specified branch or series. The command can be used
33 for keeping patches on several branches in sync. Note that the
34 operation may fail for some patches because of conflicts. The patches
35 in the series must apply cleanly.
36
37 The sync operation can be reverted for individual patches with --undo."""
38
39 directory = DirectoryHasRepository()
40 options = [make_option('-a', '--all',
41 help = 'synchronise all the patches',
42 action = 'store_true'),
43 make_option('-B', '--ref-branch',
44 help = 'syncronise patches with BRANCH'),
45 make_option('-s', '--series',
46 help = 'syncronise patches with SERIES'),
47 make_option('--undo',
48 help = 'undo the synchronisation of the current patch',
49 action = 'store_true')]
50
51 def __check_all():
52 check_local_changes()
53 check_conflicts()
54 check_head_top_equal()
55
56 def __branch_merge_patch(remote_series, pname):
57 """Merge a patch from a remote branch into the current tree.
58 """
59 patch = remote_series.get_patch(pname)
60 git.merge(patch.get_bottom(), git.get_head(), patch.get_top())
61
62 def __series_merge_patch(base, patchdir, pname):
63 """Merge a patch file with the given StGIT patch.
64 """
65 patchfile = os.path.join(patchdir, pname)
66 git.apply_patch(filename = patchfile, base = base)
67
68 def func(parser, options, args):
69 """Synchronise a range of patches
70 """
71 if options.undo:
72 if options.ref_branch or options.series:
73 raise CmdException, \
74 '--undo cannot be specified with --ref-branch or --series'
75 __check_all()
76
77 out.start('Undoing the sync of "%s"' % crt_series.get_current())
78 crt_series.undo_refresh()
79 git.reset()
80 out.done()
81 return
82
83 if options.ref_branch:
84 remote_series = stack.Series(options.ref_branch)
85 if options.ref_branch == crt_series.get_name():
86 raise CmdException, 'Cannot synchronise with the current branch'
87 remote_patches = remote_series.get_applied()
88
89 # the merge function merge_patch(patch, pname)
90 merge_patch = lambda patch, pname: \
91 __branch_merge_patch(remote_series, pname)
92 elif options.series:
93 patchdir = os.path.dirname(options.series)
94
95 remote_patches = []
96 f = file(options.series)
97 for line in f:
98 p = re.sub('#.*$', '', line).strip()
99 if not p:
100 continue
101 remote_patches.append(p)
102 f.close()
103
104 # the merge function merge_patch(patch, pname)
105 merge_patch = lambda patch, pname: \
106 __series_merge_patch(patch.get_bottom(), patchdir, pname)
107 else:
108 raise CmdException, 'No remote branch or series specified'
109
110 applied = crt_series.get_applied()
111
112 if options.all:
113 patches = applied
114 elif len(args) != 0:
115 patches = parse_patches(args, applied, ordered = True)
116 elif applied:
117 patches = [crt_series.get_current()]
118 else:
119 parser.error('no patches applied')
120
121 if not patches:
122 raise CmdException, 'No patches to synchronise'
123
124 __check_all()
125
126 # only keep the patches to be synchronised
127 sync_patches = [p for p in patches if p in remote_patches]
128 if not sync_patches:
129 raise CmdException, 'No common patches to be synchronised'
130
131 # pop to the one before the first patch to be synchronised
132 popped = applied[applied.index(sync_patches[0]) + 1:]
133 if popped:
134 pop_patches(popped[::-1])
135
136 for p in sync_patches:
137 if p in popped:
138 # push to this patch
139 idx = popped.index(p) + 1
140 push_patches(popped[:idx])
141 del popped[:idx]
142
143 # the actual sync
144 out.start('Synchronising "%s"' % p)
145
146 patch = crt_series.get_patch(p)
147 bottom = patch.get_bottom()
148 top = patch.get_top()
149
150 # reset the patch backup information. That's needed in case we
151 # undo the sync but there were no changes made
152 patch.set_bottom(bottom, backup = True)
153 patch.set_top(top, backup = True)
154
155 # the actual merging (either from a branch or an external file)
156 merge_patch(patch, p)
157
158 if git.local_changes(verbose = False):
159 # index (cache) already updated by the git merge. The
160 # backup information was already reset above
161 crt_series.refresh_patch(cache_update = False, backup = False,
162 log = 'sync')
163 out.done('updated')
164 else:
165 out.done()
166
167 # push the remaining patches
168 if popped:
169 push_patches(popped)