mdw@git.distorted.org.uk Git - stgit/blob - stgit/commands/push.py

   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 a patch on top of the series'
  28 usage = """%prog [options] [<name>]
  29
  30 Push a patch (defaulting to the first unapplied one) or range of
  31 patches to the stack. The 'push' operation allows patch reordering by
  32 commuting them with the three-way merge algorithm. If the result of
  33 the 'push' operation is not acceptable or if there are too many
  34 conflicts, the '--undo' option can be used to revert the patch and the
  35 tree to the state before the operation. Conflicts raised during the
  36 push operation have to be fixed and the 'resolved' command run.
  37
  38 The 'push' command also notifies when the patch becomes empty after
  39 the merge operation (i.e. it was fully merged upstream)."""
  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('-t', '--to', metavar = 'PATCH1[:PATCH2]',
  47                        help = 'push all patches to PATCH1 or between '
  48                        'PATCH1 and PATCH2'),
  49            make_option('--reverse',
  50                        help = 'push the patches in reverse order',
  51                        action = 'store_true'),
  52            make_option('--undo',
  53                        help = 'undo the last push operation',
  54                        action = 'store_true')]
  55
  56
  57 def func(parser, options, args):
  58     """Pushes the given patch or all onto the series
  59     """
  60     # If --undo is passed, do the work and exit
  61     if options.undo:
  62         patch = crt_series.get_current()
  63         if not patch:
  64             raise CmdException, 'No patch to undo'
  65
  66         print 'Undoing the "%s" push...' % patch,
  67         sys.stdout.flush()
  68         resolved_all()
  69         if crt_series.undo_push():
  70             print 'done'
  71         else:
  72             print '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.to:
  86         boundaries = options.to.split(':')
  87         if len(boundaries) == 1:
  88             if boundaries[0] not in unapplied:
  89                 raise CmdException, 'Patch "%s" not unapplied' % boundaries[0]
  90             patches = unapplied[:unapplied.index(boundaries[0])+1]
  91         elif len(boundaries) == 2:
  92             if boundaries[0] not in unapplied:
  93                 raise CmdException, 'Patch "%s" not unapplied' % boundaries[0]
  94             if boundaries[1] not in unapplied:
  95                 raise CmdException, 'Patch "%s" not unapplied' % boundaries[1]
  96             lb = unapplied.index(boundaries[0])
  97             hb = unapplied.index(boundaries[1])
  98             if lb > hb:
  99                 raise CmdException, 'Patch "%s" after "%s"' \
 100                       % (boundaries[0], boundaries[1])
 101             patches = unapplied[lb:hb+1]
 102         else:
 103             raise CmdException, 'incorrect parameters to "--to"'
 104     elif options.number:
 105         patches = unapplied[:options.number]
 106     elif options.all:
 107         patches = unapplied
 108     elif len(args) == 0:
 109         patches = [unapplied[0]]
 110     elif len(args) == 1:
 111         patches = args
 112         if patches[0] not in unapplied:
 113             raise CmdException, 'Patch "%s" not unapplied' % patches[0]
 114     else:
 115         parser.error('incorrect number of arguments')
 116
 117     if patches == []:
 118         raise CmdException, 'No patches to push'
 119
 120     if options.reverse:
 121         patches.reverse()
 122
 123     print 'Trying fast-forward...'
 124
 125     forwarded = crt_series.forward_patches(patches)
 126     if forwarded > 1:
 127         print 'Fast-forwarded patches "%s" - "%s"' % (patches[0],
 128                                                       patches[forwarded - 1])
 129     elif forwarded == 1:
 130         print 'Fast-forwarded patch "%s"' % patches[0]
 131     else:
 132         print 'Fast-forwarding failed, using normal pushing'
 133
 134     for p in patches[forwarded:]:
 135         if p not in unapplied:
 136             raise CmdException, 'Patch "%s" not unapplied' % p
 137
 138         print 'Pushing patch "%s"...' % p,
 139         sys.stdout.flush()
 140
 141         crt_series.push_patch(p)
 142
 143         if crt_series.empty_patch(p):
 144             print 'done (empty patch)'
 145         else:
 146             print 'done'
 147     print_crt_patch()