/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-02-13 13:20:44 UTC
  • Revision ID: tim@ed.am-20160213132044-t5zaxhdlhjyn4t1v
moved handling of --verbose to main program; manuall parse config file (because
ConfigFileParse does not support allow_no_value in python 2.6)

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.quiet = False
33
 
 
34
 
 
35
31
        def print_help( self ):
36
32
                print "Usage: " + the.program.name + " update [--repo=REPO]"
37
33
                print
59
55
                print "    " + the.program.name + " stage-revert"
60
56
                print
61
57
                print "Options:"
62
 
                print "      --quiet      do not report changes to the home directory"
63
58
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
64
59
                print "  -v, --verbose    display information about what is being done"
65
60
                print "      --help       display help and exit"
68
63
 
69
64
        def parse_command_line( self ):
70
65
                opts, args = getopt.gnu_getopt(
71
 
                        sys.argv[ 1: ], "qr:v",
72
 
                        [ "quiet", "repo=", "verbose", "help" ] )
 
66
                        sys.argv[ 1: ], "r:v",
 
67
                        [ "repo=", "verbose", "help" ] )
73
68
                for opt, optarg in opts:
74
 
                        if opt == '--quiet':
75
 
                                self.quiet = True
76
 
                        elif opt in [ '--repo', '-r' ]:
77
 
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
 
69
                        if opt in [ '--repo', '-r' ]:
 
70
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
78
71
                                        raise the.program.FatalError(
79
72
                                                'invalid repository name: ' + optarg )
80
73
                                the.repo = optarg
81
 
                        elif opt in [ '--verbose', '-v' ]:
82
 
                                the.verbose += 1
83
74
                        elif opt == "--help":
84
75
                                self.print_help()
85
76
 
108
99
                                ( the.repo.name, the.program.name ) )
109
100
 
110
101
                # copy-in changes to repo
111
 
                deployment.copy_in()
 
102
                try:
 
103
                        deployment.copy_in()
 
104
                except deployment.CopyInConflicts as e:
 
105
                        raise the.program.FatalError(
 
106
                                'Files in %s differ too severly from %s:\n  %s\n' % \
 
107
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
112
108
 
113
109
                # perform vcs update
114
110
                if the.verbose >= 1: print "updating %s" % the.repo.dir
132
128
                if message:
133
129
                        raise the.program.FatalError(
134
130
                                'there were conflicts...\n' + message )
135
 
 
136
131
                # copy-out changes from repo
137
 
                deployment.copy_out( self.quiet )
 
132
                deployment.copy_out()
138
133
 
139
134
                # now we've copied-out, revert any copied-in changes!
140
135
                if the.verbose >= 1: print "reverting %s" % the.repo.dir