File: //usr/local/ssl/local/ssl/lib/python2.4/Tools/scripts/ndiff.pyo
mò
=5Dc @ så d Z d Z d k Z d k Z d Z d Z d Z d Z d Z e d
j o e i
d Z d e j oa d k Z d k
Z
e i d d Z e i d
e e
i e Z e i i d i qá e e n d S( s ndiff [-q] file1 file2
or
ndiff (-r1 | -r2) < ndiff_output > file1_or_file2
Print a human-friendly file difference report to stdout. Both inter-
and intra-line differences are noted. In the second form, recreate file1
(-r1) or file2 (-r2) on stdout, from an ndiff report on stdin.
In the first form, if -q ("quiet") is not specified, the first two lines
of output are
-: file1
+: file2
Each remaining line begins with a two-letter code:
"- " line unique to file1
"+ " line unique to file2
" " line common to both files
"? " line not present in either input file
Lines beginning with "? " attempt to guide the eye to intraline
differences, and were not present in either input file. These lines can be
confusing if the source files contain tab characters.
The first file can be recovered by retaining only lines that begin with
" " or "- ", and deleting those 2-character prefixes; use ndiff with -r1.
The second file can be recovered similarly, but by retaining only " " and
"+ " lines; use ndiff with -r2; or, on Unix, the second file can be
recovered by piping the output through
sed -n '/^[+ ] /s/^..//p'
i i i Nc C s( t i i } | | d | t d S( Ns
i ( t syst stderrt writet outt msgt __doc__( R R ( ( t) /usr/lib/python2.4/Tools/scripts/ndiff.pyt fail5 s
c C sI y t | d SWn1 t j
o% } t d | d t | Sn Xd S( Nt Us couldn't open s : ( t opent fnamet IOErrort detailR t str( R
R ( ( R t fopen= s c C s t | } t | } | p | o d Sn | i } | i | i } | i x t i
| | D]
} | Gqo Wd S( Ni i ( R t f1namet f1t f2namet f2t readlinest at closet bt difflibt ndifft line( R R R R R R R ( ( R t fcompareD s c C sm d k } y | i | d \ }
} Wn( | i j
o } t t | Sn Xd } d } } xN |
D]F \ } } | d j o d } d } qg | d j o d } | } qg qg W| o | o t d Sn | oB | o t d Sn | d j o t
| d Sn t d
Sn t | d j o t d Sn | \ } } | o d
G| GHd G| GHn t | | S( Ns qr:i i s -qs -rs can't specify both -q and -rs no args allowed with -r optiont 1t 2s -r value must be 1 or 2i s need 2 filename argss -:s +:( R R ( t getoptt argst optst errorR R R
t noisyt qseent rseent optt valt whichfilet restoret lenR R R ( R R$ R% R R R R" R R# R& R R! ( ( R t mainT s>
c C s/ t i t i i | } t i i | d S( N( R R' R t stdinR t whicht restoredt stdoutt
writelines( R+ R, ( ( R R' w s t __main__s -profiles ndiff.pros
main(args)t time( i i i ( R t __version__R R R R R R) R' t __name__t argvR t profilet pstatst removet statft runt Statst statst
strip_dirst
sort_statst print_stats(
R4 R) R R: R R' R R R R7 R5 R R1 ( ( R t ?/ s" #