/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
20
20
 
21
21
 
22
22
import sys, re, getopt
23
 
from .command import Command
 
23
from command import Command
24
24
import stdhome.the as the
25
25
from stdhome.deployment import Deployment
26
26
from stdhome.walker.status import StatusWalker
30
30
 
31
31
 
32
32
        def print_help( self ):
33
 
                print("Usage: " + the.program.name + " status [--repo=REPO] [FILE]...")
34
 
                print()
 
33
                print "Usage: " + the.program.name + " status [--repo=REPO]"
 
34
                print
35
35
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
36
 
                print("Show the state of files in the local repository (including modifications and")
37
 
                print("conflicts).")
38
 
                print()
39
 
                print("This lists files in your home directory that have been modified and which differ")
40
 
                print("from those in the local repository.  During an update that resulted in conflicts")
41
 
                print("this also lists files which have conflicts in the local respository, or which")
42
 
                print("can not be deployed due to conflicts with your home directory.")
43
 
                print()
44
 
                print("For help with adding modified files to the repository, type:")
45
 
                print("    " + the.program.name + " add --help")
46
 
                print()
47
 
                print("Options:")
48
 
                print("  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')")
49
 
                print("  -v, --verbose    display information about what is being done")
50
 
                print("      --help       display help and exit")
 
36
                print "Show the state of files in the local repository (including modifications and"
 
37
                print "conflicts)."
 
38
                print
 
39
                print "This lists files in your home directory that have been modified and which differ"
 
40
                print "from those in the local repository.  During an update that resulted in conflicts"
 
41
                print "this also lists files which have conflicts in the local respository, or which"
 
42
                print "can not be deployed due to conflicts with your home directory."
 
43
                print
 
44
                print "For help with adding modified files to the repository, type:"
 
45
                print "    " + the.program.name + " add --help"
 
46
                print
 
47
                print "Options:"
 
48
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
 
49
                print "  -v, --verbose    display information about what is being done"
 
50
                print "      --help       display help and exit"
51
51
                exit( 0 )
52
52
 
53
53
 
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
87
85
                deployment = Deployment()
88
86
                if deployment.is_ongoing():
89
 
                        print("deployment ongoing")
 
87
                        print "deployment ongoing"
90
88
 
91
89
                        # check for conflicts in repo
92
90
                        files = the.repo.vcs.get_conflicts()
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' % \
116
114
                                                   '\n  '.join( walker.changed )
117
115
 
118
116
                # show status
119
 
                if message: print(message.rstrip())
 
117
                if message: print message.rstrip()