| 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 |
| 19 | from stgit.argparse import opt |
| 20 | from stgit.commands.common import * |
| 21 | from stgit.utils import * |
| 22 | from stgit import stack, git |
| 23 | |
| 24 | help = 'Move the stack base to another point in history' |
| 25 | kind = 'stack' |
| 26 | usage = ['[options] <new-base-id>'] |
| 27 | description = """ |
| 28 | Pop all patches from current stack, move the stack base to the given |
| 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 | |
| 34 | $ stg resolved -a [-i] |
| 35 | $ stg refresh |
| 36 | $ stg goto top-patch |
| 37 | |
| 38 | Or if you want to skip that patch: |
| 39 | |
| 40 | $ stg undo --hard |
| 41 | $ stg push next-patch..top-patch""" |
| 42 | |
| 43 | options = [ |
| 44 | opt('-n', '--nopush', action = 'store_true', |
| 45 | short = 'Do not push the patches back after rebasing'), |
| 46 | opt('-m', '--merged', action = 'store_true', |
| 47 | short = 'Check for patches merged upstream')] |
| 48 | |
| 49 | directory = DirectoryGotoToplevel(log = True) |
| 50 | |
| 51 | def func(parser, options, args): |
| 52 | """Rebase the current stack |
| 53 | """ |
| 54 | if len(args) != 1: |
| 55 | parser.error('incorrect number of arguments') |
| 56 | |
| 57 | if crt_series.get_protected(): |
| 58 | raise CmdException, 'This branch is protected. Rebase is not permitted' |
| 59 | |
| 60 | check_local_changes() |
| 61 | check_conflicts() |
| 62 | check_head_top_equal(crt_series) |
| 63 | |
| 64 | # ensure an exception is raised before popping on non-existent target |
| 65 | if git_id(crt_series, args[0]) == None: |
| 66 | raise GitException, 'Unknown revision: %s' % args[0] |
| 67 | |
| 68 | applied = prepare_rebase(crt_series) |
| 69 | rebase(crt_series, args[0]) |
| 70 | post_rebase(crt_series, applied, options.nopush, options.merged) |
| 71 | |
| 72 | print_crt_patch(crt_series) |