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