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