| | 1 | |
| | 2 | __copyright__ = """ |
| | 3 | Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com> |
| | 4 | |
| | 5 | This program is free software; you can redistribute it and/or modify |
| | 6 | it under the terms of the GNU General Public License version 2 as |
| | 7 | published by the Free Software Foundation. |
| | 8 | |
| | 9 | This program is distributed in the hope that it will be useful, |
| | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| | 12 | GNU General Public License for more details. |
| | 13 | |
| | 14 | You should have received a copy of the GNU General Public License |
| | 15 | along with this program; if not, write to the Free Software |
| | 16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| | 17 | """ |
| | 18 | |
| | 19 | import sys, os |
| | 20 | from optparse import OptionParser, make_option |
| | 21 | |
| | 22 | from stgit.commands.common import * |
| | 23 | from stgit.utils import * |
| | 24 | from stgit import stack, git |
| | 25 | from stgit.config import config |
| | 26 | |
| | 27 | |
| | 28 | help = 'generate a new commit for the current patch' |
| | 29 | usage = """%prog [options] [<files...>] |
| | 30 | |
| | 31 | Include the latest tree changes in the current patch. This command |
| | 32 | generates a new GIT commit object with the patch details, the previous |
| | 33 | one no longer being visible. The patch attributes like author, |
| | 34 | committer and description can be changed with the command line |
| | 35 | options. The '--force' option is useful when a commit object was |
| | 36 | created with a different tool but the changes need to be included in |
| | 37 | the current patch.""" |
| | 38 | |
| | 39 | options = [make_option('-f', '--force', |
| | 40 | help = 'force the refresh even if HEAD and '\ |
| | 41 | 'top differ', |
| | 42 | action = 'store_true'), |
| | 43 | make_option('-e', '--edit', |
| | 44 | help = 'invoke an editor for the patch '\ |
| | 45 | 'description', |
| | 46 | action = 'store_true'), |
| | 47 | make_option('-s', '--showpatch', |
| | 48 | help = 'show the patch content in the editor buffer', |
| | 49 | action = 'store_true'), |
| | 50 | make_option('--undo', |
| | 51 | help = 'revert the commit generated by the last refresh', |
| | 52 | action = 'store_true'), |
| | 53 | make_option('-m', '--message', |
| | 54 | help = 'use MESSAGE as the patch ' \ |
| | 55 | 'description'), |
| | 56 | make_option('-a', '--author', metavar = '"NAME <EMAIL>"', |
| | 57 | help = 'use "NAME <EMAIL>" as the author details'), |
| | 58 | make_option('--authname', |
| | 59 | help = 'use AUTHNAME as the author name'), |
| | 60 | make_option('--authemail', |
| | 61 | help = 'use AUTHEMAIL as the author e-mail'), |
| | 62 | make_option('--authdate', |
| | 63 | help = 'use AUTHDATE as the author date'), |
| | 64 | make_option('--commname', |
| | 65 | help = 'use COMMNAME as the committer name'), |
| | 66 | make_option('--commemail', |
| | 67 | help = 'use COMMEMAIL as the committer ' \ |
| | 68 | 'e-mail'), |
| | 69 | make_option('--sign', |
| | 70 | help = 'add Signed-off-by line', |
| | 71 | action = 'store_true'), |
| | 72 | make_option('--ack', |
| | 73 | help = 'add Acked-by line', |
| | 74 | action = 'store_true')] |
| | 75 | |
| | 76 | |
| | 77 | def func(parser, options, args): |
| | 78 | autoresolved = config.get('stgit', 'autoresolved') |
| | 79 | |
| | 80 | if autoresolved != 'yes': |
| | 81 | check_conflicts() |
| | 82 | |
| | 83 | patch = crt_series.get_current() |
| | 84 | if not patch: |
| | 85 | raise CmdException, 'No patches applied' |
| | 86 | |
| | 87 | if not options.force: |
| | 88 | check_head_top_equal() |
| | 89 | |
| | 90 | if options.undo: |
| | 91 | print 'Undoing the "%s" refresh...' % patch, |
| | 92 | sys.stdout.flush() |
| | 93 | crt_series.undo_refresh() |
| | 94 | print 'done' |
| | 95 | return |
| | 96 | |
| | 97 | if options.author: |
| | 98 | options.authname, options.authemail = name_email(options.author) |
| | 99 | |
| | 100 | if options.sign: |
| | 101 | sign_str = 'Signed-off-by' |
| | 102 | if options.ack: |
| | 103 | raise CmdException, '--ack and --sign were both specified' |
| | 104 | elif options.ack: |
| | 105 | sign_str = 'Acked-by' |
| | 106 | else: |
| | 107 | sign_str = None |
| | 108 | |
| | 109 | if git.local_changes() \ |
| | 110 | or not crt_series.head_top_equal() \ |
| | 111 | or options.edit or options.message \ |
| | 112 | or options.authname or options.authemail or options.authdate \ |
| | 113 | or options.commname or options.commemail \ |
| | 114 | or options.sign or options.ack: |
| | 115 | print 'Refreshing patch "%s"...' % patch, |
| | 116 | sys.stdout.flush() |
| | 117 | |
| | 118 | if autoresolved == 'yes': |
| | 119 | resolved_all() |
| | 120 | crt_series.refresh_patch(files = args, |
| | 121 | message = options.message, |
| | 122 | edit = options.edit, |
| | 123 | show_patch = options.showpatch, |
| | 124 | author_name = options.authname, |
| | 125 | author_email = options.authemail, |
| | 126 | author_date = options.authdate, |
| | 127 | committer_name = options.commname, |
| | 128 | committer_email = options.commemail, |
| | 129 | backup = True, sign_str = sign_str) |
| | 130 | |
| | 131 | print 'done' |
| | 132 | else: |
| | 133 | print 'Patch "%s" is already up to date' % patch |
~mdw / stgit / blame_incremental