/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: 2022-06-27 15:51:01 UTC
  • Revision ID: tim@ed.am-20220627155101-znatxg4q91gqs1sc
additional change for brz->bzr

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