/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-04-05 19:20:06 UTC
  • Revision ID: tim@ed.am-20140405192006-fv0toip4b8m5pc88
fixed bug preventing skipping of subdirectories in walker; also added
walker.File.__str__()

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
 
 
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
82
75
                                the.verbose += 1
83
76
                        elif opt == "--help":
84
77
                                self.print_help()
85
 
 
 
78
                
86
79
                # discard first argument (the command)
87
80
                args.pop( 0 )
88
81
 
104
97
                if the.repo.vcs.has_changes():
105
98
                        raise the.program.FatalError(
106
99
                                'repo has local changes: %s\n'
107
 
                                'Hint: see "%s stage-revert --help"' %
 
100
                                'Hint: see "%s stage-revert --help"' % 
108
101
                                ( the.repo.name, the.program.name ) )
109
102
 
110
103
                # copy-in changes to repo
111
 
                deployment.copy_in()
 
104
                try:
 
105
                        deployment.copy_in()
 
106
                except deployment.CopyInConflicts as e:
 
107
                        raise the.program.FatalError(
 
108
                                'Files in %s differ too severly from %s:\n  %s\n' % \
 
109
                                ( the.home_dir, the.repo.dir, '\n  '.join( e.conflicts ) ) )
112
110
 
113
111
                # perform vcs update
114
 
                if the.verbose >= 1: print "updating %s" % the.repo.dir
 
112
                if the.verbose: print "updating %s" % the.repo.dir
115
113
                updated_files = the.repo.vcs.update()
116
114
 
117
115
                message = ''
132
130
                if message:
133
131
                        raise the.program.FatalError(
134
132
                                'there were conflicts...\n' + message )
135
 
 
136
133
                # copy-out changes from repo
137
 
                deployment.copy_out( self.quiet )
 
134
                deployment.copy_out()
138
135
 
139
136
                # now we've copied-out, revert any copied-in changes!
140
 
                if the.verbose >= 1: print "reverting %s" % the.repo.dir
 
137
                if the.verbose: print "reverting %s" % the.repo.dir
141
138
                the.repo.vcs.revert()