/stdhome

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