/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: 2016-04-10 20:29:46 UTC
  • Revision ID: tim@ed.am-20160410202946-9eoh5i3et9443aq6
fixed greps in tools/dev to detect home-dir lines in stdhomerc

Show diffs side-by-side

added added

removed removed

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:
 
23
from command import Command
 
24
import stdhome.the as the
 
25
from stdhome.deployment import Deployment
 
26
 
 
27
 
 
28
class UpdateCommand( Command ):
28
29
 
29
30
 
30
31
        def __init__( self ):
31
 
                self.repo = None
 
32
                self.quiet = False
32
33
 
33
34
 
34
35
        def print_help( self ):
47
48
                print "Conflicts that arise from files already existing in your home directory must be"
48
49
                print "dealt with by moving those files aside (currently)."
49
50
                print
50
 
                print "You can resume the redeployment of your repository by typing:"
 
51
                print "After a failed update, you can list outstanding conflicts by typing:"
 
52
                print "    " + the.program.name + " conflicts"
 
53
                print
 
54
                print "After fixing outstanding conflicts, you can re-attempt the redeployment of"
 
55
                print "your repository by typing:"
51
56
                print "    " + the.program.name + " resolve"
52
57
                print
53
 
                print "You can list outstanding conflicts by typing:"
54
 
                print "    " + the.program.name + " conflicts"
 
58
                print "To back out of trying to update and revert the local repository, type:"
 
59
                print "    " + the.program.name + " stage-revert"
55
60
                print
56
61
                print "Options:"
 
62
                print "      --quiet      do not report changes to the home directory"
57
63
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
58
64
                print "  -v, --verbose    display information about what is being done"
59
65
                print "      --help       display help and exit"
62
68
 
63
69
        def parse_command_line( self ):
64
70
                opts, args = getopt.gnu_getopt(
65
 
                        sys.argv[ 1: ], "r:v",
66
 
                        [ "repo=", "verbose", "help" ] )
 
71
                        sys.argv[ 1: ], "qr:v",
 
72
                        [ "quiet", "repo=", "verbose", "help" ] )
67
73
                for opt, optarg in opts:
68
 
                        if opt in [ '--repo', '-r' ]:
69
 
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
 
74
                        if opt == '--quiet':
 
75
                                self.quiet = True
 
76
                        elif opt in [ '--repo', '-r' ]:
 
77
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
70
78
                                        raise the.program.FatalError(
71
79
                                                'invalid repository name: ' + optarg )
72
 
                                self.repo = optarg
 
80
                                the.repo = optarg
73
81
                        elif opt in [ '--verbose', '-v' ]:
74
 
                                the.verbose = True
 
82
                                the.verbose += 1
75
83
                        elif opt == "--help":
76
84
                                self.print_help()
77
 
                
 
85
 
78
86
                # discard first argument (the command)
79
87
                args.pop( 0 )
80
88
 
86
94
        def run( self ):
87
95
 
88
96
                # set up repo and check it exists
89
 
                the.set_repo( self.repo )
90
97
                the.repo.check_dir_exists()
91
98
 
92
 
                # initialise deployment (check it's valid)
 
99
                # initialise deployment (and check it)
93
100
                deployment = Deployment()
94
101
                deployment.check_ongoing( False )
95
102
 
97
104
                if the.repo.vcs.has_changes():
98
105
                        raise the.program.FatalError(
99
106
                                'repo has local changes: %s\n'
100
 
                                'Hint: see "%s stage-revert --help"' % 
 
107
                                'Hint: see "%s stage-revert --help"' %
101
108
                                ( the.repo.name, the.program.name ) )
102
109
 
103
110
                # copy-in changes to repo
104
 
                try:
105
 
                        deployment.copy_in()
106
 
                except( deployment.Conflict, deployment.DeploymentOngoing ) as e:
107
 
                        raise the.program.FatalError( e.msg )
 
111
                deployment.copy_in()
108
112
 
109
113
                # perform vcs update
110
 
                if the.verbose: print "updating %s" % the.repo.dir
111
 
                the.repo.vcs.update()
 
114
                if the.verbose >= 1: print "updating %s" % the.repo.dir
 
115
                updated_files = the.repo.vcs.update()
112
116
 
113
 
                # check for conflicts
114
117
                message = ''
 
118
 
 
119
                # check for conflicts in repo
115
120
                files = the.repo.vcs.get_conflicts()
116
121
                if files:
117
 
                        message += 'Conflicts in %s:\n  %s' % \
 
122
                        message += 'conflicts in %s:\n  %s' % \
118
123
                                           ( the.repo.name, '\n  '.join( files ) )
119
 
                files = deployment.get_conflicts()
120
 
                if files:
121
 
                        message += 'Deployment conflicts:\n  %s' % \
122
 
                                           '\n  '.join( files )
 
124
 
 
125
                # check for deployment conclicts
 
126
                conflicts = deployment.get_conflicts( updated_files )
 
127
                if conflicts:
 
128
                        message += 'deployment conflicts:\n  %s' % \
 
129
                                           '\n  '.join( conflicts )
 
130
 
 
131
                # stop if there are conflicts
123
132
                if message:
124
133
                        raise the.program.FatalError(
125
134
                                'there were conflicts...\n' + message )
126
135
 
127
136
                # copy-out changes from repo
128
 
                try:
129
 
                        deployment.copy_out()
130
 
                except deployment.Conflict as e:
131
 
                        raise the.program.FatalError( e.msg )
 
137
                deployment.copy_out( self.quiet )
132
138
 
133
139
                # now we've copied-out, revert any copied-in changes!
134
 
                if the.verbose: print "reverting %s" % the.repo.dir
 
140
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
135
141
                the.repo.vcs.revert()