q&fEddlZddlZddlZddlmZddlmZmZmZm Z m Z m Z ddl m Z e jdZe jdZej"Zej$Zej&Zej(ZejZej,ZGdd ZeZdd Zd Zd Zd ZddZddZefdZefdZ dZ!dZ"dZ#dZ$dZ%dZ&y)N)_) diffhelperencodingerrorpolicypycompatutil)dateutilbdiffmpatchceZdZdZdZiddddddddd dd dd dd d ddddddddddddddddZdZdZdZe jeZ y)diffoptsacontext 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 TscontextstextFsshowfuncsgitsnodatessnobinarysnoprefixsindexrsignorewssignorewsamounts ignorewseolsignoreblanklinessupgradesshowsimilaritysworddiffsxdiffc tj|}|jjD]D}|j |}||j|}t |tj ||F t|j|_y#t$r?tjtdtj|jzwxYw)Ns3diff context lines count must be an integer, not %r)r byteskwargsdefaultskeysgetsetattrsysstrintcontext ValueErrorr InputErrorrbytestr)selfoptskvs 1/usr/lib/python3/dist-packages/mercurial/mdiff.py__init__zdiffopts.__init__Gs##D)##% 1A AyMM!$ D(//!,a 0  1  t||,DL ""HI""4<<01  s 8BACc |jDcic]"}|t|tj|$}}tj|}|j |t di|Scc}w)N)rgetattrr r strkwargsupdater)rkwargsrrs r!copyz diffopts.copyWs^>BmmL74!344LL!!$' F$Ms'A)cLdjfdjDS)Ns, c 3fK|](}d|ttj|fz*yw)s%s: %rN)r%r r).0rrs r! z%diffopts.__bytes__..^s3  GD(//!*<=> > s.1)joinr)rs`r! __bytes__zdiffopts.__bytes__]s%zz ]]   N) __name__ __module__ __qualname____doc___HAS_DYNAMIC_ATTRIBUTESrr"r)r/r strmethod__str__r$r0r!rr$s #A U   E  U  U ! U 5  U E 5 U %!H&   !h  +Gr0rc>|jrtj|d}n"|jrtj|d}|r2|jr&t j dd|jd}|jrt j dd|}|S)Nrrs + s [ \t\r\f]+\ns\n) ignorewsr fixwsignorewsamountignoreblanklinesresubstrip ignorewseol)rtextblanks r!wscleanrDis{ }}{{4#  {{4# &&vvfeT*007 vv&5 Kr0c#jK|Dcgc]}t||xrdxsd}}|Dcgc]}t||xrdxsd}}dt|}}dt|} }||ks|| kr||d} } } | |k\s|| dk(s | | k\s|| dk(rCd} | |kr|| dk(r| dz } | |kr || dk(r| | krQ|| dk(rI| dz } | | kr?|| dk(rn5| |kr0|| dk(r(|| dk(r | dz } | dz } | |kr|| dk(r || dk(r ||z|| z||z|| zg| f| }| }||kr|| kryycc}wcc}ww)Nrr=~)rDlen) base1lines1base2lines2rls1e1s2e2i1i2btypes r! splitblockrUus6< <wtQ%A** EE  ! r'R"W = >> hunkinrange((5, 10), (2, 7)) True >>> hunkinrange((5, 10), (6, 12)) True >>> hunkinrange((5, 10), (13, 17)) True >>> hunkinrange((5, 10), (3, 17)) True >>> hunkinrange((5, 10), (1, 3)) False >>> hunkinrange((5, 10), (18, 20)) False >>> hunkinrange((5, 10), (1, 5)) False >>> hunkinrange((5, 10), (15, 27)) False r$)hunk linerangestartlength lowerbound upperbounds r! hunkinranger]s0*ME6&J  & =5:+==r0c|\}}d\}}g}|D]}|\\}} } } } || k\r|| kr| dk(r|| z |z}|| z |z}n<| |cxkr| krnn| dk(r | | |z z }n|}| |cxkr| krnn| dk(r ||| z z}n| }t| | | z f|s{|j|||||krtjt d|||ffS)afilter `blocks` like (a1, a2, b1, b2) from items outside line range `rangeb` from ``(b1, b2)`` point of view. Return `filteredblocks, rangea` where: * `filteredblocks` is list of ``block = (a1, a2, b1, b2), stype`` items of `blocks` that are inside `rangeb` from ``(b1, b2)`` point of view; a block ``(b1, b2)`` being inside `rangeb` if ``rangeb[0] < b2 and b1 < rangeb[1]``; * `rangea` is the line range w.r.t. to ``(a1, a2)`` parts of `blocks`. )NNrFsline range exceeds file size)r]appendrrr) blocksrangeblbbubblbaubafilteredblocksblocka1a2b1b2stypes r! blocksinrangerms HCHCN)"'RR% "9u}(R-C(R-CS~2~D=S/CCC~2~D=b/CC R"W /  ! !% (')( {ckS3Yq!@ABB C: %%r0c~||jrttdstjStjS)N xdiffblocks)xdiffhasattrr r`rors r!chooseblocksfuncrss, |4::WUM-J||   r0c #\K|t}|js|js |jrt ||d}t ||d}t |||}t |D]\}}|dkDr ||dz }ngd}|d|d|d|dg}|d|dk7s |d|dk7r}d} |jri| t|}| t|}t |d j||d|d} t |d j||d|d} | | k(rd } || f|d fyw) abReturn (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. NFrr)rrrrr!r0rGrF) defaultoptsr:r<rArDrs enumerater= splitnewlinesr.) text1text2rrJrLdiffirNstypeoldnews r! allblocksrsZ | }}++t/?/?eU+eU+ ! D !% /D42 q5QU AA qT2a5!A$1 & Q41Q4<1Q41Q4<D$$>*51F>*51FdCHHVAaD1Q4-@$ABdCHHVAaD1Q4-@$AB#:DT'M$h3sD*D,cdfd }gdf} |s|s| Sjrdx} } nd} d} tjd} tj|}tj|}|r1|r |rt |t |k(r||k(r| Sg} dd|zgff}| |fS|s|j d  }t|}| d || z}nd | ||||fz}d | |z|||fz}||g} t |}d d d|f}d|zg|Dcgc]}d|z c}z}|r,|dxxd z cc<|jtj||ff}| |fS|s|j d  }t|}d | ||||fz}| d|| z}nd| ||||fz}||g} t |}d|d d f}d|zg|Dcgc]}d|z c}z}|r,|dxxd z cc<|jtj||ff}| |fSt||}t|s| Sd | ||||fzd| ||||fzg} | |fScc}wcc}w)a|Return a unified diff as a (headers, hunks) tuple. If the diff is not null, `headers` is a list with unified diff header lines "--- " and "+++ " and `hunks` is a generator yielding (hunkrange, hunklines) coming from _unidiff(). Otherwise, `headers` and `hunks` are empty. Set binary=True if either a or b should be taken as a binary file. NcNjsjsd|zS|rd|vryy)Ns %s  r0)gitnodates)datefnrs r!datetagzunidiff..datetag s)xx T> ! $"*r0r$r0sa/sb/)rrsBinary file %s has changed r9s--- /dev/null%ss --- %s%s%ss+++ %s%srrs@@ -0,0 +1,%d @@ +s+++ /dev/null%ss +++ %s%s%ss@@ -1,%d +0,0 @@ -rrN) noprefixr datestrr pconvertrHendswithryr_rMISSING_NEWLINE_MARKER_unidiffnext)aadbbdfn1fn2binaryrrsentinelaprefixbprefixepoch headerlineshunkswithout_newlinel1l2size hunkrangee hunkliness ` r!unidiffrs2vH Q }}'   V $E -- C -- C s1vQ'AFO 83>?@BV  Ujj// !  9#gen4B'3C0@!AAB GcM72s+;< <2h 1v1dO *T125J1dQh5JJ  bMU "M   Z>> ?Y')6  5jj// !  gsGB,<= = 9#gen4B'3C0@!AAB2h 1vaO *T125J1dQh5JJ  bMU "M   Z>> ?Y')  AD)E{O Wc72s+;< < Wc72s+;< <  ?6K 6Ks  H:5 H?c#Kttfdfd}ddgfd}d}d}d}tD]\}} |\} } } } | dk7r| d k(r|| | z | | z z z }'g}| | }| | }| |z} | |z} || }|| }d}|r>||d jzd zkr |}|d }|d }n|sd }d ||D]}||r| |d <| |d <|d }n|| || |g}|| Dcgc]}d|z c}|t|d|Dcgc]}d|z c}|t|d|Dcgc]}d|z c}|t|d |r|sd }d ||D]}|y|sdyycc}wcc}wcc}ww)aYield hunks of a headerless unified diff from t1 and t2 texts. Each hunk consists of a (hunkrange, hunklines) tuple where `hunkrange` is a tuple (s1, l1, s2, l2) representing the range information of the hunk to form the '@@ -s1,l1 +s2,l2 @@' header and `hunklines` is a list of lines of the hunk combining said header followed by line additions and deletions. The hunks are prefixed with a bool. c4|jz}||kDr|}|Srr)rMrHretrs r! contextendz_unidiff..contextendcs"$,, 9C r0c2|jz }|dkry|SNrr)rMrrs r! contextstartz_unidiff..contextstartis $,, 7 r0rr0c3NK|\}}}}}|t}||z }||z |z|z }d} jro\} } t|dz | dz dD]O} | ddjsd| j z} t j | r| dd} | d<n|d<|r|dz }|r|dz }||||f} d| | fzzg|zt||D cgc] } d| z c} z}d}jd s||ztdzk(rztt|dz ddD]^} || jd s|| jdrd }|| xxd z cc<|j| dztjn|sjd sx||ztdzk(rdtt|dz ddD]H} || jd s|| xxd z cc<|j| dztjn| |fycc} ww) Nr0rrrr)s@@ -%d,%d +%d,%d @@%s Fr9)rrTr) rHshowfuncrangeisalnumrstripr isasciistrr startswithinsertrr)rWastartribstartrkdeltaaendalenblenfunclastposr}rxrskiprrrlastfuncrt1t2s r! yieldhunkz_unidiff..yieldhunkqsl*.'VR"c"g&f}F{T!B& ==$MGT6A:w{B7 a51:%%'"Q%,,.0D **40#CRy"&HQK !HQK  aKF  aKFD&$. '9w+> ? @ %*2t_5tbe|5 6 {{5!ftms2w{&B3y>A-r26 Q<**<8 |..t4#aLE)L$$QUJ,M,MN  BKK.6D=CGaK3O3y>A-r26 Q<**40aLE)L$$QUJ,M,MN   ""-6s'A*H%.A+H%H (AH%B H%&?H%NFrvrGrrTrrr)ryrrrH)rrrrrrW ignoredlines has_hunksr~rlrhrirjrkrrrrrprevrrrrrs``` @@@@r!rrUs r B r B  3xH:#:#@ DLIb"dB3*65BB D=} bR"W 55 BiBi l lb!b! Q$,,.22aa $IJ"4AG DGDGGEBE2D13F2?Atax?c%jl145Atax5c%jl145Atax5c%jlU*6X IJ4 AG   @55s+C4F = E= F  F(F ; FAF c>d}dd}|d}|d}||k(ryg}|jd|jdt|z|tj|D]}|j|||jddj |S)z print base85-encoded binary diffct|}|dkr%tjtd|zdz }n'tj|dz tdzdz }d|t j |dfzS)NAras%c%s T)rHr bytechrordr b85encode)linerMs r!fmtlinezb85diff..fmtlinesl I 7  TQ!23A  R#d)!3a!78AAt~~dD9:::r0c3\Kt|}d}||kr||||z||z }||kryywr)rH)rBcsizerMr}s r!chunkzb85diff..chunks> I !eq1u9% % JA!es',,r0sGIT binary patch s literal %d r9)4)r_rHzlibcompressr.)totnrrrrMs r!b85diffrs; z  z  Rx CJJ$%JJR() 4==$ % 71:JJu 88C=r0cd}g}|t|krPtjd|||dz\}}}|dz }|j||||z||z }|t|krPdj |S)Nr>lll r0)rHstructunpackr_r.)binpostp1p2rMs r! patchtextrs~ C A C.MM'3sS2X+>? B r  S37#$ q C. 88A;r0cxt|dk(rtj|dStj ||gS)Nrr)rHr bufferr patches)rrs r!patchrs1 1v{{{3## >>!cU ##r0cxtj||Dcgc]}|d|d|d|dz fc}Scc}w)Nrrur)r r`)rrds r!get_matching_blocksr"s</4||Aq/A B!QqT1Q41! % BB Bs7c:|rtjddd|SdS)Nrrr0rpack)rZs r!trivialdiffheaderr&s176;;w1f -@S@r0c2tjdd||S)Nrrr)oldlennewlens r!replacediffheaderr*s ;;w66 22r0)Tr)NNN)'r>rri18nrrrrrr r utilsr importmodr r r`r;r patchedsizetextdiffryrrwrDrUr]rmrsrrrrrrrrrr$r0r!rs !   ( #   ..  ;;## ?,?,Dj  4>4%&P!'T2=Pf&Rj"J$CA3r0