31
31
def __init__( self ):
35
35
def print_help( self ):
36
print "Usage: " + the.program.name + " update [--repo=REPO]"
36
print("Usage: " + the.program.name + " update [--repo=REPO]")
38
38
# 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 "You can resume the redeployment of your repository by typing:"
52
print " " + the.program.name + " resolve"
54
print "You can list outstanding conflicts by typing:"
55
print " " + the.program.name + " conflicts"
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"
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")
64
69
def parse_command_line( self ):
65
70
opts, args = getopt.gnu_getopt(
66
sys.argv[ 1: ], "r:v",
67
[ "repo=", "verbose", "help" ] )
71
sys.argv[ 1: ], "qr:v",
72
[ "quiet", "repo=", "verbose", "help" ] )
68
73
for opt, optarg in opts:
69
if opt in [ '--repo', '-r' ]:
70
if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
76
elif opt in [ '--repo', '-r' ]:
77
if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
71
78
raise the.program.FatalError(
72
79
'invalid repository name: ' + optarg )
74
81
elif opt in [ '--verbose', '-v' ]:
76
83
elif opt == "--help":
79
86
# discard first argument (the command)
98
104
if the.repo.vcs.has_changes():
99
105
raise the.program.FatalError(
100
106
'repo has local changes: %s\n'
101
'Hint: see "%s stage-revert --help"' %
107
'Hint: see "%s stage-revert --help"' %
102
108
( the.repo.name, the.program.name ) )
104
110
# copy-in changes to repo
107
except deployment.CopyInConflicts as e:
108
raise the.program.FatalError(
109
'Files in %s differ too severly from %s:\n %s\n' % \
110
( the.hdir, the.repo.dir, '\n '.join( e.conflicts ) ) )
112
113
# perform vcs update
113
if the.verbose: print "updating %s" % the.repo.dir
114
if the.verbose >= 1: print("updating %s" % the.repo.dir)
114
115
updated_files = the.repo.vcs.update()
118
119
# check for conflicts in repo
119
120
files = the.repo.vcs.get_conflicts()
121
message += 'Conflicts in %s:\n %s' % \
122
message += 'conflicts in %s:\n %s' % \
122
123
( the.repo.name, '\n '.join( files ) )
124
125
# check for deployment conclicts
125
126
conflicts = deployment.get_conflicts( updated_files )
127
message += 'Deployment conflicts:\n %s' % \
128
message += 'deployment conflicts:\n %s' % \
128
129
'\n '.join( conflicts )
130
131
# stop if there are conflicts
132
133
raise the.program.FatalError(
133
134
'there were conflicts...\n' + message )
134
136
# copy-out changes from repo
135
deployment.copy_out()
137
deployment.copy_out( self.quiet )
137
139
# now we've copied-out, revert any copied-in changes!
138
if the.verbose: print "reverting %s" % the.repo.dir
140
if the.verbose >= 1: print("reverting %s" % the.repo.dir)
139
141
the.repo.vcs.revert()