/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome
8 by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert
1
# resolve.py
4 by Tim Marston
added more commands
2
#
3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
4
#
5
# This file is part of stdhome (hereafter referred to as "this program").
6
# See http://ed.am/dev/stdhome for more information.
7
#
8
# This program is free software: you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation, either version 3 of the License, or
11
# (at your option) any later version.
12
#
13
# This program is distributed in the hope that it will be useful,
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
# GNU General Public License for more details.
17
#
18
# You should have received a copy of the GNU General Public License
19
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
21
22
import sys, re, getopt
8 by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert
23
from command import Command
24
import stdhome.the as the
25
from stdhome.deployment import Deployment
26
27
28
class ResolveCommand( Command ):
4 by Tim Marston
added more commands
29
30
31
	def __init__( self ):
32
		self.repo = None
33
34
35
	def print_help( self ):
36
		print "Usage: " + the.program.name + " resolve [--repo=REPO]"
37
		print
38
		#      01234567890123456789012345678901234567890123456789012345678901234567890123456789
39
		print "Reattempt to deploy files following an update that failed due to conflicts."
40
		print
41
		print "After an update, no files will have been redeployed from the local repository to"
42
		print "your home directory if there were merge or deployment conflicts.  In a situation"
43
		print "such as this, you are expected to manually intervene; fixing broken merged files"
44
		print "by hand and moving aside files in your home directory.  After having done this,"
45
		print "this command can be used to reattempt the deployment and finalise the update."
46
		print
47
		print "You can list outstanding conflicts by typing:"
48
		print "    " + the.program.name + " conflicts"
49
		print
50
		print "Options:"
51
		print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
52
		print "  -v, --verbose    display information about what is being done"
53
		print "      --help       display help and exit"
54
		exit( 0 )
55
56
57
	def parse_command_line( self ):
58
		opts, args = getopt.gnu_getopt(
59
			sys.argv[ 1: ], "r:v",
60
			[ "repo=", "verbose", "help" ] )
61
		for opt, optarg in opts:
62
			if opt in [ '--repo', '-r' ]:
63
				if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
64
					raise the.program.FatalError(
65
						'invalid repository name: ' + optarg )
66
				self.repo = optarg
67
			elif opt in [ '--verbose', '-v' ]:
8 by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert
68
				the.verbose += 1
4 by Tim Marston
added more commands
69
			elif opt == "--help":
70
				self.print_help()
71
		
72
		# discard first argument (the command)
73
		args.pop( 0 )
74
75
		# remaining arguments
76
		if len( args ):
77
			raise the.program.UsageError( 'too many arguments' )
78
79
80
	def run( self ):
81
82
		# set up repo and check it exists
83
		the.set_repo( self.repo )
84
		the.repo.check_dir_exists()
85
86
		# initialise deployment (check it's valid)
87
		deployment = Deployment()
88
		deployment.check_ongoing( True )
89
90
		message = ''
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
91
92
		# check for conflicts in repo
93
		files = the.repo.vcs.get_conflicts()
94
		if files:
4 by Tim Marston
added more commands
95
			message += 'Conflicts in %s:\n  %s' % \
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
96
					   ( the.repo.name, '\n  '.join( files ) )
97
98
		# check for deployment conclicts
99
		conflicts = deployment.get_conflicts()
4 by Tim Marston
added more commands
100
		if conflicts:
101
			message += 'Deployment conflicts:\n  %s' % \
102
					   '\n  '.join( conflicts )
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
103
104
		# stop if there are conflicts
4 by Tim Marston
added more commands
105
		if message:
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
106
			raise the.program.FatalError(
107
				'there were conflicts...\n' + message )
4 by Tim Marston
added more commands
108
109
		# copy-out changes from repo
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
110
		deployment.copy_out()
4 by Tim Marston
added more commands
111
112
		# now we've copied-out, revert any copied-in changes!
113
		if the.verbose: print "reverting %s" % the.repo.dir
114
		the.repo.vcs.revert()