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