/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-04-05 19:20:06 UTC
  • Revision ID: tim@ed.am-20140405192006-fv0toip4b8m5pc88
fixed bug preventing skipping of subdirectories in walker; also added
walker.File.__str__()

Show diffs side-by-side

added added

removed removed

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