/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
29
29
class StatusCommand( Command ):
30
30
 
31
31
 
32
 
        def __init__( self ):
33
 
                self.repo = None
34
 
 
35
 
 
36
32
        def print_help( self ):
37
33
                print "Usage: " + the.program.name + " status [--repo=REPO]"
38
34
                print
42
38
                print
43
39
                print "This lists files in your home directory that have been modified and which differ"
44
40
                print "from those in the local repository.  During an update that resulted in conflicts"
45
 
                print "this also lists files which have conflicts in the local local respository, or"
46
 
                print "which can not be deployed due to conflicts with your home directory."
 
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."
47
43
                print
48
44
                print "For help with adding modified files to the repository, type:"
49
45
                print "    " + the.program.name + " add --help"
64
60
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
65
61
                                        raise the.program.FatalError(
66
62
                                                'invalid repository name: ' + optarg )
67
 
                                self.repo = optarg
 
63
                                the.repo = optarg
68
64
                        elif opt in [ '--verbose', '-v' ]:
69
65
                                the.verbose += 1
70
66
                        elif opt == "--help":
81
77
        def run( self ):
82
78
 
83
79
                # set up repo and check it exists
84
 
                the.set_repo( self.repo )
85
80
                the.repo.check_dir_exists()
86
81
 
87
82
                message = ''
89
84
                # initialise deployment and check if it's ongoing
90
85
                deployment = Deployment()
91
86
                if deployment.is_ongoing():
 
87
                        print "deployment ongoing"
92
88
 
93
89
                        # check for conflicts in repo
94
90
                        files = the.repo.vcs.get_conflicts()
95
91
                        if files:
96
 
                                message += 'Conflicts in %s:\n  %s\n' % \
 
92
                                message += 'conflicts in %s:\n  %s\n' % \
97
93
                                                   ( the.repo.name, '\n  '.join( files ) )
98
94
 
99
95
                        # get deployment conflicts
100
96
                        conflicts = deployment.get_conflicts()
101
97
                        if conflicts:
102
 
                                message += 'Deployment conflicts:\n  %s\n' % \
 
98
                                message += 'deployment conflicts:\n  %s\n' % \
103
99
                                                   '\n  '.join( conflicts )
104
100
 
105
101
                else:
108
104
                        walker = StatusWalker()
109
105
                        walker.walk()
110
106
                        if walker.modified:
111
 
                                message += 'Modified:\n  %s\n' % \
 
107
                                message += 'modified:\n  %s\n' % \
112
108
                                                   '\n  '.join( walker.modified )
113
109
                        if walker.missing:
114
 
                                message += 'Missing:\n  %s\n' % \
 
110
                                message += 'missing:\n  %s\n' % \
115
111
                                                   '\n  '.join( walker.missing )
116
112
                        if walker.changed:
117
 
                                message += 'Type changed:\n  %s\n' % \
 
113
                                message += 'kind changed:\n  %s\n' % \
118
114
                                                   '\n  '.join( walker.changed )
119
115
 
120
116
                # show status