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 optparse import OptionParser, make_option
  21
  22 from stgit.commands.common import *
  23 from stgit.utils import *
  24 from stgit import stack, git, basedir
  25
  26
  27 help = 'mark a file conflict as solved'
  28 usage = """%prog [options] [<files...>]
  29
  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'. This command also removes any <file>.{local,remote,older} files."""
  33
  34 options = [make_option('-a', '--all',
  35                        help = 'mark all conflicts as solved',
  36                        action = 'store_true'),
  37            make_option('-r', '--reset', metavar = '(local|remote|older)',
  38                        help = 'reset the file(s) to the given state')]
  39
  40
  41 def func(parser, options, args):
  42     """Mark the conflict as resolved
  43     """
  44     if options.reset and options.reset not in ['local', 'remote', 'older']:
  45         raise CmdException, 'Unknown reset state: %s' % options.reset
  46
  47     if options.all:
  48         resolved_all(options.reset)
  49         return
  50
  51     if len(args) == 0:
  52         parser.error('incorrect number of arguments')
  53
  54     conflicts = git.get_conflicts()
  55     if not conflicts:
  56         raise CmdException, 'No more conflicts'
  57     # check for arguments validity
  58     for filename in args:
  59         if not filename in conflicts:
  60             raise CmdException, 'No conflicts for "%s"' % filename
  61     # resolved
  62     for filename in args:
  63         resolved(filename, options.reset)
  64         del conflicts[conflicts.index(filename)]
  65
  66     # save or remove the conflicts file
  67     if conflicts == []:
  68         os.remove(os.path.join(basedir.get(), 'conflicts'))
  69     else:
  70         f = file(os.path.join(basedir.get(), 'conflicts'), 'w+')
  71         f.writelines([line + '\n' for line in conflicts])
  72         f.close()