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('-p', '--parent', metavar = 'COMMITID',
  41                        help = 'use COMMITID as parent'),
  42            make_option('--fold',
  43                        help = 'fold the commit object into the current patch',
  44                        action = 'store_true'),
  45            make_option('--update',
  46                        help = 'like fold but only update the current patch files',
  47                        action = 'store_true')]
  48
  49
  50 def func(parser, options, args):
  51     """Import a commit object as a new patch
  52     """
  53     if len(args) != 1:
  54         parser.error('incorrect number of arguments')
  55
  56     check_local_changes()
  57     check_conflicts()
  58     check_head_top_equal()
  59
  60     commit_str = args[0]
  61     commit_id = git_id(commit_str)
  62     commit = git.Commit(commit_id)
  63
  64     if options.fold or options.update:
  65         if not crt_series.get_current():
  66             raise CmdException, 'No patches applied'
  67     else:
  68         patch_branch = commit_str.split('@')
  69         if options.name:
  70             patch = options.name
  71         elif len(patch_branch) == 2:
  72             patch = patch_branch[0]
  73         else:
  74             patch = make_patch_name(commit.get_log(), crt_series.patch_exists)
  75
  76     if options.parent:
  77         parent = git_id(options.parent)
  78     else:
  79         parent = commit.get_parent()
  80
  81     if not options.reverse:
  82         bottom = parent
  83         top = commit_id
  84     else:
  85         bottom = commit_id
  86         top = parent
  87
  88     if options.fold:
  89         print 'Folding commit %s...' % commit_id,
  90         sys.stdout.flush()
  91
  92         # try a direct git-apply first
  93         if not git.apply_diff(bottom, top):
  94             git.merge(bottom, git.get_head(), top, recursive = True)
  95
  96         print 'done'
  97     elif options.update:
  98         rev1 = git_id('//bottom')
  99         rev2 = git_id('//top')
 100         files = git.barefiles(rev1, rev2).split('\n')
 101
 102         print 'Updating with commit %s...' % commit_id,
 103         sys.stdout.flush()
 104
 105         if not git.apply_diff(bottom, top, files = files):
 106             raise CmdException, 'Patch updating failed'
 107
 108         print 'done'
 109     else:
 110         message = commit.get_log()
 111         author_name, author_email, author_date = \
 112                      name_email_date(commit.get_author())
 113
 114         print 'Importing commit %s...' % commit_id,
 115         sys.stdout.flush()
 116
 117         crt_series.new_patch(patch, message = message, can_edit = False,
 118                              unapplied = True, bottom = bottom, top = top,
 119                              author_name = author_name,
 120                              author_email = author_email,
 121                              author_date = author_date)
 122         modified = crt_series.push_patch(patch)
 123
 124         if crt_series.empty_patch(patch):
 125             print 'done (empty patch)'
 126         elif modified:
 127             print 'done (modified)'
 128         else:
 129             print 'done'
 130
 131     print_crt_patch()