/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-03-08 00:47:23 UTC
  • Revision ID: tim@ed.am-20140308004723-hkl3s2hobsblf72o
added diff command; moved all command to commands subdir; made stage-revert
handle ongoing deployment automatically (now that initial revno is known); made
verbose level incremental; detect obstructing conflicts in ConflictWalker;
handle files deleted from repo during copy-out (update)

Show diffs side-by-side

added added

removed removed

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