/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/status.py

  • Committer: Tim Marston
  • Date: 2014-04-18 14:42:00 UTC
  • Revision ID: tim@ed.am-20140418144200-ksbr3l58p2v3jhy2
fixed bugs in command.expand_files, where results could be not unique, nor
sorted, and make sure the last component of the files is not resolved if it is a
symlink

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/status.py
30
30
 
31
31
 
32
32
        def print_help( self ):
33
 
                print "Usage: " + the.program.name + " status [--repo=REPO] [FILE]..."
 
33
                print "Usage: " + the.program.name + " status [--repo=REPO]"
34
34
                print
35
35
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
36
36
                print "Show the state of files in the local repository (including modifications and"
57
57
                        [ "repo=", "verbose", "help" ] )
58
58
                for opt, optarg in opts:
59
59
                        if opt in [ '--repo', '-r' ]:
60
 
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
 
60
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
61
61
                                        raise the.program.FatalError(
62
62
                                                'invalid repository name: ' + optarg )
63
63
                                the.repo = optarg
65
65
                                the.verbose += 1
66
66
                        elif opt == "--help":
67
67
                                self.print_help()
68
 
 
 
68
                
69
69
                # discard first argument (the command)
70
70
                args.pop( 0 )
71
71
 
72
72
                # remaining arguments
73
 
                self.files = args
 
73
                if len( args ):
 
74
                        raise the.program.UsageError( 'too many arguments' )
74
75
 
75
76
 
76
77
        def run( self ):
78
79
                # set up repo and check it exists
79
80
                the.repo.check_dir_exists()
80
81
 
81
 
                # determine files
82
 
                files = self.expand_files( self.files )
83
 
 
84
82
                message = ''
85
83
 
86
84
                # initialise deployment and check if it's ongoing
103
101
                else:
104
102
 
105
103
                        # check status
106
 
                        walker = StatusWalker( files if files else None )
 
104
                        walker = StatusWalker()
107
105
                        walker.walk()
108
106
                        if walker.modified:
109
107
                                message += 'modified:\n  %s\n' % \