/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
# 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 print_help( self ):
32
		print "Usage: " + the.program.name + " update [--repo=REPO]"
33
		print
34
		#      01234567890123456789012345678901234567890123456789012345678901234567890123456789
35
		print "Update a local repository and deploy changes."
36
		print
37
		print "Files in your home directory are copied in to the local repository, the local"
38
		print "repository is then updated (i.e., changes made to it are pulled down and merged)"
39
		print "and files from the local repository are then redeployed to your home directory."
40
		print
41
		print "If any conflicts occur, either during the merge or during the redeployment, no"
42
		print "files will be deployed and you will be expected to manually intervene.  Merge"
43
		print "conflicts should be dealt with the same way as you'd expect for version control."
44
		print "Conflicts that arise from files already existing in your home directory must be"
45
		print "dealt with by moving those files aside (currently)."
46
		print
17 by Tim Marston
read ~/.stdhomerc; commands set repo before run(); program performs late
47
		print "After a failed update, you can list outstanding conflicts by typing:"
48
		print "    " + the.program.name + " conflicts"
49
		print
50
		print "After fixing outstanding conflicts, you can re-attempt the redeployment of"
51
		print "your repository by typing:"
4 by Tim Marston
added more commands
52
		print "    " + the.program.name + " resolve"
53
		print
17 by Tim Marston
read ~/.stdhomerc; commands set repo before run(); program performs late
54
		print "To back out of trying to update and revert the local repository, type:"
55
		print "    " + the.program.name + " stage-revert"
4 by Tim Marston
added more commands
56
		print
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 )
17 by Tim Marston
read ~/.stdhomerc; commands set repo before run(); program performs late
73
				the.repo = optarg
4 by Tim Marston
added more commands
74
			elif opt == "--help":
75
				self.print_help()
55 by Tim Marston
moved handling of --verbose to main program; manuall parse config file (because
76
4 by Tim Marston
added more commands
77
		# discard first argument (the command)
78
		args.pop( 0 )
79
80
		# remaining arguments
81
		if len( args ):
82
			raise the.program.UsageError( 'too many arguments' )
83
84
85
	def run( self ):
86
87
		# set up repo and check it exists
88
		the.repo.check_dir_exists()
89
8 by Tim Marston
added diff command; moved all command to commands subdir; made stage-revert
90
		# initialise deployment (and check it)
4 by Tim Marston
added more commands
91
		deployment = Deployment()
92
		deployment.check_ongoing( False )
93
94
		# check for local changes
95
		if the.repo.vcs.has_changes():
96
			raise the.program.FatalError(
97
				'repo has local changes: %s\n'
55 by Tim Marston
moved handling of --verbose to main program; manuall parse config file (because
98
				'Hint: see "%s stage-revert --help"' %
4 by Tim Marston
added more commands
99
				( the.repo.name, the.program.name ) )
100
101
		# copy-in changes to repo
59 by Tim Marston
switched init command (and update command) to checking for conflicts prior to
102
		deployment.copy_in()
4 by Tim Marston
added more commands
103
104
		# perform vcs update
35 by Tim Marston
made checks for verbose >= 1 explicit
105
		if the.verbose >= 1: print "updating %s" % the.repo.dir
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
106
		updated_files = the.repo.vcs.update()
4 by Tim Marston
added more commands
107
108
		message = ''
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
109
110
		# check for conflicts in repo
4 by Tim Marston
added more commands
111
		files = the.repo.vcs.get_conflicts()
112
		if files:
13 by Tim Marston
changed working of output
113
			message += 'conflicts in %s:\n  %s' % \
4 by Tim Marston
added more commands
114
					   ( the.repo.name, '\n  '.join( files ) )
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
115
116
		# check for deployment conclicts
117
		conflicts = deployment.get_conflicts( updated_files )
118
		if conflicts:
13 by Tim Marston
changed working of output
119
			message += 'deployment conflicts:\n  %s' % \
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
120
					   '\n  '.join( conflicts )
121
122
		# stop if there are conflicts
4 by Tim Marston
added more commands
123
		if message:
124
			raise the.program.FatalError(
125
				'there were conflicts...\n' + message )
126
		# copy-out changes from repo
5 by Tim Marston
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
127
		deployment.copy_out()
4 by Tim Marston
added more commands
128
129
		# now we've copied-out, revert any copied-in changes!
35 by Tim Marston
made checks for verbose >= 1 explicit
130
		if the.verbose >= 1: print "reverting %s" % the.repo.dir
4 by Tim Marston
added more commands
131
		the.repo.vcs.revert()