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