/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-06 14:09:14 UTC
  • Revision ID: tim@ed.am-20140406140914-lyd6n7proccrcr7v
minor tweaks to variable names and comments

Show diffs side-by-side

added added

removed removed

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 ):
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
                
79
77
        def run( self ):
80
78
 
81
79
                # set up repo and check it exists
82
 
                the.set_repo( self.repo )
83
80
                the.repo.check_dir_exists()
84
81
 
 
82
                message = ''
 
83
 
 
84
                # initialise deployment and check if it's ongoing
85
85
                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
86
                if deployment.is_ongoing():
100
 
                        files = deployment.get_conflicts()
 
87
                        print "deployment ongoing"
 
88
 
 
89
                        # check for conflicts in repo
 
90
                        files = the.repo.vcs.get_conflicts()
101
91
                        if files:
102
 
                                message += 'Deployment conflicts:\n  %s\n' % \
103
 
                                                   '\n  '.join( files )
 
92
                                message += 'conflicts in %s:\n  %s\n' % \
 
93
                                                   ( the.repo.name, '\n  '.join( files ) )
 
94
 
 
95
                        # get deployment conflicts
 
96
                        conflicts = deployment.get_conflicts()
 
97
                        if conflicts:
 
98
                                message += 'deployment conflicts:\n  %s\n' % \
 
99
                                                   '\n  '.join( conflicts )
 
100
 
 
101
                else:
 
102
 
 
103
                        # check status
 
104
                        walker = StatusWalker()
 
105
                        walker.walk()
 
106
                        if walker.modified:
 
107
                                message += 'modified:\n  %s\n' % \
 
108
                                                   '\n  '.join( walker.modified )
 
109
                        if walker.missing:
 
110
                                message += 'missing:\n  %s\n' % \
 
111
                                                   '\n  '.join( walker.missing )
 
112
                        if walker.changed:
 
113
                                message += 'kind changed:\n  %s\n' % \
 
114
                                                   '\n  '.join( walker.changed )
104
115
 
105
116
                # show status
106
117
                if message: print message.rstrip()