File: //usr/lib/python2.7/dist-packages/mercurial/mdiff.pyc
ó
ÛXc @@ s( d d l m Z d d l Z d d l Z d d l Z d d l m Z d d l m Z m Z m
Z
m Z m Z d „ Z
d e f d „ ƒ YZ e ƒ Z e d „ Z d
„ Z d d d d „ Z e d „ Z e d
„ Z d „ Z d „ Z d „ Z d „ Z d „ Z d „ Z e j Z e j Z e j Z d S( i ( t absolute_importNi ( t _( t base85t bdifft errort mpatcht utilc C@ sb g | j d ƒ D] } | d ^ q } | r^ | d d k rI | j ƒ q^ | d d | d <n | S( s0 like str.splitlines, but only split on newlines.s
iÿÿÿÿ( t splitt pop( t textt lt lines( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt
splitnewlines s &
t diffoptsc B@ ss e Z d Z i d d 6e d 6e d 6e d 6e d 6e d 6e d 6e d 6e d
6e d 6e d 6Z d
„ Z d „ Z RS( s context is the number of context lines
text treats all files as text
showfunc enables diff -p output
git enables the git extended patch format
nodates removes dates from diff headers
nobinary ignores binary files
noprefix disables the 'a/' and 'b/' prefixes (ignored in plain mode)
ignorews ignores all whitespace changes in the diff
ignorewsamount ignores changes in the amount of whitespace
ignoreblanklines ignores changes whose lines are all blank
upgrade generates git diffs to avoid data loss
i t contextR t showfunct gitt nodatest nobinaryt noprefixt ignorewst ignorewsamountt ignoreblanklinest upgradec K@ sŸ xR | j j ƒ D]A } | j | ƒ } | d k rA | j | } n t | | | ƒ q Wy t | j ƒ | _ Wn- t k
rš t j t
d ƒ | j ƒ ‚ n Xd S( Ns3 diff context lines count must be an integer, not %r( t defaultst keyst gett Nonet setattrt intR t
ValueErrorR t AbortR ( t selft optst kt v( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt __init__= s
c @ s6 t ‡ f d † ˆ j Dƒ ƒ } | j | ƒ t | S( Nc 3@ s$ | ] } | t ˆ | ƒ f Vq d S( N( t getattr( t .0R" ( R ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pys <genexpr>K s ( t dictR t updateR
( R t kwargsR! ( ( R s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt copyJ s
( t __name__t
__module__t __doc__t FalseR R$ R* ( ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyR
! s
c C@ sp | j r t j | d ƒ } n | j r< t j | d ƒ } n | rl | j rl t j d d | ƒ j d ƒ } n | S( Ni i s
+s
( R R t fixwsR R t ret subt strip( R! R t blank( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt wscleanQ s !c
c@ sÎ g | D]! } t | | ƒ r" d p% d ^ q } g | D]! } t | | ƒ rP d pS d ^ q5 } d t | ƒ } } d t | ƒ } } xE| | k s | | k rÉ| | d }
} } |
| k sé | |
d k sé | | k sé | | d k rLd } x* |
| k r| |
d k r|
d 7}
qò Wxt | | k rH| | d k rH| d 7} q WnG xD |
| k r’| |
d k r’| | d k r’|
d 7}
| d 7} qOW| | | |
| | | | g | f V|
} | } q… Wd S( Ni i t =t ~( R4 t len(
t base1t lines1t base2t lines2R! R
t s1t e1t s2t e2t i1t i2t btype( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt
splitblockZ s& .. /
'c c@ s¾ | d k r t } n | j s' | j rN t | | t ƒ } t | | t ƒ } n t j | | ƒ } xWt | ƒ D]I\ } } | d k r– | | d } n d d d d g } | d | d | d | d g } | d | d k sò | d | d k r«d } | j r| d k r t
| ƒ } n | d k r7t
| ƒ } n t | d j | | d | d !ƒ ƒ }
t | d j | | d | d !ƒ ƒ } |
| k rd } qn | | f Vn | d f Vqm Wd S(
sb Return (block, type) tuples, where block is an mdiff.blocks
line entry. type is '=' for blocks matching exactly one another
(bdiff blocks), '!' for non-matching blocks and '~' for blocks
matching only after having filtered blank lines.
line1 and line2 are text1 and text2 split with splitnewlines() if
they are already available.
i i i i t !t R6 R5 N( R t defaultoptsR R R4 R. R t blockst enumerateR R t join( t text1t text2R! R9 R; t difft iR< t st typet oldt new( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt allblockst s0 "( '' c @ s d ‡ f d † } | r$ | r$ d Sˆ j r: d } } n d } d } t j d ƒ }
t j | ƒ } t j | ƒ } ˆ j rß t j | ƒ s› t j | ƒ rß | rÏ | rÏ t | ƒ t | ƒ k rÏ | | k rÏ d Sd | g } nÜ| s†t | ƒ } | d k rd | |
ƒ } n d | | | | | ƒ f } d | | | | | ƒ f }
d
t | ƒ } | |
| g g | D] } d | ^ ql} n5| s,t | ƒ } d | | | | | ƒ f } | d k rÓd | |
ƒ }
n d
| | | | | ƒ f }
d t | ƒ } | |
| g g | D] } d | ^ q} n t | ƒ } t | ƒ } t t
| | | | d ˆ ƒƒ } | sod S| j d d | | | | | ƒ f ƒ | j d d
| | | | | ƒ f ƒ xA t t | ƒ ƒ D]- } | | d d k rÎ| | c d 7<qÎqÎWd j
| ƒ S( Nc @ s6 ˆ j r ˆ j r d | S| r2 d | k r2 d Sd S( Ns %s
t s
s
( R R ( t datet fn( R! ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt datetagž s
RE s a/s b/i s Binary file %s has changed
s --- /dev/null%ss
--- %s%s%ss +++ %s%ss @@ -0,0 +1,%d @@
t +s +++ /dev/null%ss
+++ %s%s%ss @@ -1,%d +0,0 @@
t -R! i iÿÿÿÿs
s
\ No newline at end of file
( i i ( R R R t datestrt pconvertR t binaryR7 R t listt _unidifft insertt xrangeRI ( t at adt bt bdt fn1t fn2R! RV t aprefixt bprefixt epochR
t l1t l2t l3t et alt blt ln( ( R! s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt unidiff sR
(0 - - !&&c #@ sP ‡ f d † ‰ ‡ f d † } d d g ‰ ‡ ‡ ‡ ‡ f d † } d } d } xÖt | | ˆ ˆ | ƒ D]¼\ } }
| \ } } }
} |
d k r¼ |
d k rg | | |
| | 7} qg qg n g } ˆ | | !} | |
| !} |
| 8}
| | 8} | | ƒ } | |
ƒ } d } | rk| | d ˆ j d k rL| } | d } | d } qkx | | ƒ D] } | VqYWn | r’| | d <| | d <| d
} n | | | | | g } g ˆ | | !D] } d | ^ qµ| t | ƒ )g | D] } d | ^ qÜ| t | ƒ )g | D] } d
| ^ q| t | ƒ )qg W| rLx | | ƒ D] } | Vq:Wn d S( Nc @ s& | ˆ j } | | k r" | } n | S( N( R ( R
R7 t ret( R! ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt
contextendÝ s
c @ s! | ˆ j } | d k r d S| S( Ni ( R ( R
Rq ( R! ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt contextstartã s
i RE c
3@ sL | \ } } } } } ˆ | t ˆ ƒ ƒ } | | } | | | | } d } ˆ j rÍ ˆ \ }
} x\ t | d |
d d ƒ D]@ } ˆ | d j ƒ r| d ˆ | j ƒ d } | ˆ d <Pq| q| W| ˆ d <n | rà | d 7} n | ró | d 7} n d | | | | | f Vx | D] } | VqWx$ t | | ƒ D] } d ˆ | Vq1Wd S( NRE i iÿÿÿÿi RS i( s @@ -%d,%d +%d,%d @@%s
( R7 R R_ t isalnumt rstrip(
t hunkt astartt a2t bstartt b2t deltat aendt alent blent funct lastposRM t x( Rr Ri t lastfuncR! ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt yieldhunkê s.
!
RD R6 i i i RS RX RW ( R RR R R7 ( t t1t t2Ri Rj R! Rs Rƒ Rv t ignoredlinesRN t stypet a1Rx t b1Rz R{ RP RQ Rw Ry t prevR ( ( Rr Ri R‚ R! s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyR] Ü sL '%
.'+c C@ sÆ d „ } d d „ } | d k r* d } n | d k r? d } n | | k rO d Sg } | j d ƒ | j d t | ƒ ƒ x0 | t j | ƒ ƒ D] } | j | | ƒ ƒ q W| j d ƒ d j | ƒ S( s print base85-encoded binary diffc S@ sm t | ƒ } | d k r5 t t d ƒ | d ƒ } n t | d t d ƒ d ƒ } d | t j | t ƒ f S( Ni t Ai R` s %c%s
( R7 t chrt ordR t b85encodet True( t lineR
( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt fmtlineB s
i4 c s@ sC t | ƒ } d } x* | | k r> | | | | !V| | 7} q Wd S( Ni ( R7 ( R t csizeR
RM ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt chunkJ s
RE s GIT binary patch
s literal %s
s
N( R t appendR7 t zlibt compressRI ( t tot tnR‘ R“ Rq R
( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt b85diff@ s
c C@ s„ d } g } xh | t | ƒ k rv t j d | | | d !ƒ \ } } } | d 7} | j | | | | !ƒ | | 7} q Wd j | ƒ S( Ni s >llli RE ( R7 t structt unpackR” RI ( t bint post tt p1t p2R
( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt patchtextc s &
c C@ s5 t | ƒ d k r" t j | d ƒ St j | | g ƒ S( Ni i ( R7 R t bufferR t patches( R` Rœ ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt patchm s c C@ s@ g t j | | ƒ D]) } | d | d | d | d f ^ q S( Ni i i ( R RG ( R` Rb t d( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt get_matching_blockst s c C@ s | r t j d d d | ƒ Sd S( Ns >llli RE ( Rš t pack( t length( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt trivialdiffheaderw s c C@ s t j d d | | ƒ S( Ns >llli ( Rš R§ ( t oldlent newlen( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt replacediffheaderz s (! t
__future__R R0 Rš R• t i18nR RE R R R R R R t objectR
RF R R4 RC R RR Rp R] R™ R¡ R¤ R¦ R© R¬ R£ t patchedsizet textdiff( ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/mdiff.pyt <module> s, (
. ) ? d #