bzr branch
http://bzr.ed.am/stdhome
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
1 |
# update.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 UpdateCommand( 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 + " update [--repo=REPO]" |
|
37 |
||
38 |
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789 |
|
39 |
print "Update a local repository and deploy changes." |
|
40 |
||
41 |
print "Files in your home directory are copied in to the local repository, the local" |
|
42 |
print "repository is then updated (i.e., changes made to it are pulled down and merged)" |
|
43 |
print "and files from the local repository are then redeployed to your home directory." |
|
44 |
||
45 |
print "If any conflicts occur, either during the merge or during the redeployment, no" |
|
46 |
print "files will be deployed and you will be expected to manually intervene. Merge" |
|
47 |
print "conflicts should be dealt with the same way as you'd expect for version control." |
|
48 |
print "Conflicts that arise from files already existing in your home directory must be" |
|
49 |
print "dealt with by moving those files aside (currently)." |
|
50 |
||
51 |
print "You can resume the redeployment of your repository by typing:" |
|
52 |
print " " + the.program.name + " resolve" |
|
53 |
||
54 |
print "You can list outstanding conflicts by typing:" |
|
55 |
print " " + the.program.name + " conflicts" |
|
56 |
||
57 |
print "Options:" |
|
58 |
print " -r, --repo=REPO select the repo to check-out or create (defaults to 'home')" |
|
59 |
print " -v, --verbose display information about what is being done" |
|
60 |
print " --help display help and exit" |
|
61 |
exit( 0 ) |
|
62 |
||
63 |
||
64 |
def parse_command_line( self ): |
|
65 |
opts, args = getopt.gnu_getopt( |
|
66 |
sys.argv[ 1: ], "r:v", |
|
67 |
[ "repo=", "verbose", "help" ] ) |
|
68 |
for opt, optarg in opts: |
|
69 |
if opt in [ '--repo', '-r' ]: |
|
70 |
if not re.match( '^[-a-zA-z0-9.]+$', optarg ): |
|
71 |
raise the.program.FatalError( |
|
72 |
'invalid repository name: ' + optarg ) |
|
73 |
self.repo = optarg |
|
74 |
elif opt in [ '--verbose', '-v' ]: |
|
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
75 |
the.verbose += 1 |
4
by Tim Marston
added more commands |
76 |
elif opt == "--help": |
77 |
self.print_help() |
|
78 |
||
79 |
# discard first argument (the command) |
|
80 |
args.pop( 0 ) |
|
81 |
||
82 |
# remaining arguments |
|
83 |
if len( args ): |
|
84 |
raise the.program.UsageError( 'too many arguments' ) |
|
85 |
||
86 |
||
87 |
def run( self ): |
|
88 |
||
89 |
# set up repo and check it exists |
|
90 |
the.set_repo( self.repo ) |
|
91 |
the.repo.check_dir_exists() |
|
92 |
||
8
by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert |
93 |
# initialise deployment (and check it) |
4
by Tim Marston
added more commands |
94 |
deployment = Deployment() |
95 |
deployment.check_ongoing( False ) |
|
96 |
||
97 |
# check for local changes |
|
98 |
if the.repo.vcs.has_changes(): |
|
99 |
raise the.program.FatalError( |
|
100 |
'repo has local changes: %s\n' |
|
101 |
'Hint: see "%s stage-revert --help"' % |
|
102 |
( the.repo.name, the.program.name ) ) |
|
103 |
||
104 |
# copy-in changes to repo |
|
105 |
try: |
|
106 |
deployment.copy_in() |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
107 |
except deployment.CopyInConflicts as e: |
108 |
raise the.program.FatalError( |
|
109 |
'Files in %s differ too severly from %s:\n %s\n' % \ |
|
11
by Tim Marston
fixed incorrect variable name |
110 |
( the.home_dir, the.repo.dir, '\n '.join( e.conflicts ) ) ) |
4
by Tim Marston
added more commands |
111 |
|
112 |
# perform vcs update |
|
113 |
if the.verbose: print "updating %s" % the.repo.dir |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
114 |
updated_files = the.repo.vcs.update() |
4
by Tim Marston
added more commands |
115 |
|
116 |
message = '' |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
117 |
|
118 |
# check for conflicts in repo |
|
4
by Tim Marston
added more commands |
119 |
files = the.repo.vcs.get_conflicts() |
120 |
if files: |
|
13
by Tim Marston
changed working of output |
121 |
message += 'conflicts in %s:\n %s' % \ |
4
by Tim Marston
added more commands |
122 |
( the.repo.name, '\n '.join( files ) ) |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
123 |
|
124 |
# check for deployment conclicts |
|
125 |
conflicts = deployment.get_conflicts( updated_files ) |
|
126 |
if conflicts: |
|
13
by Tim Marston
changed working of output |
127 |
message += 'deployment conflicts:\n %s' % \ |
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
128 |
'\n '.join( conflicts ) |
129 |
||
130 |
# stop if there are conflicts |
|
4
by Tim Marston
added more commands |
131 |
if message: |
132 |
raise the.program.FatalError( |
|
133 |
'there were conflicts...\n' + message ) |
|
134 |
# copy-out changes from repo |
|
5
by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers"; |
135 |
deployment.copy_out() |
4
by Tim Marston
added more commands |
136 |
|
137 |
# now we've copied-out, revert any copied-in changes! |
|
138 |
if the.verbose: print "reverting %s" % the.repo.dir |
|
139 |
the.repo.vcs.revert() |