chiark - git - mdw - stgit/blob - stgit/commands/pick.py

   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 optparse import OptionParser, make_option
  20
  21 from stgit.commands.common import *
  22 from stgit.utils import *
  23 from stgit import stack, git
  24 from stgit.stack import Series
  25
  26
  27 help = 'import a patch from a different branch or a commit object'
  28 usage = """%prog [options] [<patch@branch>|<commit>]
  29
  30 Import a patch from a different branch or a commit object into the
  31 current series. By default, the name of the imported patch is used as
  32 the name of the current patch. It can be overridden with the '--name'
  33 option. A commit object can be reverted with the '--reverse'
  34 option. The log and author information are those of the commit object."""
  35
  36 options = [make_option('-n', '--name',
  37                        help = 'use NAME as the patch name'),
  38            make_option('-r', '--reverse',
  39                        help = 'reverse the commit object before importing',
  40                        action = 'store_true'),
  41            make_option('-p', '--parent', metavar = 'COMMITID',
  42                        help = 'use COMMITID as parent'),
  43            make_option('--fold',
  44                        help = 'fold the commit object into the current patch',
  45                        action = 'store_true'),
  46            make_option('--update',
  47                        help = 'like fold but only update the current patch files',
  48                        action = 'store_true'),
  49            make_option('--unapplied',
  50                        help = 'keep the patch unapplied',
  51                        action = 'store_true')]
  52
  53
  54 def func(parser, options, args):
  55     """Import a commit object as a new patch
  56     """
  57     if len(args) != 1:
  58         parser.error('incorrect number of arguments')
  59
  60     if not options.unapplied:
  61         check_local_changes()
  62         check_conflicts()
  63         check_head_top_equal()
  64
  65     commit_str = args[0]
  66     commit_id = git_id(commit_str)
  67     commit = git.Commit(commit_id)
  68
  69     if options.fold or options.update:
  70         if not crt_series.get_current():
  71             raise CmdException, 'No patches applied'
  72     else:
  73         patch_branch = commit_str.split('@')
  74         if options.name:
  75             patchname = options.name
  76         elif len(patch_branch) == 2:
  77             patchname = patch_branch[0]
  78         else:
  79             patchname = None
  80
  81     if options.parent:
  82         parent = git_id(options.parent)
  83     else:
  84         parent = commit.get_parent()
  85
  86     if not options.reverse:
  87         bottom = parent
  88         top = commit_id
  89     else:
  90         bottom = commit_id
  91         top = parent
  92
  93     if options.fold:
  94         print 'Folding commit %s...' % commit_id,
  95         sys.stdout.flush()
  96
  97         # try a direct git-apply first
  98         if not git.apply_diff(bottom, top):
  99             git.merge(bottom, git.get_head(), top, recursive = True)
 100
 101         print 'done'
 102     elif options.update:
 103         rev1 = git_id('//bottom')
 104         rev2 = git_id('//top')
 105         files = git.barefiles(rev1, rev2).split('\n')
 106
 107         print 'Updating with commit %s...' % commit_id,
 108         sys.stdout.flush()
 109
 110         if not git.apply_diff(bottom, top, files = files):
 111             raise CmdException, 'Patch updating failed'
 112
 113         print 'done'
 114     else:
 115         message = commit.get_log()
 116         author_name, author_email, author_date = \
 117                      name_email_date(commit.get_author())
 118
 119         print 'Importing commit %s...' % commit_id,
 120         sys.stdout.flush()
 121
 122         newpatch = crt_series.new_patch(patchname, message = message, can_edit = False,
 123                                         unapplied = True, bottom = bottom, top = top,
 124                                         author_name = author_name,
 125                                         author_email = author_email,
 126                                         author_date = author_date)
 127         # find a patchlog to fork from
 128         (refpatchname, refbranchname, refpatchid) = parse_rev(commit_str)
 129         if refpatchname and not refpatchid and \
 130                (not refpatchid or refpatchid == 'top'):
 131             # FIXME: should also support picking //top.old
 132             if refbranchname:
 133                 # assume the refseries is OK, since we already resolved
 134                 # commit_str to a git_id
 135                 refseries = Series(refbranchname)
 136             else:
 137                 refseries = crt_series
 138             patch = refseries.get_patch(refpatchname)
 139             if patch.get_log():
 140                 print"log was %s" % newpatch.get_log()
 141                 print "setting log to %s\n" %  patch.get_log()
 142                 newpatch.set_log(patch.get_log())
 143                 print"log is now %s" % newpatch.get_log()
 144             else:
 145                 print "no log for %s\n" % patchname
 146
 147         if not options.unapplied:
 148             modified = crt_series.push_patch(patchname)
 149         else:
 150             modified = False
 151
 152         if crt_series.empty_patch(patchname):
 153             print 'done (empty patch)'
 154         elif modified:
 155             print 'done (modified)'
 156         else:
 157             print 'done'
 158
 159     print_crt_patch()