/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-02-12 21:51:49 UTC
  • Revision ID: tim@ed.am-20140212215149-msaxl7vo98il5i4a
added more commands

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:
 
28
 
 
29
 
 
30
        def __init__( self ):
 
31
                self.repo = None
29
32
 
30
33
 
31
34
        def print_help( self ):
44
47
                print "Conflicts that arise from files already existing in your home directory must be"
45
48
                print "dealt with by moving those files aside (currently)."
46
49
                print
47
 
                print "After a failed update, you can list outstanding conflicts by typing:"
 
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:"
48
54
                print "    " + the.program.name + " conflicts"
49
55
                print
50
 
                print "After fixing outstanding conflicts, you can re-attempt the redeployment of"
51
 
                print "your repository by typing:"
52
 
                print "    " + the.program.name + " resolve"
53
 
                print
54
 
                print "To back out of trying to update and revert the local repository, type:"
55
 
                print "    " + the.program.name + " stage-revert"
56
 
                print
57
56
                print "Options:"
58
57
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
59
58
                print "  -v, --verbose    display information about what is being done"
70
69
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
71
70
                                        raise the.program.FatalError(
72
71
                                                'invalid repository name: ' + optarg )
73
 
                                the.repo = optarg
 
72
                                self.repo = optarg
74
73
                        elif opt in [ '--verbose', '-v' ]:
75
 
                                the.verbose += 1
 
74
                                the.verbose = True
76
75
                        elif opt == "--help":
77
76
                                self.print_help()
78
77
                
87
86
        def run( self ):
88
87
 
89
88
                # set up repo and check it exists
 
89
                the.set_repo( self.repo )
90
90
                the.repo.check_dir_exists()
91
91
 
92
 
                # initialise deployment (and check it)
 
92
                # initialise deployment (check it's valid)
93
93
                deployment = Deployment()
94
94
                deployment.check_ongoing( False )
95
95
 
103
103
                # copy-in changes to repo
104
104
                try:
105
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.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
 
106
                except( deployment.Conflict, deployment.DeploymentOngoing ) as e:
 
107
                        raise the.program.FatalError( e.msg )
110
108
 
111
109
                # perform vcs update
112
 
                if the.verbose >= 1: print "updating %s" % the.repo.dir
113
 
                updated_files = the.repo.vcs.update()
 
110
                if the.verbose: print "updating %s" % the.repo.dir
 
111
                the.repo.vcs.update()
114
112
 
 
113
                # check for conflicts
115
114
                message = ''
116
 
 
117
 
                # check for conflicts in repo
118
115
                files = the.repo.vcs.get_conflicts()
119
116
                if files:
120
 
                        message += 'conflicts in %s:\n  %s' % \
 
117
                        message += 'Conflicts in %s:\n  %s' % \
121
118
                                           ( the.repo.name, '\n  '.join( files ) )
122
 
 
123
 
                # check for deployment conclicts
124
 
                conflicts = deployment.get_conflicts( updated_files )
125
 
                if conflicts:
126
 
                        message += 'deployment conflicts:\n  %s' % \
127
 
                                           '\n  '.join( conflicts )
128
 
 
129
 
                # stop if there are conflicts
 
119
                files = deployment.get_conflicts()
 
120
                if files:
 
121
                        message += 'Deployment conflicts:\n  %s' % \
 
122
                                           '\n  '.join( files )
130
123
                if message:
131
124
                        raise the.program.FatalError(
132
125
                                'there were conflicts...\n' + message )
 
126
 
133
127
                # copy-out changes from repo
134
 
                deployment.copy_out()
 
128
                try:
 
129
                        deployment.copy_out()
 
130
                except deployment.Conflict as e:
 
131
                        raise the.program.FatalError( e.msg )
135
132
 
136
133
                # now we've copied-out, revert any copied-in changes!
137
 
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
134
                if the.verbose: print "reverting %s" % the.repo.dir
138
135
                the.repo.vcs.revert()