chiark - git - mdw - stgit/blob - stgit/commands/refresh.py

   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.out import *
  25 from stgit import stack, git
  26 from stgit.config import config
  27
  28
  29 help = 'generate a new commit for the current patch'
  30 usage = """%prog [options] [<files...>]
  31
  32 Include the latest tree changes in the current patch. This command
  33 generates a new GIT commit object with the patch details, the previous
  34 one no longer being visible. The patch attributes like author,
  35 committer and description can be changed with the command line
  36 options. The '--force' option is useful when a commit object was
  37 created with a different tool but the changes need to be included in
  38 the current patch."""
  39
  40 directory = DirectoryGotoToplevel()
  41 options = [make_option('-f', '--force',
  42                        help = 'force the refresh even if HEAD and '\
  43                        'top differ',
  44                        action = 'store_true'),
  45            make_option('--update',
  46                        help = 'only update the current patch files',
  47                        action = 'store_true'),
  48            make_option('--undo',
  49                        help = 'revert the commit generated by the last refresh',
  50                        action = 'store_true'),
  51            make_option('-a', '--annotate', metavar = 'NOTE',
  52                        help = 'annotate the patch log entry'),
  53            make_option('-p', '--patch',
  54                        help = 'refresh (applied) PATCH instead of the top one')
  55            ]
  56
  57 def func(parser, options, args):
  58     autoresolved = config.get('stgit.autoresolved')
  59
  60     if autoresolved != 'yes':
  61         check_conflicts()
  62
  63     if options.patch:
  64         if args or options.update:
  65             raise CmdException, \
  66                   'Only full refresh is available with the --patch option'
  67         patch = options.patch
  68         if not crt_series.patch_applied(patch):
  69             raise CmdException, 'Patches "%s" not applied' % patch
  70     else:
  71         patch = crt_series.get_current()
  72         if not patch:
  73             raise CmdException, 'No patches applied'
  74
  75     if not options.force:
  76         check_head_top_equal()
  77
  78     if options.undo:
  79         out.start('Undoing the refresh of "%s"' % patch)
  80         crt_series.undo_refresh()
  81         out.done()
  82         return
  83
  84     files = [path for (stat,path) in git.tree_status(verbose = True)]
  85     if args:
  86         files = [f for f in files if f in args]
  87
  88     if files or not crt_series.head_top_equal():
  89         if options.patch:
  90             applied = crt_series.get_applied()
  91             between = applied[:applied.index(patch):-1]
  92             pop_patches(between, keep = True)
  93         elif options.update:
  94             rev1 = git_id('//bottom')
  95             rev2 = git_id('//top')
  96             patch_files = git.barefiles(rev1, rev2).split('\n')
  97             files = [f for f in files if f in patch_files]
  98             if not files:
  99                 out.info('No modified files for updating patch "%s"' % patch)
 100                 return
 101
 102         out.start('Refreshing patch "%s"' % patch)
 103
 104         if autoresolved == 'yes':
 105             resolved_all()
 106         crt_series.refresh_patch(files = files,
 107                                  backup = True, notes = options.annotate)
 108
 109         if crt_series.empty_patch(patch):
 110             out.done('empty patch')
 111         else:
 112             out.done()
 113
 114         if options.patch:
 115             between.reverse()
 116             push_patches(between)
 117     elif options.annotate:
 118         # only annotate the top log entry as there is no need to
 119         # refresh the patch and generate a full commit
 120         crt_series.log_patch(crt_series.get_patch(patch), None,
 121                              notes = options.annotate)
 122     else:
 123         out.info('Patch "%s" is already up to date' % patch)