Commit | Line | Data |
---|---|---|
22037590 YD |
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 | |
575bbdae | 19 | from stgit.argparse import opt |
22037590 YD |
20 | from stgit.commands.common import * |
21 | from stgit.utils import * | |
6c8a90e1 | 22 | from stgit import argparse, stack, git |
22037590 | 23 | |
575bbdae | 24 | help = 'Move the stack base to another point in history' |
33ff9cdd | 25 | kind = 'stack' |
575bbdae KH |
26 | usage = ['[options] <new-base-id>'] |
27 | description = """ | |
22037590 | 28 | Pop all patches from current stack, move the stack base to the given |
467a0a0e AC |
29 | <new-base-id> and push the patches back. |
30 | ||
31 | If you experience merge conflicts, resolve the problem and continue | |
32 | the rebase by executing the following sequence: | |
33 | ||
9ab06b98 | 34 | $ git add --update |
467a0a0e AC |
35 | $ stg refresh |
36 | $ stg goto top-patch | |
37 | ||
38 | Or if you want to skip that patch: | |
39 | ||
625e8de7 | 40 | $ stg undo --hard |
467a0a0e | 41 | $ stg push next-patch..top-patch""" |
22037590 | 42 | |
6c8a90e1 | 43 | args = [argparse.commit] |
575bbdae KH |
44 | options = [ |
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')] | |
49 | ||
117ed129 | 50 | directory = DirectoryGotoToplevel(log = True) |
22037590 YD |
51 | |
52 | def func(parser, options, args): | |
53 | """Rebase the current stack | |
54 | """ | |
55 | if len(args) != 1: | |
56 | parser.error('incorrect number of arguments') | |
57 | ||
58 | if crt_series.get_protected(): | |
59 | raise CmdException, 'This branch is protected. Rebase is not permitted' | |
60 | ||
61 | check_local_changes() | |
62 | check_conflicts() | |
6972fd6b | 63 | check_head_top_equal(crt_series) |
22037590 | 64 | |
ec6ed336 | 65 | # ensure an exception is raised before popping on non-existent target |
6972fd6b | 66 | if git_id(crt_series, args[0]) == None: |
8ff4e9e0 | 67 | raise GitException, 'Unknown revision: %s' % args[0] |
ec6ed336 | 68 | |
6972fd6b KH |
69 | applied = prepare_rebase(crt_series) |
70 | rebase(crt_series, args[0]) | |
71 | post_rebase(crt_series, applied, options.nopush, options.merged) | |
22037590 | 72 | |
6972fd6b | 73 | print_crt_patch(crt_series) |