/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-23 22:37:03 UTC
  • Revision ID: tim@ed.am-20160223223703-sx94svvstwt8xvrb
determine and instantiate repo vcs dynamically; for new repos, added default vcs
configuration option and allow override in init command arguments; re-added
handling of -v/--verbose arguments to commands and removed from program (since
there may be problems parsing all arguments here)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/update.py
28
28
class UpdateCommand( Command ):
29
29
 
30
30
 
 
31
        def __init__( self ):
 
32
                self.quiet = False
 
33
 
 
34
 
31
35
        def print_help( self ):
32
36
                print "Usage: " + the.program.name + " update [--repo=REPO]"
33
37
                print
55
59
                print "    " + the.program.name + " stage-revert"
56
60
                print
57
61
                print "Options:"
 
62
                print "      --quiet      do not report changes to the home directory"
58
63
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
59
64
                print "  -v, --verbose    display information about what is being done"
60
65
                print "      --help       display help and exit"
63
68
 
64
69
        def parse_command_line( self ):
65
70
                opts, args = getopt.gnu_getopt(
66
 
                        sys.argv[ 1: ], "r:v",
67
 
                        [ "repo=", "verbose", "help" ] )
 
71
                        sys.argv[ 1: ], "qr:v",
 
72
                        [ "quiet", "repo=", "verbose", "help" ] )
68
73
                for opt, optarg in opts:
69
 
                        if opt in [ '--repo', '-r' ]:
70
 
                                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 ):
71
78
                                        raise the.program.FatalError(
72
79
                                                'invalid repository name: ' + optarg )
73
80
                                the.repo = optarg
 
81
                        elif opt in [ '--verbose', '-v' ]:
 
82
                                the.verbose += 1
74
83
                        elif opt == "--help":
75
84
                                self.print_help()
76
85
 
99
108
                                ( the.repo.name, the.program.name ) )
100
109
 
101
110
                # copy-in changes to repo
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 ) ) )
 
111
                deployment.copy_in()
108
112
 
109
113
                # perform vcs update
110
114
                if the.verbose >= 1: print "updating %s" % the.repo.dir
128
132
                if message:
129
133
                        raise the.program.FatalError(
130
134
                                'there were conflicts...\n' + message )
 
135
 
131
136
                # copy-out changes from repo
132
 
                deployment.copy_out()
 
137
                deployment.copy_out( self.quiet )
133
138
 
134
139
                # now we've copied-out, revert any copied-in changes!
135
140
                if the.verbose >= 1: print "reverting %s" % the.repo.dir