Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
a33d1775
Commit
a33d1775
authored
Jun 08, 2003
by
Raymond Hettinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added a command line interface for difflib.py
parent
c24d7678
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
0 deletions
+42
-0
Tools/scripts/README
Tools/scripts/README
+1
-0
Tools/scripts/diff.py
Tools/scripts/diff.py
+41
-0
No files found.
Tools/scripts/README
View file @
a33d1775
...
...
@@ -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)
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
finddiv.py A grep-like tool that looks for division operators.
...
...
Tools/scripts/diff.py
0 → 100644
View file @
a33d1775
""" 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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment