/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-18 14:45:39 UTC
  • Revision ID: tim@ed.am-20140418144539-uhprdfn5oyc8wc82
implemented ignore lists in copyer and made symlink substitution work only one
way (so that symlink substitutions can only occur in ~/ and not in the repo)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/diff.py
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
 
65
                        elif opt in [ '--verbose', '-v' ]:
 
66
                                the.verbose += 1
65
67
                        elif opt == "--help":
66
68
                                self.print_help()
67
 
 
 
69
                
68
70
                # discard first argument (the command)
69
71
                args.pop( 0 )
70
72
 
99
101
                # call colordiff
100
102
                for file in walker.modified:
101
103
                        print ( "\033[33m=== modified '%s'\n" % file ).rstrip()
102
 
                        sys.stdout.flush()
103
104
                        call( [ 'colordiff', '-ud',
104
105
                                        '--label', file,
105
106
                                        os.path.join( the.repo.full_dir, file ),