/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-04-05 22:29:08 UTC
  • Revision ID: tim@ed.am-20140405222908-3onggkfp5akpz21t
got symlink accept lists working; fixed some walker bugs

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
31
31
 
32
32
 
33
33
        def print_help( self ):
34
 
                print("Usage: " + the.program.name + " diff [--repo=REPO] [FILE]...")
35
 
                print()
 
34
                print "Usage: " + the.program.name + " diff [--repo=REPO] [FILE]..."
 
35
                print
36
36
                #      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")
 
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"
52
52
                exit( 0 )
53
53
 
54
54
 
58
58
                        [ "repo=", "verbose", "help" ] )
59
59
                for opt, optarg in opts:
60
60
                        if opt in [ '--repo', '-r' ]:
61
 
                                if not re.search( '^[-a-zA-z0-9.]+$', optarg ):
 
61
                                if not re.match( '^[-a-zA-z0-9.]+$', optarg ):
62
62
                                        raise the.program.FatalError(
63
63
                                                'invalid repository name: ' + optarg )
64
64
                                the.repo = optarg
66
66
                                the.verbose += 1
67
67
                        elif opt == "--help":
68
68
                                self.print_help()
69
 
 
 
69
                
70
70
                # discard first argument (the command)
71
71
                args.pop( 0 )
72
72
 
96
96
                        message += "\033[33m=== missing file '%s'\n" % file
97
97
                for file in walker.changed:
98
98
                        message += "\033[33m=== kind changed '%s'\n" % file
99
 
                if message: print(message.rstrip())
 
99
                if message: print message.rstrip()
100
100
 
101
101
                # call colordiff
102
102
                for file in walker.modified:
103
 
                        print(( "\033[33m=== modified '%s'\n" % file ).rstrip())
104
 
                        sys.stdout.flush()
 
103
                        print ( "\033[33m=== modified '%s'\n" % file ).rstrip()
105
104
                        call( [ 'colordiff', '-ud',
106
105
                                        '--label', file,
107
106
                                        os.path.join( the.repo.full_dir, file ),