[Python-checkins] python/dist/src/Tools/scripts diff.py,NONE,1.1 README,1.12,1.13

[rhettinger@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv3732

Modified Files:
	README 
Added Files:
	diff.py 
Log Message:
Added a command line interface for difflib.py



--- NEW FILE: diff.py ---
""" Command line interface to difflib.py providing diffs in three formats:

* ndiff:    lists every line and highlights interline changes.
* context:  highlights clusters of changes in a before/after format
* unified:  highlights clusters of changes in an inline format.

"""

import sys, os, time, difflib, optparse

usage = "usage: %prog [options] fromfile tofile"
parser = optparse.OptionParser(usage)
parser.add_option("-c", action="store_true", default=False, help='Produce a context format diff (default)')
parser.add_option("-u", action="store_true", default=False, help='Produce a unified format diff')
parser.add_option("-n", action="store_true", default=False, help='Produce a ndiff format diff')
parser.add_option("-l", "--lines", type="int", default=3, help='Set number of context lines (default 3)')
(options, args) = parser.parse_args()

if len(args) == 0:
    parser.print_help()
    sys.exit(1)
if len(args) != 2:
    parser.error("need to specify both a fromfile and tofile")

n = options.lines
fromfile, tofile = args

fromdate = time.ctime(os.stat(fromfile).st_mtime)
todate = time.ctime(os.stat(tofile).st_mtime)
fromlines = open(fromfile).readlines()
tolines = open(tofile).readlines()

if options.u:
    diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
elif options.n:
    diff = difflib.ndiff(fromlines, tolines)
else:
    diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)

sys.stdout.writelines(diff)


Index: README
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/README,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** README	7 Jun 2003 18:46:34 -0000	1.12
--- README	8 Jun 2003 23:04:16 -0000	1.13
***************
*** 16,19 ****
--- 16,20 ----
  cvsfiles.py		Print a list of files that are under CVS
  db2pickle.py		Dump a database file to a pickle
+ diff.py			Print file diffs in context, unified, or ndiff formats
  dutree.py		Format du(1) output as a tree sorted by size
  eptags.py		Create Emacs TAGS file for Python modules