/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: 2014-03-19 20:02:10 UTC
  • Revision ID: tim@ed.am-20140319200210-b6nm63rpktfmw0l3
changed working of output

Show diffs side-by-side

added added

removed removed

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
 
33
37
        def print_help( self ):
34
 
                print("Usage: " + the.program.name + " diff [--repo=REPO] [FILE]...")
35
 
                print()
 
38
                print "Usage: " + the.program.name + " diff [--repo=REPO] [FILE]..."
 
39
                print
36
40
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
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")
 
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"
52
56
                exit( 0 )
53
57
 
54
58
 
58
62
                        [ "repo=", "verbose", "help" ] )
59
63
                for opt, optarg in opts:
60
64
                        if opt in [ '--repo', '-r' ]:
61
 
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
 
65
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
62
66
                                        raise the.program.FatalError(
63
67
                                                'invalid repository name: ' + optarg )
64
 
                                the.repo = optarg
 
68
                                self.repo = optarg
65
69
                        elif opt in [ '--verbose', '-v' ]:
66
70
                                the.verbose += 1
67
71
                        elif opt == "--help":
68
72
                                self.print_help()
69
 
 
 
73
                
70
74
                # discard first argument (the command)
71
75
                args.pop( 0 )
72
76
 
77
81
        def run( self ):
78
82
 
79
83
                # set up repo and check it exists
 
84
                the.set_repo( self.repo )
80
85
                the.repo.check_dir_exists()
81
86
 
82
87
                # determine files
96
101
                        message += "\033[33m=== missing file '%s'\n" % file
97
102
                for file in walker.changed:
98
103
                        message += "\033[33m=== kind changed '%s'\n" % file
99
 
                if message: print(message.rstrip())
 
104
                if message: print message.rstrip()
100
105
 
101
106
                # call colordiff
102
107
                for file in walker.modified:
103
 
                        print(( "\033[33m=== modified '%s'\n" % file ).rstrip())
104
 
                        sys.stdout.flush()
 
108
                        print ( "\033[33m=== modified '%s'\n" % file ).rstrip()
105
109
                        call( [ 'colordiff', '-ud',
106
110
                                        '--label', file,
107
111
                                        os.path.join( the.repo.full_dir, file ),