2 Copyright (C) 2005, 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 stgit
.argparse
import opt
20 from stgit
.commands
.common
import *
21 from stgit
.utils
import *
22 from stgit
import argparse
, stack
, git
24 help = 'Move the stack base to another point in history'
26 usage
= ['[options] <new-base-id>']
28 Pop all patches from current stack, move the stack base to the given
29 <new-base-id> and push the patches back.
31 If you experience merge conflicts, resolve the problem and continue
32 the rebase by executing the following sequence:
34 $ stg resolved -a [-i]
38 Or if you want to skip that patch:
41 $ stg push next-patch..top-patch"""
43 args
= [argparse
.commit
]
45 opt('-n', '--nopush', action
= 'store_true',
46 short
= 'Do not push the patches back after rebasing'),
47 opt('-m', '--merged', action
= 'store_true',
48 short
= 'Check for patches merged upstream')]
50 directory
= DirectoryGotoToplevel(log
= True)
52 def func(parser
, options
, args
):
53 """Rebase the current stack
56 parser
.error('incorrect number of arguments')
58 if crt_series
.get_protected():
59 raise CmdException
, 'This branch is protected. Rebase is not permitted'
63 check_head_top_equal(crt_series
)
65 # ensure an exception is raised before popping on non-existent target
66 if git_id(crt_series
, args
[0]) == None:
67 raise GitException
, 'Unknown revision: %s' % args
[0]
69 applied
= prepare_rebase(crt_series
)
70 rebase(crt_series
, args
[0])
71 post_rebase(crt_series
, applied
, options
.nopush
, options
.merged
)
73 print_crt_patch(crt_series
)