/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/diff.py

  • Committer: Tim Marston
  • Date: 2021-09-01 13:06:23 UTC
  • Revision ID: tim@ed.am-20210901130623-2yv2y02e3zwgd07y
fix newlines in resolve command

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/diff.py
21
21
 
22
22
import sys, re, getopt, os
23
23
from subprocess import call
24
 
from command import Command
 
24
from .command import Command
25
25
import stdhome.the as the
26
26
from stdhome.deployment import Deployment
27
27
from stdhome.walker.status import StatusWalker
30
30
class DiffCommand( Command ):
31
31
 
32
32
 
33
 
        def __init__( self ):
34
 
                self.repo = None
35
 
 
36
 
 
37
33
        def print_help( self ):
38
 
                print "Usage: " + the.program.name + " diff [--repo=REPO] [FILE]..."
39
 
                print
 
34
                print("Usage: " + the.program.name + " diff [--repo=REPO] [FILE]...")
 
35
                print()
40
36
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
41
 
                print "Show differences between the files in the local repository and those in the home"
42
 
                print "directory."
43
 
                print
44
 
                print "This runs the diff command, showing you differences made to files in the home"
45
 
                print "directory as compared to the files in the local repository.  The differences"
46
 
                print "between all files in the local repository are shown by default, or you can"
47
 
                print "specify files that you are interested in."
48
 
                print
49
 
                print "To see a list files that this command will show differences for, you can go:"
50
 
                print "    " + the.program.name + " status"
51
 
                print
52
 
                print "Options:"
53
 
                print "  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')"
54
 
                print "  -v, --verbose    display information about what is being done"
55
 
                print "      --help       display help and exit"
 
37
                print("Show differences between the files in the local repository and those in the home")
 
38
                print("directory.")
 
39
                print()
 
40
                print("This runs the diff command, showing you differences made to files in the home")
 
41
                print("directory as compared to the files in the local repository.  The differences")
 
42
                print("between all files in the local repository are shown by default, or you can")
 
43
                print("specify files that you are interested in.")
 
44
                print()
 
45
                print("To see a list files that this command will show differences for, you can go:")
 
46
                print("    " + the.program.name + " status")
 
47
                print()
 
48
                print("Options:")
 
49
                print("  -r, --repo=REPO  select the repo to check-out or create (defaults to 'home')")
 
50
                print("  -v, --verbose    display information about what is being done")
 
51
                print("      --help       display help and exit")
56
52
                exit( 0 )
57
53
 
58
54
 
62
58
                        [ "repo=", "verbose", "help" ] )
63
59
                for opt, optarg in opts:
64
60
                        if opt in [ '--repo', '-r' ]:
65
 
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
 
61
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
66
62
                                        raise the.program.FatalError(
67
63
                                                'invalid repository name: ' + optarg )
68
 
                                self.repo = optarg
 
64
                                the.repo = optarg
69
65
                        elif opt in [ '--verbose', '-v' ]:
70
66
                                the.verbose += 1
71
67
                        elif opt == "--help":
72
68
                                self.print_help()
73
 
                
 
69
 
74
70
                # discard first argument (the command)
75
71
                args.pop( 0 )
76
72
 
81
77
        def run( self ):
82
78
 
83
79
                # set up repo and check it exists
84
 
                the.set_repo( self.repo )
85
80
                the.repo.check_dir_exists()
86
81
 
87
82
                # determine files
101
96
                        message += "\033[33m=== missing file '%s'\n" % file
102
97
                for file in walker.changed:
103
98
                        message += "\033[33m=== kind changed '%s'\n" % file
104
 
                if message: print message.rstrip()
 
99
                if message: print(message.rstrip())
105
100
 
106
101
                # call colordiff
107
102
                for file in walker.modified:
108
 
                        print ( "\033[33m=== modified '%s'\n" % file ).rstrip()
 
103
                        print(( "\033[33m=== modified '%s'\n" % file ).rstrip())
 
104
                        sys.stdout.flush()
109
105
                        call( [ 'colordiff', '-ud',
110
106
                                        '--label', file,
111
107
                                        os.path.join( the.repo.full_dir, file ),