/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/command_update.py

  • Committer: Tim Marston
  • Date: 2014-03-08 00:40:42 UTC
  • Revision ID: tim@ed.am-20140308004042-j5rco14bjp3teegj
updated .bzrignore

Show diffs side-by-side

added added

removed removed

lib/stdhome/command_update.py
1
 
# update.py
 
1
# command_update.py
2
2
#
3
3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
4
4
#
20
20
 
21
21
 
22
22
import sys, re, getopt
23
 
from .command import Command
24
 
import stdhome.the as the
25
 
from stdhome.deployment import Deployment
26
 
 
27
 
 
28
 
class UpdateCommand( Command ):
 
23
import the
 
24
from deployment import Deployment
 
25
 
 
26
 
 
27
class CommandUpdate:
29
28
 
30
29
 
31
30
        def __init__( self ):
32
 
                self.quiet = False
 
31
                self.repo = None
33
32
 
34
33
 
35
34
        def print_help( self ):
36
 
                print("Usage: " + the.program.name + " update [--repo=REPO]")
37
 
                print()
 
35
                print "Usage: " + the.program.name + " update [--repo=REPO]"
 
36
                print
38
37
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
39
 
                print("Update a local repository and deploy changes.")
40
 
                print()
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
 
                print()
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
 
                print()
51
 
                print("After a failed update, you can list outstanding conflicts by typing:")
52
 
                print("    " + the.program.name + " conflicts")
53
 
                print()
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")
57
 
                print()
58
 
                print("To back out of trying to update and revert the local repository, type:")
59
 
                print("    " + the.program.name + " stage-revert")
60
 
                print()
61
 
                print("Options:")
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."
 
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"
66
60
                exit( 0 )
67
61
 
68
62
 
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:
74
 
                        if opt == '--quiet':
75
 
                                self.quiet = True
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 )
80
 
                                the.repo = optarg
 
72
                                self.repo = optarg
81
73
                        elif opt in [ '--verbose', '-v' ]:
82
 
                                the.verbose += 1
 
74
                                the.verbose = True
83
75
                        elif opt == "--help":
84
76
                                self.print_help()
85
 
 
 
77
                
86
78
                # discard first argument (the command)
87
79
                args.pop( 0 )
88
80
 
94
86
        def run( self ):
95
87
 
96
88
                # set up repo and check it exists
 
89
                the.set_repo( self.repo )
97
90
                the.repo.check_dir_exists()
98
91
 
99
 
                # initialise deployment (and check it)
 
92
                # initialise deployment (check it's valid)
100
93
                deployment = Deployment()
101
94
                deployment.check_ongoing( False )
102
95
 
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 ) )
109
102
 
110
103
                # copy-in changes to repo
111
 
                deployment.copy_in()
 
104
                try:
 
105
                        deployment.copy_in()
 
106
                except deployment.CopyInConflicts as e:
 
107
                        raise the.program.FatalError(
 
108
                                'Files in %s differ too severly from %s:\n  %s\n' % \
 
109
                                ( the.fsdir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
112
110
 
113
111
                # perform vcs update
114
 
                if the.verbose >= 1: print("updating %s" % the.repo.dir)
 
112
                if the.verbose: print "updating %s" % the.repo.dir
115
113
                updated_files = the.repo.vcs.update()
116
114
 
117
115
                message = ''
119
117
                # check for conflicts in repo
120
118
                files = the.repo.vcs.get_conflicts()
121
119
                if files:
122
 
                        message += 'conflicts in %s:\n  %s' % \
 
120
                        message += 'Conflicts in %s:\n  %s' % \
123
121
                                           ( the.repo.name, '\n  '.join( files ) )
124
122
 
125
123
                # check for deployment conclicts
126
124
                conflicts = deployment.get_conflicts( updated_files )
127
125
                if conflicts:
128
 
                        message += 'deployment conflicts:\n  %s' % \
 
126
                        message += 'Deployment conflicts:\n  %s' % \
129
127
                                           '\n  '.join( conflicts )
130
128
 
131
129
                # stop if there are conflicts
134
132
                                'there were conflicts...\n' + message )
135
133
 
136
134
                # copy-out changes from repo
137
 
                deployment.copy_out( self.quiet )
 
135
                deployment.copy_out()
138
136
 
139
137
                # now we've copied-out, revert any copied-in changes!
140
 
                if the.verbose >= 1: print("reverting %s" % the.repo.dir)
 
138
                if the.verbose: print "reverting %s" % the.repo.dir
141
139
                the.repo.vcs.revert()