/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
28
28
class UpdateCommand( Command ):
29
29
 
30
30
 
 
31
        def __init__( self ):
 
32
                self.repo = None
 
33
 
 
34
 
31
35
        def print_help( self ):
32
36
                print "Usage: " + the.program.name + " update [--repo=REPO]"
33
37
                print
44
48
                print "Conflicts that arise from files already existing in your home directory must be"
45
49
                print "dealt with by moving those files aside (currently)."
46
50
                print
47
 
                print "After a failed update, you can list outstanding conflicts by typing:"
 
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:"
48
55
                print "    " + the.program.name + " conflicts"
49
56
                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
57
                print "Options:"
58
58
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
59
59
                print "  -v, --verbose    display information about what is being done"
70
70
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
71
71
                                        raise the.program.FatalError(
72
72
                                                'invalid repository name: ' + optarg )
73
 
                                the.repo = optarg
 
73
                                self.repo = optarg
74
74
                        elif opt in [ '--verbose', '-v' ]:
75
75
                                the.verbose += 1
76
76
                        elif opt == "--help":
87
87
        def run( self ):
88
88
 
89
89
                # set up repo and check it exists
 
90
                the.set_repo( self.repo )
90
91
                the.repo.check_dir_exists()
91
92
 
92
93
                # initialise deployment (and check it)
109
110
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
110
111
 
111
112
                # perform vcs update
112
 
                if the.verbose >= 1: print "updating %s" % the.repo.dir
 
113
                if the.verbose: print "updating %s" % the.repo.dir
113
114
                updated_files = the.repo.vcs.update()
114
115
 
115
116
                message = ''
117
118
                # check for conflicts in repo
118
119
                files = the.repo.vcs.get_conflicts()
119
120
                if files:
120
 
                        message += 'conflicts in %s:\n  %s' % \
 
121
                        message += 'Conflicts in %s:\n  %s' % \
121
122
                                           ( the.repo.name, '\n  '.join( files ) )
122
123
 
123
124
                # check for deployment conclicts
124
125
                conflicts = deployment.get_conflicts( updated_files )
125
126
                if conflicts:
126
 
                        message += 'deployment conflicts:\n  %s' % \
 
127
                        message += 'Deployment conflicts:\n  %s' % \
127
128
                                           '\n  '.join( conflicts )
128
129
 
129
130
                # stop if there are conflicts
134
135
                deployment.copy_out()
135
136
 
136
137
                # now we've copied-out, revert any copied-in changes!
137
 
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
138
                if the.verbose: print "reverting %s" % the.repo.dir
138
139
                the.repo.vcs.revert()