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 |
|
88
by Tim Marston
python3ification |
23 |
from .command import Command |
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
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 |
||
61
by Tim Marston
added home directory change reporting to CopyOutWalker; added --quiet option to |
31 |
def __init__( self ): |
32 |
self.quiet = False |
|
33 |
||
34 |
||
4
by Tim Marston
added more commands |
35 |
def print_help( self ): |
88
by Tim Marston
python3ification |
36 |
print("Usage: " + the.program.name + " resolve [--repo=REPO]") |
37 |
print() |
|
4
by Tim Marston
added more commands |
38 |
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789 |
88
by Tim Marston
python3ification |
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(" --quiet do not report changes to the home directory") |
|
52 |
print(" -r, --repo=REPO select the repo to check-out or create (defaults to 'home')") |
|
53 |
print(" -v, --verbose display information about what is being done") |
|
54 |
print(" --help display help and exit") |
|
4
by Tim Marston
added more commands |
55 |
exit( 0 ) |
56 |
||
57 |
||
58 |
def parse_command_line( self ): |
|
59 |
opts, args = getopt.gnu_getopt( |
|
60 |
sys.argv[ 1: ], "r:v", |
|
61
by Tim Marston
added home directory change reporting to CopyOutWalker; added --quiet option to |
61 |
[ "quiet", "repo=", "verbose", "help" ] ) |
4
by Tim Marston
added more commands |
62 |
for opt, optarg in opts: |
61
by Tim Marston
added home directory change reporting to CopyOutWalker; added --quiet option to |
63 |
if opt == "--quiet": |
64 |
self.quiet = True |
|
65 |
elif opt in [ '--repo', '-r' ]: |
|
66 |
if not re.search( '^[-a-zA-z0-9.]+$', optarg ): |
|
4
by Tim Marston
added more commands |
67 |
raise the.program.FatalError( |
68 |
'invalid repository name: ' + optarg ) |
|
17
by Tim Marston
read ~/.stdhomerc; commands set repo before run(); program performs late |
69 |
the.repo = optarg |
63
by Tim Marston
determine and instantiate repo vcs dynamically; for new repos, added default vcs |
70 |
elif opt in [ '--verbose', '-v' ]: |
71 |
the.verbose += 1 |
|
4
by Tim Marston
added more commands |
72 |
elif opt == "--help": |
73 |
self.print_help() |
|
55
by Tim Marston
moved handling of --verbose to main program; manuall parse config file (because |
74 |
|
4
by Tim Marston
added more commands |
75 |
# discard first argument (the command) |
76 |
args.pop( 0 ) |
|
77 |
||
78 |
# remaining arguments |
|
79 |
if len( args ): |
|
80 |
raise the.program.UsageError( 'too many arguments' ) |
|
81 |
||
82 |
||
83 |
def run( self ): |
|
84 |
||
85 |
# set up repo and check it exists |
|
86 |
the.repo.check_dir_exists() |
|
87 |
||
88 |
# initialise deployment (check it's valid) |
|
89 |
deployment = Deployment() |
|
90 |
deployment.check_ongoing( True ) |
|
91 |
||
92 |
message = '' |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
93 |
|
94 |
# check for conflicts in repo |
|
95 |
files = the.repo.vcs.get_conflicts() |
|
96 |
if files: |
|
13
by Tim Marston
changed working of output |
97 |
message += 'conflicts in %s:\n %s' % \ |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
98 |
( the.repo.name, '\n '.join( files ) ) |
99 |
||
100 |
# check for deployment conclicts |
|
101 |
conflicts = deployment.get_conflicts() |
|
4
by Tim Marston
added more commands |
102 |
if conflicts: |
13
by Tim Marston
changed working of output |
103 |
message += 'deployment conflicts:\n %s' % \ |
4
by Tim Marston
added more commands |
104 |
'\n '.join( conflicts ) |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
105 |
|
106 |
# stop if there are conflicts |
|
4
by Tim Marston
added more commands |
107 |
if message: |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
108 |
raise the.program.FatalError( |
109 |
'there were conflicts...\n' + message ) |
|
4
by Tim Marston
added more commands |
110 |
|
111 |
# copy-out changes from repo |
|
61
by Tim Marston
added home directory change reporting to CopyOutWalker; added --quiet option to |
112 |
deployment.copy_out( self.quiet ) |
4
by Tim Marston
added more commands |
113 |
|
114 |
# now we've copied-out, revert any copied-in changes! |
|
88
by Tim Marston
python3ification |
115 |
if the.verbose >= 1: print("reverting %s" % the.repo.dir) |
4
by Tim Marston
added more commands |
116 |
the.repo.vcs.revert() |