/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: 2021-09-01 12:55:42 UTC
  • Revision ID: tim@ed.am-20210901125542-zbuzpswfo7mmm5br
fix broken use of self in @staticmethod

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