/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-09-09 19:14:47 UTC
  • Revision ID: tim@ed.am-20140909191447-j3rapksxamefpm68
minor comment formatting tweak

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
 
 
35
31
        def print_help( self ):
36
32
                print "Usage: " + the.program.name + " update [--repo=REPO]"
37
33
                print
48
44
                print "Conflicts that arise from files already existing in your home directory must be"
49
45
                print "dealt with by moving those files aside (currently)."
50
46
                print
51
 
                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:"
52
52
                print "    " + the.program.name + " resolve"
53
53
                print
54
 
                print "You can list outstanding conflicts by typing:"
55
 
                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"
56
56
                print
57
57
                print "Options:"
58
58
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
70
70
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
71
71
                                        raise the.program.FatalError(
72
72
                                                'invalid repository name: ' + optarg )
73
 
                                self.repo = optarg
 
73
                                the.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 )
91
90
                the.repo.check_dir_exists()
92
91
 
93
92
                # initialise deployment (and check it)
110
109
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
111
110
 
112
111
                # perform vcs update
113
 
                if the.verbose: print "updating %s" % the.repo.dir
 
112
                if the.verbose >= 1: print "updating %s" % the.repo.dir
114
113
                updated_files = the.repo.vcs.update()
115
114
 
116
115
                message = ''
118
117
                # check for conflicts in repo
119
118
                files = the.repo.vcs.get_conflicts()
120
119
                if files:
121
 
                        message += 'Conflicts in %s:\n  %s' % \
 
120
                        message += 'conflicts in %s:\n  %s' % \
122
121
                                           ( the.repo.name, '\n  '.join( files ) )
123
122
 
124
123
                # check for deployment conclicts
125
124
                conflicts = deployment.get_conflicts( updated_files )
126
125
                if conflicts:
127
 
                        message += 'Deployment conflicts:\n  %s' % \
 
126
                        message += 'deployment conflicts:\n  %s' % \
128
127
                                           '\n  '.join( conflicts )
129
128
 
130
129
                # stop if there are conflicts
135
134
                deployment.copy_out()
136
135
 
137
136
                # now we've copied-out, revert any copied-in changes!
138
 
                if the.verbose: print "reverting %s" % the.repo.dir
 
137
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
139
138
                the.repo.vcs.revert()