/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-09-09 19:14:47 UTC
  • Revision ID: tim@ed.am-20140909191447-j3rapksxamefpm68
minor comment formatting tweak

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