| 1 | |
| 2 | __copyright__ = """ |
| 3 | Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com> |
| 4 | |
| 5 | This program is free software; you can redistribute it and/or modify |
| 6 | it under the terms of the GNU General Public License version 2 as |
| 7 | published by the Free Software Foundation. |
| 8 | |
| 9 | This program is distributed in the hope that it will be useful, |
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 | GNU General Public License for more details. |
| 13 | |
| 14 | You should have received a copy of the GNU General Public License |
| 15 | along with this program; if not, write to the Free Software |
| 16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 17 | """ |
| 18 | |
| 19 | import sys, os |
| 20 | from optparse import OptionParser, make_option |
| 21 | |
| 22 | from stgit.commands.common import * |
| 23 | from stgit.utils import * |
| 24 | from stgit import stack, git |
| 25 | |
| 26 | |
| 27 | help = 'push one or more patches onto of the stack' |
| 28 | usage = """%prog [options] [<patch1>] [<patch2>] [<patch3>..<patch4>] |
| 29 | |
| 30 | Push one or more patches (defaulting to the first unapplied one) onto |
| 31 | the stack. The 'push' operation allows patch reordering by commuting |
| 32 | them with the three-way merge algorithm. If the result of the 'push' |
| 33 | operation is not acceptable or if there are too many conflicts, the |
| 34 | '--undo' option can be used to revert the last pushed patch. Conflicts |
| 35 | raised during the push operation have to be fixed and the 'resolved' |
| 36 | command run. |
| 37 | |
| 38 | The command also notifies when the patch becomes empty (fully merged |
| 39 | upstream) or is modified (three-way merged) by the 'push' operation.""" |
| 40 | |
| 41 | options = [make_option('-a', '--all', |
| 42 | help = 'push all the unapplied patches', |
| 43 | action = 'store_true'), |
| 44 | make_option('-n', '--number', type = 'int', |
| 45 | help = 'push the specified number of patches'), |
| 46 | make_option('--reverse', |
| 47 | help = 'push the patches in reverse order', |
| 48 | action = 'store_true'), |
| 49 | make_option('-m', '--merged', |
| 50 | help = 'check for patches merged upstream', |
| 51 | action = 'store_true'), |
| 52 | make_option('--undo', |
| 53 | help = 'undo the last patch pushing', |
| 54 | action = 'store_true')] |
| 55 | |
| 56 | |
| 57 | def func(parser, options, args): |
| 58 | """Pushes the given patch or all onto the series |
| 59 | """ |
| 60 | |
| 61 | # If --undo is passed, do the work and exit |
| 62 | if options.undo: |
| 63 | patch = crt_series.get_current() |
| 64 | if not patch: |
| 65 | raise CmdException, 'No patch to undo' |
| 66 | |
| 67 | out.start('Undoing push of "%s"' % patch) |
| 68 | resolved_all() |
| 69 | if crt_series.undo_push(): |
| 70 | out.done() |
| 71 | else: |
| 72 | out.done('patch unchanged') |
| 73 | print_crt_patch() |
| 74 | |
| 75 | return |
| 76 | |
| 77 | check_local_changes() |
| 78 | check_conflicts() |
| 79 | check_head_top_equal() |
| 80 | |
| 81 | unapplied = crt_series.get_unapplied() |
| 82 | if not unapplied: |
| 83 | raise CmdException, 'No more patches to push' |
| 84 | |
| 85 | if options.number: |
| 86 | patches = unapplied[:options.number] |
| 87 | elif options.all: |
| 88 | patches = unapplied |
| 89 | elif len(args) == 0: |
| 90 | patches = [unapplied[0]] |
| 91 | else: |
| 92 | patches = parse_patches(args, unapplied) |
| 93 | |
| 94 | if patches == []: |
| 95 | raise CmdException, 'No patches to push' |
| 96 | |
| 97 | if options.reverse: |
| 98 | patches.reverse() |
| 99 | |
| 100 | push_patches(patches, options.merged) |
| 101 | |
| 102 | print_crt_patch() |