/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-07-17 18:19:47 UTC
  • Revision ID: tim@ed.am-20140717181947-pe060idibfu0kfsk
fixed diff command out-of-order output issue

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 ):
36
 
                print "Usage: " + the.program.name + " status [--repo=REPO]"
 
33
                print "Usage: " + the.program.name + " status [--repo=REPO] [FILE]..."
37
34
                print
38
35
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
39
36
                print "Show the state of files in the local repository (including modifications and"
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
                
73
70
                args.pop( 0 )
74
71
 
75
72
                # remaining arguments
76
 
                if len( args ):
77
 
                        raise the.program.UsageError( 'too many arguments' )
 
73
                self.files = args
78
74
 
79
75
 
80
76
        def run( self ):
81
77
 
82
78
                # set up repo and check it exists
83
 
                the.set_repo( self.repo )
84
79
                the.repo.check_dir_exists()
85
80
 
 
81
                # determine files
 
82
                files = self.expand_files( self.files )
 
83
 
86
84
                message = ''
87
85
 
88
86
                # initialise deployment and check if it's ongoing
89
87
                deployment = Deployment()
90
88
                if deployment.is_ongoing():
 
89
                        print "deployment ongoing"
91
90
 
92
91
                        # check for conflicts in repo
93
92
                        files = the.repo.vcs.get_conflicts()
94
93
                        if files:
95
 
                                message += 'Conflicts in %s:\n  %s\n' % \
 
94
                                message += 'conflicts in %s:\n  %s\n' % \
96
95
                                                   ( the.repo.name, '\n  '.join( files ) )
97
96
 
98
97
                        # get deployment conflicts
99
98
                        conflicts = deployment.get_conflicts()
100
99
                        if conflicts:
101
 
                                message += 'Deployment conflicts:\n  %s\n' % \
 
100
                                message += 'deployment conflicts:\n  %s\n' % \
102
101
                                                   '\n  '.join( conflicts )
103
102
 
104
103
                else:
105
104
 
106
105
                        # check status
107
 
                        walker = StatusWalker()
 
106
                        walker = StatusWalker( files if files else None )
108
107
                        walker.walk()
109
108
                        if walker.modified:
110
 
                                message += 'Modified:\n  %s\n' % \
 
109
                                message += 'modified:\n  %s\n' % \
111
110
                                                   '\n  '.join( walker.modified )
112
111
                        if walker.missing:
113
 
                                message += 'Missing:\n  %s\n' % \
 
112
                                message += 'missing:\n  %s\n' % \
114
113
                                                   '\n  '.join( walker.missing )
115
114
                        if walker.changed:
116
 
                                message += 'Type changed:\n  %s\n' % \
 
115
                                message += 'kind changed:\n  %s\n' % \
117
116
                                                   '\n  '.join( walker.changed )
118
117
 
119
118
                # show status