mdw@git.distorted.org.uk Git - stgit/blob - stgit/commands/resolved.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 stgit.argparse import opt
  21 from stgit.commands.common import *
  22 from stgit.utils import *
  23 from stgit import argparse, stack, git, basedir
  24 from stgit.config import config, file_extensions
  25 from stgit.gitmergeonefile import interactive_merge
  26
  27 help = 'Mark a file conflict as solved'
  28 kind = 'wc'
  29 usage = ['[options] [<files...>]']
  30 description = """
  31 Mark a merge conflict as resolved. The conflicts can be seen with the
  32 'status' command, the corresponding files being prefixed with a
  33 'C'."""
  34
  35 args = [argparse.conflicting_files]
  36 options = [
  37     opt('-a', '--all', action = 'store_true',
  38         short = 'Mark all conflicts as solved'),
  39     opt('-r', '--reset', metavar = '(ancestor|current|patched)',
  40         args = [argparse.strings('ancestor', 'current', 'patched')],
  41         short = 'Reset the file(s) to the given state'),
  42     opt('-i', '--interactive', action = 'store_true',
  43         short = 'Run the interactive merging tool')]
  44
  45 directory = DirectoryHasRepository(needs_current_series = False, log = False)
  46
  47 def func(parser, options, args):
  48     """Mark the conflict as resolved
  49     """
  50     args = git.ls_files(args)
  51     directory.cd_to_topdir()
  52
  53     if options.reset \
  54            and options.reset not in file_extensions():
  55         raise CmdException, 'Unknown reset state: %s' % options.reset
  56
  57     if options.all and not options.interactive:
  58         resolved_all(options.reset)
  59         return
  60
  61     conflicts = git.get_conflicts()
  62
  63     if len(args) != 0:
  64         files = args
  65     elif options.all:
  66         files = conflicts
  67     else:
  68         parser.error('incorrect number of arguments')
  69
  70     if not conflicts:
  71         raise CmdException, 'No more conflicts'
  72
  73     # check for arguments validity
  74     if not options.all:
  75         for filename in files:
  76             if not filename in conflicts:
  77                 raise CmdException, 'No conflicts for "%s"' % filename
  78
  79     # resolved
  80     if options.interactive:
  81         for filename in files:
  82             interactive_merge(filename)
  83             git.resolved([filename])
  84     else:
  85         git.resolved(files, options.reset)