/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-26 19:10:31 UTC
  • Revision ID: tim@ed.am-20140226191031-elcqy5j09h2syn2j
moved copy-in, copy-out and deployment conflict checking to a set of "walkers";
bzr vcs back-end now parses affected files during update; deployment state now
includes affected files

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
 
106
106
                except deployment.CopyInConflicts as e:
107
107
                        raise the.program.FatalError(
108
108
                                'Files in %s differ too severly from %s:\n  %s\n' % \
109
 
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
 
109
                                ( the.fsdir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
110
110
 
111
111
                # perform vcs update
112
112
                if the.verbose: print "updating %s" % the.repo.dir
117
117
                # check for conflicts in repo
118
118
                files = the.repo.vcs.get_conflicts()
119
119
                if files:
120
 
                        message += 'conflicts in %s:\n  %s' % \
 
120
                        message += 'Conflicts in %s:\n  %s' % \
121
121
                                           ( the.repo.name, '\n  '.join( files ) )
122
122
 
123
123
                # check for deployment conclicts
124
124
                conflicts = deployment.get_conflicts( updated_files )
125
125
                if conflicts:
126
 
                        message += 'deployment conflicts:\n  %s' % \
 
126
                        message += 'Deployment conflicts:\n  %s' % \
127
127
                                           '\n  '.join( conflicts )
128
128
 
129
129
                # stop if there are conflicts
130
130
                if message:
131
131
                        raise the.program.FatalError(
132
132
                                'there were conflicts...\n' + message )
 
133
 
133
134
                # copy-out changes from repo
134
135
                deployment.copy_out()
135
136