/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-19 20:01:06 UTC
  • Revision ID: tim@ed.am-20140319200106-ou5y1nat6y2auaue
removed square brackets from AC_INIT parameter

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/update.py
20
20
 
21
21
 
22
22
import sys, re, getopt
23
 
from .command import Command
 
23
from command import Command
24
24
import stdhome.the as the
25
25
from stdhome.deployment import Deployment
26
26
 
29
29
 
30
30
 
31
31
        def __init__( self ):
32
 
                self.quiet = False
 
32
                self.repo = None
33
33
 
34
34
 
35
35
        def print_help( self ):
36
 
                print("Usage: " + the.program.name + " update [--repo=REPO]")
37
 
                print()
 
36
                print "Usage: " + the.program.name + " update [--repo=REPO]"
 
37
                print
38
38
                #      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")
 
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 "You can resume the redeployment of your repository by typing:"
 
52
                print "    " + the.program.name + " resolve"
 
53
                print
 
54
                print "You can list outstanding conflicts by typing:"
 
55
                print "    " + the.program.name + " conflicts"
 
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"
66
61
                exit( 0 )
67
62
 
68
63
 
69
64
        def parse_command_line( self ):
70
65
                opts, args = getopt.gnu_getopt(
71
 
                        sys.argv[ 1: ], "qr:v",
72
 
                        [ "quiet", "repo=", "verbose", "help" ] )
 
66
                        sys.argv[ 1: ], "r:v",
 
67
                        [ "repo=", "verbose", "help" ] )
73
68
                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 ):
 
69
                        if opt in [ '--repo', '-r' ]:
 
70
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
78
71
                                        raise the.program.FatalError(
79
72
                                                'invalid repository name: ' + optarg )
80
 
                                the.repo = optarg
 
73
                                self.repo = optarg
81
74
                        elif opt in [ '--verbose', '-v' ]:
82
75
                                the.verbose += 1
83
76
                        elif opt == "--help":
84
77
                                self.print_help()
85
 
 
 
78
                
86
79
                # discard first argument (the command)
87
80
                args.pop( 0 )
88
81
 
94
87
        def run( self ):
95
88
 
96
89
                # set up repo and check it exists
 
90
                the.set_repo( self.repo )
97
91
                the.repo.check_dir_exists()
98
92
 
99
93
                # initialise deployment (and check it)
104
98
                if the.repo.vcs.has_changes():
105
99
                        raise the.program.FatalError(
106
100
                                'repo has local changes: %s\n'
107
 
                                'Hint: see "%s stage-revert --help"' %
 
101
                                'Hint: see "%s stage-revert --help"' % 
108
102
                                ( the.repo.name, the.program.name ) )
109
103
 
110
104
                # copy-in changes to repo
111
 
                deployment.copy_in()
 
105
                try:
 
106
                        deployment.copy_in()
 
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.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
112
111
 
113
112
                # perform vcs update
114
 
                if the.verbose >= 1: print("updating %s" % the.repo.dir)
 
113
                if the.verbose: print "updating %s" % the.repo.dir
115
114
                updated_files = the.repo.vcs.update()
116
115
 
117
116
                message = ''
119
118
                # check for conflicts in repo
120
119
                files = the.repo.vcs.get_conflicts()
121
120
                if files:
122
 
                        message += 'conflicts in %s:\n  %s' % \
 
121
                        message += 'Conflicts in %s:\n  %s' % \
123
122
                                           ( the.repo.name, '\n  '.join( files ) )
124
123
 
125
124
                # check for deployment conclicts
126
125
                conflicts = deployment.get_conflicts( updated_files )
127
126
                if conflicts:
128
 
                        message += 'deployment conflicts:\n  %s' % \
 
127
                        message += 'Deployment conflicts:\n  %s' % \
129
128
                                           '\n  '.join( conflicts )
130
129
 
131
130
                # stop if there are conflicts
132
131
                if message:
133
132
                        raise the.program.FatalError(
134
133
                                'there were conflicts...\n' + message )
135
 
 
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()