22
22
import sys, re, getopt
23
from .command import Command
24
import stdhome.the as the
25
from stdhome.deployment import Deployment
28
class UpdateCommand( Command ):
24
from deployment import Deployment
31
30
def __init__( self ):
35
34
def print_help( self ):
36
print("Usage: " + the.program.name + " update [--repo=REPO]")
35
print "Usage: " + the.program.name + " update [--repo=REPO]"
38
37
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789
39
print("Update a local repository and deploy changes.")
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.")
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).")
51
print("After a failed update, you can list outstanding conflicts by typing:")
52
print(" " + the.program.name + " conflicts")
54
print("After fixing outstanding conflicts, you can re-attempt the redeployment of")
55
print("your repository by typing:")
56
print(" " + the.program.name + " resolve")
58
print("To back out of trying to update and revert the local repository, type:")
59
print(" " + the.program.name + " stage-revert")
62
print(" --quiet do not report changes to the home directory")
63
print(" -r, --repo=REPO select the repo to check-out or create (defaults to 'home')")
64
print(" -v, --verbose display information about what is being done")
65
print(" --help display help and exit")
38
print "Update a local repository and deploy changes."
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."
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)."
50
print "You can resume the redeployment of your repository by typing:"
51
print " " + the.program.name + " resolve"
53
print "You can list outstanding conflicts by typing:"
54
print " " + the.program.name + " conflicts"
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"
69
63
def parse_command_line( self ):
70
64
opts, args = getopt.gnu_getopt(
71
sys.argv[ 1: ], "qr:v",
72
[ "quiet", "repo=", "verbose", "help" ] )
65
sys.argv[ 1: ], "r:v",
66
[ "repo=", "verbose", "help" ] )
73
67
for opt, optarg in opts:
76
elif opt in [ '--repo', '-r' ]:
77
if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
68
if opt in [ '--repo', '-r' ]:
69
if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
78
70
raise the.program.FatalError(
79
71
'invalid repository name: ' + optarg )
81
73
elif opt in [ '--verbose', '-v' ]:
83
75
elif opt == "--help":
86
78
# discard first argument (the command)
104
97
if the.repo.vcs.has_changes():
105
98
raise the.program.FatalError(
106
99
'repo has local changes: %s\n'
107
'Hint: see "%s stage-revert --help"' %
100
'Hint: see "%s stage-revert --help"' %
108
101
( the.repo.name, the.program.name ) )
110
103
# copy-in changes to repo
106
except( deployment.Conflict, deployment.DeploymentOngoing ) as e:
107
raise the.program.FatalError( e.msg )
113
109
# perform vcs update
114
if the.verbose >= 1: print("updating %s" % the.repo.dir)
115
updated_files = the.repo.vcs.update()
110
if the.verbose: print "updating %s" % the.repo.dir
111
the.repo.vcs.update()
113
# check for conflicts
119
# check for conflicts in repo
120
115
files = the.repo.vcs.get_conflicts()
122
message += 'conflicts in %s:\n %s' % \
117
message += 'Conflicts in %s:\n %s' % \
123
118
( the.repo.name, '\n '.join( files ) )
125
# check for deployment conclicts
126
conflicts = deployment.get_conflicts( updated_files )
128
message += 'deployment conflicts:\n %s' % \
129
'\n '.join( conflicts )
131
# stop if there are conflicts
119
files = deployment.get_conflicts()
121
message += 'Deployment conflicts:\n %s' % \
133
124
raise the.program.FatalError(
134
125
'there were conflicts...\n' + message )
136
127
# copy-out changes from repo
137
deployment.copy_out( self.quiet )
129
deployment.copy_out()
130
except deployment.Conflict as e:
131
raise the.program.FatalError( e.msg )
139
133
# now we've copied-out, revert any copied-in changes!
140
if the.verbose >= 1: print("reverting %s" % the.repo.dir)
134
if the.verbose: print "reverting %s" % the.repo.dir
141
135
the.repo.vcs.revert()