bzr branch
http://bzr.ed.am/stdhome
4
by Tim Marston
added more commands |
1 |
# command_resolve.py |
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 |
|
23 |
import the |
|
24 |
from deployment import Deployment |
|
25 |
||
26 |
||
27 |
class CommandResolve: |
|
28 |
||
29 |
||
30 |
def __init__( self ): |
|
31 |
self.repo = None |
|
32 |
||
33 |
||
34 |
def print_help( self ): |
|
35 |
print "Usage: " + the.program.name + " resolve [--repo=REPO]" |
|
36 |
||
37 |
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789 |
|
38 |
print "Reattempt to deploy files following an update that failed due to conflicts." |
|
39 |
||
40 |
print "After an update, no files will have been redeployed from the local repository to" |
|
41 |
print "your home directory if there were merge or deployment conflicts. In a situation" |
|
42 |
print "such as this, you are expected to manually intervene; fixing broken merged files" |
|
43 |
print "by hand and moving aside files in your home directory. After having done this," |
|
44 |
print "this command can be used to reattempt the deployment and finalise the update." |
|
45 |
||
46 |
print "You can list outstanding conflicts by typing:" |
|
47 |
print " " + the.program.name + " conflicts" |
|
48 |
||
49 |
print "Options:" |
|
50 |
print " -r, --repo=REPO select the repo to check-out or create (defaults to 'home')" |
|
51 |
print " -v, --verbose display information about what is being done" |
|
52 |
print " --help display help and exit" |
|
53 |
exit( 0 ) |
|
54 |
||
55 |
||
56 |
def parse_command_line( self ): |
|
57 |
opts, args = getopt.gnu_getopt( |
|
58 |
sys.argv[ 1: ], "r:v", |
|
59 |
[ "repo=", "verbose", "help" ] ) |
|
60 |
for opt, optarg in opts: |
|
61 |
if opt in [ '--repo', '-r' ]: |
|
62 |
if not re.match( '^[-a-zA-z0-9.]+$', optarg ): |
|
63 |
raise the.program.FatalError( |
|
64 |
'invalid repository name: ' + optarg ) |
|
65 |
self.repo = optarg |
|
66 |
elif opt in [ '--verbose', '-v' ]: |
|
67 |
the.verbose = True |
|
68 |
elif opt == "--help": |
|
69 |
self.print_help() |
|
70 |
||
71 |
# discard first argument (the command) |
|
72 |
args.pop( 0 ) |
|
73 |
||
74 |
# remaining arguments |
|
75 |
if len( args ): |
|
76 |
raise the.program.UsageError( 'too many arguments' ) |
|
77 |
||
78 |
||
79 |
def run( self ): |
|
80 |
||
81 |
# set up repo and check it exists |
|
82 |
the.set_repo( self.repo ) |
|
83 |
the.repo.check_dir_exists() |
|
84 |
||
85 |
# initialise deployment (check it's valid) |
|
86 |
deployment = Deployment() |
|
87 |
deployment.check_ongoing( True ) |
|
88 |
||
89 |
message = '' |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
90 |
|
91 |
# check for conflicts in repo |
|
92 |
files = the.repo.vcs.get_conflicts() |
|
93 |
if files: |
|
4
by Tim Marston
added more commands |
94 |
message += 'Conflicts in %s:\n %s' % \ |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
95 |
( the.repo.name, '\n '.join( files ) ) |
96 |
||
97 |
# check for deployment conclicts |
|
98 |
conflicts = deployment.get_conflicts() |
|
4
by Tim Marston
added more commands |
99 |
if conflicts: |
100 |
message += 'Deployment conflicts:\n %s' % \ |
|
101 |
'\n '.join( conflicts ) |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
102 |
|
103 |
# stop if there are conflicts |
|
4
by Tim Marston
added more commands |
104 |
if message: |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
105 |
raise the.program.FatalError( |
106 |
'there were conflicts...\n' + message ) |
|
4
by Tim Marston
added more commands |
107 |
|
108 |
# copy-out changes from repo |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
109 |
deployment.copy_out() |
4
by Tim Marston
added more commands |
110 |
|
111 |
# now we've copied-out, revert any copied-in changes! |
|
112 |
if the.verbose: print "reverting %s" % the.repo.dir |
|
113 |
the.repo.vcs.revert() |