2 Copyright (C) 2006, Catalin Marinas <catalin.marinas@gmail.com>
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.
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.
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
19 from optparse
import OptionParser
, make_option
21 import stgit
.commands
.common
22 from stgit
.commands
.common
import *
23 from stgit
.utils
import *
24 from stgit
import stack
, git
27 help = 'synchronise patches with a branch or a series'
28 usage
= """%prog [options] [<patch1>] [<patch2>] [<patch3>..<patch4>]
30 For each of the specified patches perform a three-way merge with the
31 same patch in the specified branch or series. The command can be used
32 for keeping patches on several branches in sync. Note that the
33 operation may fail for some patches because of conflicts. The patches
34 in the series must apply cleanly.
36 The sync operation can be reverted for individual patches with --undo."""
38 options
= [make_option('-a', '--all',
39 help = 'synchronise all the patches',
40 action
= 'store_true'),
41 make_option('-b', '--branch',
42 help = 'syncronise patches with BRANCH'),
43 make_option('-s', '--series',
44 help = 'syncronise patches with SERIES'),
46 help = 'undo the synchronisation of the current patch',
47 action
= 'store_true')]
52 check_head_top_equal()
54 def __branch_merge_patch(remote_series
, pname
):
55 """Merge a patch from a remote branch into the current tree.
57 patch
= remote_series
.get_patch(pname
)
58 git
.merge(patch
.get_bottom(), git
.get_head(), patch
.get_top())
60 def __series_merge_patch(base
, patchdir
, pname
):
61 """Merge a patch file with the given StGIT patch.
63 patchfile
= os
.path
.join(patchdir
, pname
)
64 git
.apply_patch(filename
= patchfile
, base
= base
)
66 def func(parser
, options
, args
):
67 """Synchronise a range of patches
72 if options
.branch
or options
.series
:
74 '--undo cannot be specified with --branch or --series'
77 print 'Undoing the "%s" sync...' % crt_series
.get_current(),
80 crt_series
.undo_refresh()
87 # the main function already made crt_series to be the remote
89 remote_series
= crt_series
90 stgit
.commands
.common
.crt_series
= crt_series
= stack
.Series()
91 if options
.branch
== crt_series
.get_branch():
92 raise CmdException
, 'Cannot synchronise with the current branch'
93 remote_patches
= remote_series
.get_applied()
95 # the merge function merge_patch(patch, pname)
96 merge_patch
= lambda patch
, pname
: \
97 __branch_merge_patch(remote_series
, pname
)
99 patchdir
= os
.path
.dirname(options
.series
)
102 f
= file(options
.series
)
104 p
= re
.sub('#.*$', '', line
).strip()
107 remote_patches
.append(p
)
110 # the merge function merge_patch(patch, pname)
111 merge_patch
= lambda patch
, pname
: \
112 __series_merge_patch(patch
.get_bottom(), patchdir
, pname
)
114 raise CmdException
, 'No remote branch or series specified'
116 applied
= crt_series
.get_applied()
121 patches
= parse_patches(args
, applied
, ordered
= True)
123 parser
.error('no patches specified')
126 raise CmdException
, 'No patches to synchronise'
130 # only keep the patches to be synchronised
131 sync_patches
= [p
for p
in patches
if p
in remote_patches
]
133 raise CmdException
, 'No common patches to be synchronised'
135 # pop to the one before the first patch to be synchronised
136 popped
= applied
[applied
.index(sync_patches
[0]) + 1:]
138 pop_patches(popped
[::-1])
140 for p
in sync_patches
:
143 idx
= popped
.index(p
) + 1
144 push_patches(popped
[:idx
])
148 print 'Synchronising "%s"...' % p
,
151 patch
= crt_series
.get_patch(p
)
152 bottom
= patch
.get_bottom()
153 top
= patch
.get_top()
155 # reset the patch backup information. That's needed in case we
156 # undo the sync but there were no changes made
157 patch
.set_bottom(bottom
, backup
= True)
158 patch
.set_top(top
, backup
= True)
160 # the actual merging (either from a branch or an external file)
161 merge_patch(patch
, p
)
163 if git
.local_changes(verbose
= False):
164 # index (cache) already updated by the git merge. The
165 # backup information was already reset above
166 crt_series
.refresh_patch(cache_update
= False, backup
= False,
168 print 'done (updated)'
172 # push the remaining patches