mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-25 04:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Added a command line interface for difflib.py

Browse source
This commit is contained in:
Raymond Hettinger 2003-06-08 23:04:17 +00:00
parent c24d767809
commit a33d177589
2 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Tools/scripts/README
View file

@ -15,6 +15,7 @@ copytime.py Copy one file's atime and mtime to another
crlf.py Change CRLF line endings to LF (Windows to Unix) crlf.py Change CRLF line endings to LF (Windows to Unix)
cvsfiles.py Print a list of files that are under CVS cvsfiles.py Print a list of files that are under CVS
db2pickle.py Dump a database file to a pickle 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 dutree.py Format du(1) output as a tree sorted by size
eptags.py Create Emacs TAGS file for Python modules eptags.py Create Emacs TAGS file for Python modules
finddiv.py A grep-like tool that looks for division operators. finddiv.py A grep-like tool that looks for division operators.

41
Tools/scripts/diff.py Normal file
View file

@ -0,0 +1,41 @@
""" 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)