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