mdw@git.distorted.org.uk Git - 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
  25
  26 help = 'import a patch from a different branch or a commit object'
  27 usage = """%prog [options] [<patch@branch>|<commit>]
  28
  29 Import a patch from a different branch or a commit object into the
  30 current series. By default, the name of the imported patch is used as
  31 the name of the current patch. It can be overridden with the '--name'
  32 option. A commit object can be reverted with the '--reverse'
  33 option. The log and author information are those of the commit object."""
  34
  35 options = [make_option('-n', '--name',
  36                        help = 'use NAME as the patch name'),
  37            make_option('-r', '--reverse',
  38                        help = 'reverse the commit object before importing',
  39                        action = 'store_true'),
  40            make_option('--fold',
  41                        help = 'fold the commit object into the current patch',
  42                        action = 'store_true')]
  43
  44
  45 def func(parser, options, args):
  46     """Import a commit object as a new patch
  47     """
  48     if len(args) != 1:
  49         parser.error('incorrect number of arguments')
  50
  51     check_local_changes()
  52     check_conflicts()
  53     check_head_top_equal()
  54
  55     commit_str = args[0]
  56
  57     if options.fold:
  58         if not crt_series.get_current():
  59             raise CmdException, 'No patches applied'
  60     else:
  61         patch_branch = commit_str.split('@')
  62         if options.name:
  63             patch = options.name
  64         elif len(patch_branch) == 2:
  65             patch = patch_branch[0]
  66         else:
  67             raise CmdException, 'Unknown patch name'
  68
  69     commit_id = git_id(commit_str)
  70     commit = git.Commit(commit_id)
  71
  72     if not options.reverse:
  73         bottom = commit.get_parent()
  74         top = commit_id
  75     else:
  76         bottom = commit_id
  77         top = commit.get_parent()
  78
  79     if options.fold:
  80         print 'Folding commit %s...' % commit_id,
  81         sys.stdout.flush()
  82
  83         # try a direct git-apply first
  84         if not git.apply_diff(bottom, top):
  85             git.merge(bottom, git.get_head(), top)
  86
  87         print 'done'
  88     else:
  89         message = commit.get_log()
  90         author_name, author_email, author_date = \
  91                      name_email_date(commit.get_author())
  92
  93         print 'Importing commit %s...' % commit_id,
  94         sys.stdout.flush()
  95
  96         crt_series.new_patch(patch, message = message, can_edit = False,
  97                              unapplied = True, bottom = bottom, top = top,
  98                              author_name = author_name,
  99                              author_email = author_email,
 100                              author_date = author_date)
 101         modified = crt_series.push_patch(patch)
 102
 103         if crt_series.empty_patch(patch):
 104             print 'done (empty patch)'
 105         elif modified:
 106             print 'done (modified)'
 107         else:
 108             print 'done'
 109
 110     print_crt_patch()