q&f}ddlZddlZddlZddlZddlZddlZddlZddlmZddl m Z m Z m Z ddl mZddlmZmZmZmZmZmZmZmZm Z mZmZmZmZddlmZmZm Z m!Z!ejDZ"ejFdZ$ejFd Z%ejFd Z&ejNZ'ejPZ(ejRZ)d Z*gd Z+ejXd Z-dZ.GddZ/dZ0GddZ1GddZ2Gdde2Z3Gdde3Z4GddZ5Gdde2Z6ejFdZ7ejFdZ8gd Z9Gd!d"Z:Gd#d$Z;Gd%d&ZGd)d*Z?Gd+d,Z@d-ZAd.ZBdSd/ZCd0ZDd1ZEd2ZFd3ZGd4ZHd5ZIdTd6ZJd7ZK dTd8ZLd9ZM dUd:ZN dVd;ZO dUd<ZP dWd=ZQdXd>ZRGd?d@eSZTejZVejZUejZW dYdAZX dZdBZYdCZZdDZ[dEZ\dFZ]dGZ^dHZ_dIdJdKdLZ`dMZadNZbdOZcdPZdd[dQZedRZfy)\N_)hexsha1nodeconstantsshort)open) copies diffhelperdiffutilencodingerrormailmdiffpathutilpycompatscmutilsimilarutilvfs)dateutilhashutilprocutil stringutilsdiff --git a/(.*) b/(.*)s (\t+|[^\t]+)s9(\t+| +|[a-zA-Z0-9_\x80-\xff]+|[^ \ta-zA-Z0-9_\x80-\xff])c d d fd} fd} fd} fd} fd}Gdd }d }g}d g} t|d s||}|D]} |j| | jd r |||cS| jdr |||cS | |r3d}| jdddj | vs}|||cS| jds|s|||cS||S)z6return an iterator of individual patches from a streamc|r|jdry|jdry|jdd}t|dk(xrd|d vS) N)  T)r-+F: rrr) startswithsplitlen)lineinheaderls 1/usr/lib/python3/dist-packages/mercurial/patch.pyisheaderzsplit..isheaderAsO  6 ??- . JJua 1v{/t1Q4//c6tdj|SNr+)stringiojoin)liness r)chunkzsplit..chunkKs((r+c3Kd}|D]F}|jsd}|s|jdr|g}d}|j|H|r |yyw)NTF# HG changeset patch)stripr#append)streamcurr'r&r1s r)hgsplitzsplit..hgsplitNsl D::< 0G HCj  JJt   *  sAAc3K|D]C}|jdrt|ddD]}|g}|j|E|rt|ddD]}|yyw)NFrom r)r#r$r5)r6r7r&cr1s r) mboxsplitzsplit..mboxsplit^s Dx(uSW~.AG JJt    5QR>*   sA*A-c3 Kd}|D]}|j| |}tj|}|js ||yd}|j D]!}|j }||vr||#yw)Nct}tj|d}|j||j d|S)NF) mangle_from_r)r.r Generatorflattenseek)mfpgs r)msgfpz'split..mimesplit..msgfpls4Br6A IIaL GGAJIr+ text/plains text/x-diffs text/x-patch)r5rparse is_multipartwalkget_content_type) r6r7rFr&r;rCok_typespartctr1s r) mimesplitzsplit..mimesplitks  D JJt   #J JJqM~~(NGH "**,X%Dk!  "sB Bc3Kd}|D]9}|s||r|g}d}|r ||sd}|j|;|r |yywNFTr5)r6r7r'r&r1r*s r) headersplitzsplit..headersplitsl Dx 8Cj x 8  JJt   *  sAAc3"K|ywN)r7r1s r) remainderzsplit..remaindersCjs c"eZdZdZdZdZeZy)split..fiterc||_yrV)rDselfrDs r)__init__zsplit..fiter.__init__s DGr+c|SrVrWr]s r)__iter__zsplit..fiter.__iter__sKr+cJ|jj}|st|SrV)rDreadline StopIterationr]r(s r)nextzsplit..fiter.nexts"  "A##Hr+N)__name__ __module__ __qualname__r^rarf__next__rWr+r)fiterrZs    r+rkFs content-typerfr3r:T:rr--- )hasattrr5r#r$lower) r6r8r<rPrTrXrkr'r7 mimeheadersr&r1r*s @@r)r$r$>s 0) "2   H C"#K 66 "v , 4 ??2 363' ' __X &VS) ) dH %Hzz$"1%++-< -- __W %(vs+ + ," S>r+))sDatesdate)sBranchsbranch)sNode IDnodeidc#*Ktjd\}}tj|d} t |||||j tj |y#|j tj |wxYww)aextract patch from data read from fileobj. patch can be a normal patch or contained in an email message. return a dictionary. Standard keys are: - filename, - message, - user, - date, - branch, - node, - p1, - p2. Any item can be missing from the dictionary. If filename is missing, fileobj did not contain a patch. Caller must unlink filename when done. hg-patch-prefixwbN)rmkstemposfdopen_extractcloseunlink)uifileobjfdtmpnametmpfps r)extractrso$"",7KB IIb$ Er7GU33  '   's0BA)&B)'BBc tjdtjtjz}i}t j |}|dxrt j |d}|dxrt j |d|d<|s.|ds)djd|jDdz}g}|d} | r.t j | x|d<} |jd | z|rh|jd r,|jd } | d k\r|| d zdj}tjdd|}|jd|z|dr|jd|dzd } d} d} |jD]p}tj |j#}|jd|z|| vr@|j%d}|j'|}|rd}d}d}|jd|j)d z| d z } t+}|d|j)d j-D]K}|jdr;|s9|jdd}d}|j/d |j1d}n|r|jdr |dd|d<|jd|dzn|jdr#|j3|ddjnk|jdrPt4D]F\}}d |z}|j|s|t7|d||<|jd!|||fzHn d}n|d"k(rd}|r&|r*|j9||j9dN|j;} |s#|j9||j=drG|j9dZ| r^| sb|d#k(si| d|zz } s|r| j|sd$|| fz} | |d%<|j?|r*|jAd |d&<|r|jAd |d'<| r||d(<|S))Ns}^(?:Index:[ \t]|diff[ \t]-|RCS file: |retrieving revision [0-9]+(\.[0-9]+)*$|---[ \t].*?^\+\+\+[ \t]|\*\*\*[ \t].*?^---[ \t])SubjectFromsuser c3nK|]-}djttj|/yw)r!N)r/mapr strtolocal.0hs r) z_extract..s+<= 3x22A67s35zX-Mercurial-Noderqs Node ID: %s s[PATCH]rrs\n[ \t]+rs Subject: %s s From: %s rGr+sContent-Type: %s T)decodeFsfound patch at byte %d r3spatch generated by hg export s# User s # Parent # s# %s s%s: %s ---rHs%s %ssmessagesp1sp2sfilename)!recompile MULTILINEDOTALLrrI headdecoder/itemsdebugr#findlstripsubrKrbytestrrL get_payloadsearchstartr. splitlinesrBtruncater5patchheadermapr%writegetvalueendswithr{pop)r}r~rrdiffredatamsgsubjectparentsnodeidpend diffs_seenrMmessagerN content_typepayloadrChgpatch hgpatchheader ignoretextcfpr&headerkeyrus r)rzrzs7ZZ % ryy F D **W C)n@Y!@GK@DOOCK$@DM 4= JJAD   G # $F #'??6#::Y& !F*+   i (<<%Dqy!$(*-446&&tW5 !G+, G} g./J?HG 1'''(=(=(?@  &56 x ' ""$"/ MM' " G!MJ HH01771:= > !OJ*C !''!*-88: %??#:;GHH>?"G$(MHHQKLLN"G"z2(,QRW g!>?6tABx'89/+9LKFC%-%6F#v6,0V,?S "S 7J)J K L ). V^!%J$ZIIdOIIe$7 %8llnG G$''.KK&LM,I uw &Gc1'fw))'2w00D KKMkk!nU !++a.DK#[ Kr+c:eZdZdZdZdZdZdZdZdZ dZ y ) patchmetaaPatched file metadata 'op' is the performed operation within ADD, DELETE, RENAME, MODIFY or COPY. 'path' is patched file path. 'oldpath' is set to the origin file when 'op' is either COPY or RENAME, None otherwise. If file mode is changed, 'mode' is a tuple (islink, isexec) where 'islink' is True if the file is a symlink and 'isexec' is True if the file is executable. Otherwise, 'mode' is None. cJ||_d|_d|_d|_d|_y)NsMODIFYF)patholdpathmodeopbinary)r]rs r)r^zpatchmeta.__init__cs%    r+c*|dz}|dz}||f|_y)Ni @)r)r]rislinkisexecs r)setmodezpatchmeta.setmodejs V$ r+ct|j}|j|_|j|_|j|_|j |_|SrV)rrrrrr)r]others r)copyzpatchmeta.copyosA$))$  YY 77{{  r+cj|dk(r|jdk(S|d|jxs |jzk(S)N /dev/nullADDa/)rrr)r]afiles r) _ispatchingazpatchmeta._ispatchingaws6 L 77f$ $!:;;;r+cN|dk(r|jdk(S|d|jzk(S)NrDELETEb/rr)r]bfiles r) _ispatchingbzpatchmeta._ispatchingb|s- L 77i' ' )))r+cJ|j|xr|j|SrV)rr)r]rrs r) ispatchingzpatchmeta.ispatchings#  'DD,=,=e,DDr+c<d|jd|jdS)Nz rr`s r)__repr__zpatchmeta.__repr__s&*ggtyy99r+N) rgrhri__doc__r^rrrrrrrWr+r)rrXs+% < * E:r+rcd}g}|D]}|jd}|jdrHtj|}|s>|r|j ||j d}t |}n|sq|jdr|j |d}|jdrd|_|dd|_|jd r |d d|_ |jd rd |_|d d|_|jd r |dd|_ |jdr d|_/|jdr'd|_|jt|dddg|jdr |jt|ddd|jdsd|_ |r|j ||S)z9extract git-style metadata about patches from N diff --git a/r"rms rename from RENAME s rename to s copy from COPYscopy to s deleted filersnew file mode ris new mode GIT binary patchT) rstripr#gitrematchr5grouprrrrrintr)lrgp gitpatchesr&rCdsts r) readgitpatchrs BJ !{{7# ??+ , D!A%%b)ggajs^ w'!!"%/!!"#Y /rs)/!"#Y -qr(1!!23 3tBCy!,-. 3tBCy!,-!45  A !B " r+c$eZdZdZdZdZdZy) linereaderc ||_g|_yrV)rDbufr\s r)r^zlinereader.__init__sr+c@||jj|yyrV)rr5r]r&s r)pushzlinereader.pushs   HHOOD ! r+c|jr|jd}|jd=|S|jjSNr)rrDrcres r)rczlinereader.readlines9 88 A Hww!!r+c.t|jdSr-)iterrcr`s r)razlinereader.__iter__sDMM3''r+N)rgrhrir^rrcrarWr+r)rrs""(r+rc6eZdZdZdZdZdZdZdZdZ y) abstractbackendc||_yrV)r})r]r}s r)r^zabstractbackend.__init__s r+ct)zReturn target file data and flags as a (data, (islink, isexec)) tuple. Data is None if file is missing/deleted. NotImplementedErrorr]fnames r)getfilezabstractbackend.getfiles "!r+ct)a Write data to target file fname and set its mode. mode is a (islink, isexec) tuple. If data is None, the file content should be left unchanged. If the file is modified after being copied, copysource is set to the original file name. rr]rrr copysources r)setfilezabstractbackend.setfiles "!r+ct)zUnlink target file.rrs r)r|zabstractbackend.unlinks!!r+cy)zWrite rejected lines for fname. total is the number of hunks which failed to apply and total the total number of hunks for this files. NrW)r]rfailedtotalr0s r)writerejzabstractbackend.writerejsr+ctrVrrs r)existszabstractbackend.exists!!r+ctrVrr`s r)r{zabstractbackend.closerr+N) rgrhrir^rrr|r rr{rWr+r)rrs%" "" ""r+rc<eZdZfdZdZdZdZdZdZxZ S) fsbackendc`tt| |tj||_yrV)superrr^vfsmodropener)r]r}basedir __class__s r)r^zfsbackend.__init__s" i'+jj) r+cJ|jj|r|jj|dfSd} |jj|jdzdk7} |jj |d|ffS#t $rY+wxYw#t $rYywxYw)NTFFrrNN)rrreadlinklstatst_modeFileNotFoundErrorread)r]rrs r)rzfsbackend.getfiles ;;  e $KK((/? ? [[&&u-55=BF KK$$U+eV_= =!   !  s#+B(B BB B"!B"c|\}}||jj|||y|r|jj||y|jj|||r|jj|ddyyrR)rsetflagssymlinkr)r]rrrrrrs r)rzfsbackend.setfilesr < KK  7   KK  e , KK  eT * $$UE48r+cx|jjdd}|jj|d|y)Ns experimentalsremoveemptydirsT) ignoremissingrmdir)r} configboolr unlinkpath)r]rr&s r)r|zfsbackend.unlink s2""?4FG uDFr+c|dz}|jjtd|||fz|j|d}|j ||j y)Ns.rejs7%d out of %d hunks FAILED -- saving rejects to file %s w)r}warnrr writelinesr{)r]rr r r0rDs r)r zfsbackend.writerejsZ  I Jue$ % [[ % e  r+c8|jj|SrV)rlexistsrs r)rzfsbackend.existss{{""5))r+) rgrhrir^rrr|r r __classcell__rs@r)rrs"*  9G*r+rc>eZdZfdZdZfdZfdZdZxZS)workingbackendctt| ||j||_||_t |_t |_g|_ yrV) rr2r^rootrepo similaritysetremovedchangedcopied)r]r}r5r6rs r)r^zworkingbackend.__init__s? nd,R; $u u  r+c|jjj|js)|j |rt t d|zyyNs$cannot patch %s: file is not tracked)r5dirstate get_entry any_trackedrPatchApplicationErrorrrs r) _checkknownzworkingbackend._checkknown'sUyy!!++E2>>4;; D (9:UB D >r+c|j|tt|||||||jj ||f|j j|yrV)rArr2rr:r5r9add)r]rrrrrs r)rzworkingbackend.setfile/sU  nd+E4zJ  ! KK   E2 3 r+c|j|tt|||jj ||j j |yrV)rArr2r|r8rCr9)r]rrs r)r|zworkingbackend.unlink6sD  nd*51  r+c |jjj|j5|jd}t|j}|j D]2\}}t j|j|j|||4|jr_|jt|j|jD],}||jjvs|j|.|r+t j|j||jt|jcdddS#1swYyxYwrV)r5r=changing_filesr7r9r:r dirstatecopyr}r8forgetsorteddiscard marktouchedr6)r]wctxr9srcrfs r)r{zworkingbackend.close<s YY   . .tyy 9 (99T?D$,,'G KK IS$$TWWdiisCH I|| F4<<01+A 2 22  * +##DIIwH$,,'! ( ( (sB=E .AE  E) rgrhrir^rArr|r{r/r0s@r)r2r2s  (r+r2c(eZdZddZddZdZdZy) filestoreNc~d|_i|_d|_||_|jd|_d|_i|_y)Nri@)rfilescreatedmaxsizesizer)r]rTs r)r^zfilestore.__init__Qs=    << (DL  r+c|jdks%t||jz|jkr1|||f|j|<|xjt|z c_y|j0t j d}tj||_d|jz}|jj|||xjdz c_ |||f|j|<y)Nrrsrt%dr) rTr%rUrrrmkdtemprrrSrrR)r]rrrr:r4fns r)rzfilestore.setfile[s <|r<|dk7r7g}|D].}|r|jdr|dd|z}|j|0|}|jj |dj |||jy)Nrrrprrror+)rwrxrr5ryrr/r)r]rr0rrxrawlinesr(s r)r,zpatchfile.writeliness <<7 "((C \\W $CC <<9 $H #E*#2 A" #E UCHHUOT4??Kr+c|jry|s|jjrd|_td|jz}|r|jj |y|jj |y)NTspatching file %s )rr}verboserrr+note)r]r+ss r)rzpatchfile.printfilesX     477??#D  # $tzz 1  GGLLO GGLLOr+c|jj|g}t|dkDr|jfd|S)Nrc t|z SrV)abs)xlinenums r)z%patchfile.findlines.. sCG $4r+)r)r~getr%sort)r]r(rcands ` r) findlineszpatchfile.findliness8 yy}}Q# t9q= II4I 5 r+c|jsytjj|j}d||fzg}|jD]O}|j D]>}|j ||dddk7s|j dtjz@Q|jj|jt|j|j|y)Ns--- %s +++ %s rr) rrxrbasenamerhunkr5r MISSING_NEWLINE_MARKERryr r%r)r]r^r0rr(s r) write_rejzpatchfile.write_rejs xx ww +$d|34 LAVV L QRS6U?LL)J)J!JK L L djj#dhh-UKr+c  |jskttd|j|jt |j |jt |j|jfz|xjdz c_ |jr|jj|y|jr|jr|j r2|j"j%td|j&zn1|j"j%td|j&z|jj|yt)|t*r|j,r&|j.j1|j&y|j3|j4}||j4dd|xj6t |z c_d|_y|}|j:dvs|j:d k(r|j<r|j?}|jAdd \}}}}||j6z }|}|jBdk(rtEjF||j4|r|j,r&|j.j1|j&y||j4||t |z|xj6t |t |z z c_d|_yi|_$tK|j4D]0\} } |jHjM| gj| 2tO|j"jQd d dzD]} d D]} |jA| | \}}}}||j6z|jBz}tS|t |j4}|r|jU|ddd|} n|g} | D]}|r"tEjF||j4|s(||j4||t |z|xj6t |t |z z c_||z |_!d|_||z | z }| rLtd}|jWd|j"j%||j|dz| |fzn9td}|j"jY||j|dz|fz| cccS|jWd|j"j%td|j|fz|jj|y)Nsbad hunk #%d %s (%d %d %d %d)rrs-cannot create %s: destination already exists sfile %s already exists Tr)rprqrrFpatchsfuzzrs9Hunk #%d succeeded at %d with fuzz %d (offset %d lines). s,Hunk #%d succeeded at %d (offset %d lines). sHunk #%d FAILED at %d )-completePatchParseErrorrnumberdescr%alenablenbrrzrr5rr{rr}r+r isinstancebinhunkr|ryr|newr0rrrwrx getnormalizedfuzzitrr testhunkr~ enumerate setdefaultrange configintminrrr)r]rr(horigoldoldstartrnewstart orig_startrrfuzzlentoponlyrrrs r)applyzpatchfile.applysjzz|!2388QVVSXqvvs133xHI  a << HHOOA  ;;4;; GHjj!  Q:;djjHI HHOOA  a !{{ ##DJJ/  EE$**% ! 1  s1v% !  LL, ,||w& !A()xx5'9$XsHDKK  99>j11#tzz8L{{ ##DJJ/ >A 8hS&9: s3x#c(22 !  djj) 2DAq II B ' . .q 1 2TWW..xAAEF# 'G(" '/0xx/I,XsH#dkk1DII=xTZZ9>>#a&*h?D%:D'A*"5"5c4::q"I7: 1q3s8|4 s3x#c(':: $% N %) !"Z'!9""#!8#C !NN40 GGLL #qxxQ&H H#$!8#C!GGLL!a%/H)HI&/'" '# 'H t  Q12ahh 5KKL r+c|jr1|j|j|j|j|j t |jSrV)rr,rr0rrr%rr`s r)r{zpatchfile.closes= :: OODJJ DII > 488}r+N)ro) rgrhrir^r,rrrrr{rWr+r)rtrts*:xL$  L iVr+rtc$eZdZdZej dZej dZej dZej dZ ej dZ ej dZ dZ d Z d Zd Zd Zd ZdZdZdZdZy)rz patch headersdiff --git a/(.*) b/(.*)$sdiff -r .* (.*)$s(?:index|deleted file) s(?:new file|deleted file) s'(?:index|deleted|copy|rename|new mode) s(?:new file|copy to|rename to)c ||_g|_yrV)rr)r]rs r)r^zheader.__init__s  r+c:td|jDS)Nc3>K|]}|jdyw)index Nr#rs r)rz header.binary..s@q1<< *@sanyrr`s r)rz header.binarys@DKK@@@r+ch|jD]}|jdr|jtdy|jj |r=|j||j r|jtdy|jdrs|jtdt|jt|jDcgc]"}t|j|j$c}fzy|j| ycc}w)Nrs-this modifies a binary file (all or nothing) sthis is a binary file rs%d hunks, %d lines changed ) rr#rr pretty_rerrr%rsummaxaddedr8)r]rDrs r)prettyz header.prettys A||I&LMN~~##A& ;;=HHQ9:;||F#56DJJdjjIS!))4IJ HHQK% Js#'D/cX|jdj|jyr-)rr/rr\s r)rz header.writes $++&'r+c@tfdjDS)Nc3TK|]}jj|!ywrV) allhunks_rerrrr]s r)rz"header.allhunks..s"B4##))!,B%(rr`s`r)allhunkszheader.allhunkssBdkkBBBr+c|jj|jd}|r|j\}}||k(r|gS||gS|jj|jdjSr) diffgit_rerrgroupsdiff_re)r]rfromfiletofiles r)rRz header.filessr%%dkk!n5 $||~ Hf6! z!f% %<<%%dkk!n5<<> >r+c(|jdS)Nr)rRr`s r)filenamezheader.filenameszz|Br+cddjtjtj|j zS)Nz
r)r/rrapplyfsdecoderRr`s r)rzheader.__repr__s2 HHX__X%6%6 E F  r+c@tfdjDS)Nc3TK|]}jj|!ywrV) newfile_rerrs r)rz#header.isnewfile..s A4??((+Arrr`s`r) isnewfilezheader.isnewfilesAT[[AAAr+ctjdk(}jxr|}|xstfdjDS)Nr"c3TK|]}jj|!ywrV) special_rerrs r)rz!header.special..s%# )*DOO ! !! $# r)r%rrr)r] nocontent emptynewfiles` r)specialzheader.specialsN $) ~~'5I  s# .2kk#   r+N)rgrhrirrrrrrrrrr^rrrrrRrrrrrWr+r)rrs89Jbjj,-G"**78K 89IFGJ=>JA*(C?  B  r+rcfeZdZdZ d dZdZdZdZdZdZ e Z d Z e jd Zy) recordhunkzKpatch hunk XXX shouldn't we merge this with the other hunk class? Nc dfd } ||_| |d\} |_|| z|_|| z|_| |d\} |_||_||_|j|j \|_|_ y)NFcV#t|z }|dkDr|r|||dfS||dfSd|fSr)r%)r0reversedelta maxcontexts r) trimcontextz(recordhunk.__init__..trimcontextsM%E Z/19$eEFm33$eKZ&888e8Or+T)F) rbeforefromlinetolineafterprocr countchangesrr8) r]rrrrrrrrr trimedbefore _trimedafters ` r)r^zrecordhunk.__init__sz  $/$=! dk </ |+ #.ue#< dj  #'#4#4TYY#?  DLr+c0t|tsy|j|jk(xrk|j|jk(xrP|j|jk(xr5|j j |j j k(S)NF)rrrrrrrR)r]vs r)__eq__zrecordhunk.__eq__sw!Z(VVtyy  :499$ :!**, :""$(88  r+ctt|jt|jj |j |j fSrV)r~tuplerrrRrrr`s r)__hash__zrecordhunk.__hash__sCdii dkk'')*     r+ct|Dcgc]}|jds|c}}t|Dcgc]}|jds|c}}||fScc}wcc}w)zhunk -> (n+,n-)r r)r%r#)r]rrrCrems r)rzrecordhunk.countchangessSd9all4&819:d9all4&819:Cx:9sAAA  A c dddd}|jDcgc]}d||dd|ddfz}}t|j|j|j|j |j ||jScc}w) zreturn another recordhunk which is the reverse of the hunk If this hunk is diff(A, B), the returned hunk is diff(B, A). To do that, swap fromline/toline and +/- signs while keep other things unchanged. rr \)r rrs%s%srrN)rrrrrrrr)r]rCr(rs r) reversehunkzrecordhunk.reversehunkstE 26:ii@1QqV9ae,,@@ KK KK MM II KK  JJ  AsA;c t|jt|jz}|jr%|jdtjk(r|dz}||j z}||j z}|jd|j||j||jxrd|jzfz|jdj|j|jz|jzy)Nrrs@@ -%d,%d +%d,%d @@%s rr+) r%rrr rr8rrrrrr/r)r]rDrfromlentolens r)rzrecordhunk.write2sDKK 3tzz?2 ::$**R.J,M,MM QJE$,,& "  &   0tdii/    $++ 1DJJ>?@r+c6|jjSrV)rrr`s r)rzrecordhunk.filenameFs{{##%%r+c@d|j|jfzS)Ns )rrr`s r)rzrecordhunk.__repr__Is$--/4==!AAAr+rV)rgrhrirr^rrrrrrrr strmethodrrWr+r)rrsT@<     &A$F&BBr+rctdtdtdtddtdtdtdtd dtd td td td ddS)Nsapply change %d/%d to '%s'?sdiscard change %d/%d to '%s'?skeep change %d/%d to '%s'?srecord change %d/%d to '%s'?)sapplysdiscardskeeprecordsapply this change to '%s'?sdiscard this change to '%s'?skeep this change to '%s'?srecord this change to '%s'?s0[Ynesfdaq?]$$ &Yes, apply this change$$ &No, skip this change$$ &Edit this change manually$$ &Skip remaining changes to this file$$ Apply remaining changes to this &file$$ &Done, skip remaining changes and files$$ Apply &all changes to all remaining files$$ &Quit, applying no changes$$ &? (display help)s8[Ynesfdaq?]$$ &Yes, discard this change$$ &No, skip this change$$ &Edit this change manually$$ &Skip remaining changes to this file$$ Discard remaining changes to this &file$$ &Done, skip remaining changes and files$$ Discard &all changes to all remaining files$$ &Quit, discarding no changes$$ &? (display help)s-[Ynesfdaq?]$$ &Yes, keep this change$$ &No, skip this change$$ &Edit this change manually$$ &Skip remaining changes to this file$$ Keep remaining changes to this &file$$ &Done, skip remaining changes and files$$ Keep &all changes to all remaining files$$ &Quit, keeping all changes$$ &? (display help)s4[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this change manually$$ &Skip remaining changes to this file$$ Record remaining changes to this &file$$ &Done, skip remaining changes and files$$ Record &all changes to all remaining files$$ &Quit, recording no changes$$ &? (display help))multiplesinglehelprrWr+r) getmessagesr Ns67:;4589  569:3478   (  (  (  ( K1 ? ?r+ctdfd}t}i}d\}}dtd|D} } |D]u} | t| jz } d}d} dj | j } | |vr@|j| || j| j}td td j d |Dz}tfd |Drd \}}}n||||d\}}}}|s| g|| j<| jr'|| jxx| jz cc<t| jD]C\}}|||j| dk(rd|jz}n7| t| jz |z}d|| |jfz}|||||\}}}}|rO| r*tj|}|xj | z c_||jj#||S|D]L}|jD];}| r|xj | z c_||jj#|=N(| |j$|j&z z } Fxt|j)D cgc]&} | dj+st| dkDs%| (c} gifScc} w)z:Interactively filter patch chunks into applied-only chunksNrc d}|||||fS|||||fS d}jd||fz}jd|dk(rFj|dD].\}}jd|tj|fz0{|d k(rd} n|dk(rd } n|d k(rU|,jt d jd|j jr-jt d jddt dz} tjdd\} } d} tjtj| d}|j j||j||jdj| jDcgc] }d|zdz c}|j!j#}j%d|| fzdj'id} | d k7r6j)t d| z tj*| ~ Nt-| d}t/} |D]:}tj0|}|j3dr*| j|<|j!| j5d t7| }tj*| ~ d } nK|dk(rd x} }nA|dk(rdx} }n7|dk(rd x} }n-|d k(rdx} }n#|d!k(rt9j:t d" |||fScc}w#tj*| ~ wxYw)#zprompt query, and process base inputs - y/n for the rest of file - y/n for the rest - ? (help) - q (quit) Return True/False and possibly updated skipfile and skipall. NTr s%s (enter ? for help) %srrrs%s - %s rFr"s cannot edit patch for whole files!cannot edit patch for binary filers To remove '-' lines, make them ' ' lines (context). To remove '+' lines, delete them. Lines starting with # will be removed from the patch. If the patch applies cleanly, the edited hunk will immediately be added to the record list. If it does not apply cleanly, a rejects file will be generated: you can use that when you try again. If all lines of the hunk are removed, then the edit is aborted and the hunk is left unchanged. s hg-editor-s.diff)rusuffixrvr+rs%s "%s"sHGUSERs filterpatch)environ blockedtags editor exited with exit code %d rb#rs user quit) promptchoicerextractchoicesr rorrrrrwrnativeeolwriterrxryr/rr{ geteditorsystemusernamer+r|r r. fromnativeeolr#rB parsepatchr CanceledError)skipfileskipallqueryr1 newpatchesrespsrr;tretphelppatchfdpatchfn ncpatchfprNieditorpatchfpr&messages operationr}s r)promptzfilterpatch..promptsd  Hgz9 9  Xw : :W%i0E <u~ MNA HHUOAv--e4Q7DDAqHH\Qq0A,BBCDaaa=HHQBCDHHUO<<&&(HHQCDEHHUO  " &.%5%5(&"'! !",,RYYw-EFALL&&q)KKNGG8=8H8H8JK1UQY.K GGI\\^F))$'88!*BKKM :#1$C ax"F G# MN IIg&!#7D1G ( I '2#11$7#t4%OOD12MMONN1%!+I!6JIIg&!a!&&ha!%%ha %%ga $$ga))!L/::':5 5QL2IIg&!s-A=MM A6M"AM$?M MM*rrc3FK|]}t|jywrV)r%rrs r)rzfilterpatch..s6AGG 6s!rr+sexamine changes to %s?s and c3&K|] }d|z yw)s'%s'NrWrrNs r)rzfilterpatch..s> GaK> sc3@K|]}j|ywrV)exact)rrNrs r)rzfilterpatch..s-!u{{1~-)TNNr r)r r7rr%rr/rrCrrRrallrrrrrr5r8rvaluesr)r}headersrr0r1seenappliedr r!posr r fixoffsethdrrRrr%npr,r1idxr#newpatchnewhunkr/s` `` @r) filterpatchrDs}H h6T 5DG"HgC6g66C 39 s177| hhqxx  $;   ? HHRL )*Qx[-=-=> !&> .   -u- --NAw'-hd'K $Ax" !"  ::< AJJL !QWW , ! !!''* 9HAuGO R zy))4u~~7GGCL(1,{+I6NN$: 06'30 ,Ax* IIe,ELLI-L()007' *DH#+>>D$#NNi7N 0 0 23::7CDD U]]U[[88 7 9139j ( I1AaDLLNc!fqjQ I     Is &L8Lc<eZdZdZdZdZdZdZdZdZ dZ y ) rc||_||_|g|_g|_g|_dx|_|_dx|_|_|&|r|j|y|j|yyrV) rrrrrstartarstartbrread_context_hunkread_unified_hunk)r]rnumrcontexts r)r^z hunk.__init__Dsl  F "&& di"&& di >&&r*&&r* r+cd}t|j|jdd}|j|_|j|_|j|_||j|_||j|_|j |_|j |_|j|_|j|_|S)z1Return a copy with line endings normalized to LF.clg}|D],}|jdr|dddz}|j|.|S)Nrrvr)rr5)r0rr&s r) normalizez%hunk.getnormalized..normalizeUsEF $==)9u,D d# $Mr+N) rrrrrrGrHrr)r]rOnhs r)rzhunk.getnormalizedRs $))T[[$ 5KK ))))  KK KK )))) r+cBtj|j}|s!tt d|j z|j \|_|_|_ |_ |jd|_nt|j|_|jd|_ nt|j|_ t|j|_t|j|_ tj||j|j|j|j|j t'|jddk(rm|jd=|jd=|j d=|xjdzc_|xjdzc_ t'|jddk(rm|j)|y#t"j$$r(}tt d|j |fzd}~wwxYw)N bad hunk #%drsbad hunk #%d: %srr)unidescrrrrrrrGrrHrrr addlinesrrrr ParseErrorr% _fixnewline)r]rrCes r)rJzhunk.read_unified_hunkjs MM$)) $!!O"4t{{"BC C9:6 TY TY 99 DIDIIDI 99 DIDIIDI$++& $++&  M   DIItyy$))TVVTVV $))B- A% " r r IINI IINI $))B- A%  M!!$7"8DKK;K"KL L Ms=A G##H6#HHc |j|_tj|j}|s!t t d|j z|j\|_}t|j|_| |j}t||jz |_ |jr|xjdz c_ t|jD]}|j}|jdr|j|n|dd}|jds|jdrd|z}n:|jdrd |z}n#t t d |j |fz|jj||j j||j}|jd r@|jd dd }||jd <||j d <|j}tj|}|s!t t d|j z|j\|_}t|j"|_| |j"}t||j"z |_|j"r|xj$dz c_d} t|j$D]}|j}|jd r4|j&d dd }||j&d <||j | dz <Y|s|j|n|dd}|jd s|jdrd|z}ne|jdrd |z}nNt)|j&dk(r|j|nt t d |j |fz|j&j| | t)|j k\rd} n|j | } | dz } | |k(rS| jdrI|j j+| dz ||jsO|j D]@}|jds|jd s&|jj|B|j&sR|j D]C}|jds|jd s&|j&j|ddEd|j|j|j"|j$fz|_|j|j d<|j-|y)NrRrrr"s- s! rs rsbad hunk #%d old text line %d\ rs+ r rr+s@@ -%d,%d +%d,%d @@ )rcr contextdescrrrrrrGrrrr#rrr5rrHrrr%insertrV) r]rrCaendrr(rubendhunkirs r)rIzhunk.read_context_hunksKKM   dii (!!O"4t{{"BC CHHJ T$++& <;;DI + ;; IINItyy! A A||F# !"A||E"all5&91He$1H%674;;:JJ FFMM!  II  Q ! $ KKM << r 3BADFF2JDIIbM A   a !!O"4t{{"BC CHHJ T$++& <;;DI + ;; IINItyy!( A A||F#FF2JsOr '( %!)$ !"A||E"all5&91He$1HTVV! %674;;:JJ FFMM! C N*A %(A 6\\$'II$$UQY2Q( TvvYY %<<%d);FFMM!$ %vvYY )<<%d);FFMM!AB%( )- KK II KK II 0   yy !  r+c|j}|jdr6tj|j|j |j y|j|y)NrY)rcr#r fixnewlinerrrr)r]rr(s r)rVzhunk._fixnewlinesB KKM <<   ! !$))TVVTVV < GGAJr+ct|j|jk(xr"t|j|jk(SrV)r%rrrrr`s r)rz hunk.completes/466{dii'DCK499,DDr+ct|t|}|rd}d}t|j}t|dz D]*}|j|dzj dr|dz }*n|s>t|dz D]-}|j||z dz j dr|dz }-nt||}t||}||t||z ||t||z |fS||dfS)Nrrr)rr%rrr#) r]rrfuzzrtopbothlenrs r)_fuzzitz hunk._fuzzits4S" CCtyy>D4!8_ 99QU#..t41HC   taxAyya0;;DAq  dC.CdC.CsSX^,c#C3.GL LC{r+c|j|j|j||\}}}|j|z}|j|z}|j r |dkDr|dz}|j r |dkDr|dz}||||fS)Nrr)rhrrrGrHrr)r]rdrrrrerrs r)rz hunk.fuzzits{ TVVTVVT7C S#;;$;;$ 99A MH 99A MHHc8++r+N) rgrhrir^rrJrIrVrrhrrWr+r)rrCs- +0>kZE6 ,r+rc(eZdZdZdZdZdZdZy)rzA binary patch file.c`d|_d|_dg|_||_|j |y)NFsGIT binary patch )textrr_fname_read)r]rrs r)r^zbinhunk.__init__*s,  *+   2r+c|jduSrV)rlr`s r)rzbinhunk.complete1syy$$r+c|jr&t|jdj|gS|jgSr-)r applybindeltarlr/)r]r0s r)rz binhunk.new4s1 ::!$))SXXe_=> > {r+cd} |||j}|s!ttd|jz|j drt |ddj }n6|j dr$t |ddj }d|_ng}|||j}t|dkDr|d d}|d kr |d k\rt|td z dz}nt|td z d z} |jtj|ddd||||j}t|dkDrt!j"dj%|}t||k7r-ttd|jt||fz||_y#t$r;}ttd|jtj|fzd}~wwxYw)Ncf|j}|j||jdS)Nr)rcr5r)rrr(s r)getlinezbinhunk._read..getline:s' A KKN88G$ $r+Ts"could not extract "%s" binary datasliteral rsdelta rrrZAas&could not decode "%s" binary patch: %sr+s%"%s" length is %d bytes, should be %d)rrrrmr#rrrr%ordr5r b85decode ValueErrorr forcebytestrzlib decompressr/rl) r]rrtr&rUdecr(rWrls r)rnz binhunk._read9s % 2tyy)D%;>$qr(3BQ78 2tyy)D$i!msxx}- t9 !:;;;D 401   %?@{{J$;$;A$>?@ s*F:: G>6G99G>N)rgrhrirr^rrrnrWr+r)rr's% )r+rc|ddjd}|jd}|dkr|jd}|dkr|S|d|S)Nrrrrr)rr)strrr,s r) parsefilenameresN ABwA u A1u FF4L q5H Ra5Lr+crg}|D]/}t|dr|j}|j|1|S)areverse the signs in the hunks given as argument This function operates on hunks coming out of patch.filterpatch, that is a list of the form: [header1, hunk1, hunk2, header2...]. Example usage: >>> rawpatch = b"""diff --git a/folder1/g b/folder1/g ... --- a/folder1/g ... +++ b/folder1/g ... @@ -1,7 +1,7 @@ ... +firstline ... c ... 1 ... 2 ... + 3 ... -4 ... 5 ... d ... +lastline""" >>> hunks = parsepatch([rawpatch]) >>> hunkscomingfromfilterpatch = [] >>> for h in hunks: ... hunkscomingfromfilterpatch.append(h) ... hunkscomingfromfilterpatch.extend(h.hunks) >>> reversedhunks = reversehunks(hunkscomingfromfilterpatch) >>> from . import util >>> fp = util.stringio() >>> for c in reversedhunks: ... c.write(fp) >>> fp.seek(0) or None >>> reversedpatch = fp.read() >>> print(pycompat.sysstr(reversedpatch)) diff --git a/folder1/g b/folder1/g --- a/folder1/g +++ b/folder1/g @@ -1,4 +1,3 @@ -firstline c 1 2 @@ -2,6 +1,6 @@ c 1 2 - 3 +4 5 d @@ -6,3 +5,2 @@ 5 d -lastline r)rnrr5)rnewhunksr;s r) reversehunksrpsApH  1m $ A Or+c^Gfdd}|}t}|jdj||jdd}t |D]!\}} |j |||||}#~|jS#t $rtd||fzwxYw)aDpatch -> [] of headers -> [] of hunks If maxcontext is not None, trim context lines if necessary. >>> rawpatch = b'''diff --git a/folder1/g b/folder1/g ... --- a/folder1/g ... +++ b/folder1/g ... @@ -1,8 +1,10 @@ ... 1 ... 2 ... -3 ... 4 ... 5 ... 6 ... +6.1 ... +6.2 ... 7 ... 8 ... +9''' >>> out = util.stringio() >>> headers = parsepatch([rawpatch], maxcontext=1) >>> for header in headers: ... header.write(out) ... for hunk in header.hunks: ... hunk.write(out) >>> print(pycompat.sysstr(out.getvalue())) diff --git a/folder1/g b/folder1/g --- a/folder1/g +++ b/folder1/g @@ -2,3 +2,2 @@ 2 -3 4 @@ -6,2 +5,4 @@ 6 +6.1 +6.2 7 @@ -8,1 +9,2 @@ 8 +9 cveZdZdZdZdZfdZdZdZdZ dZ eeeed eeee d eeed eed d e idZ y)parsepatch..parserzpatch parsing state machinectd|_d|_d|_d|_g|_g|_g|_g|_y)Nrr+)rrrrrLrrr:r`s r)r^z#parsepatch..parser.__init__s:DMDKDIDKDLDKDIDLr+c|jg|\}}}}}t||_t||_||_yrV) addcontextrrrr)r]limits fromstartfromendtostarttoendrs r)addrangez#parsepatch..parser.addranges; OOB 7= 4Iw NDMg,DKDIr+c |jrt|j|j|j|j |j |j|}|jjj||xjt|j |jzz c_|xjt|j |jzz c_g|_g|_||_ yrV) rrrrrrrrr5r%r8rrL)r]rLrrs r)rz%parsepatch..parser.addcontextsyyKKMMKKIIKKII  !!((+ T[[!1AII!==  s4;;/!''99    "DLr+c|jr|j|_g|_|jr|jg||_yrV)rLrrr)r]rs r)addhunkz"parsepatch..parser.addhunks5||"ll ! yy#DIr+c|jgt|}|jj|||_yrV)rrr:r5)r]r?rs r)newfilez"parsepatch..parser.newfile s0 OOB s A LL   "DKr+cyrVrWrs r)addotherz#parsepatch..parser.addothers r+c<|jg|jSrV)rr:r`s r)finishedz#parsepatch..parser.finisheds OOB << r+)contextfilehunkrange)rrrother)rrr)rrr)rrrrrN) rgrhrirr^rrrrrr transitions)rsr)parserrsx)   #&     '  " ! "" ' " $.@*' r+rr+rrsunhandled transition: %s -> %s) r.rr/rB scanpatchrKeyErrorrr)originalchunksrrprDstatenewstaters ` r)rrsXP P d A BHHSXXn %&GGAJ E#B-$  *AMM%  *1d 3  ::<  !1UH4EE  s $BB,ct|}d}|dk(rd||jzfS|}|dkDrm|jd|}|dk(rtt d|||fz|dz }||dz kr$|||dzdk(r|dz }||dz kr |||dzdk(r|dz}|dkDrm|d|j |||djzfS)aturn a path from a patch into a path suitable for the repository prefix, if not empty, is expected to be normalized with a / at the end. Returns (stripped components, path in repository). >>> pathtransform(b'a/b/c', 0, b'') ('', 'a/b/c') >>> pathtransform(b' a/b/c ', 0, b'') ('', ' a/b/c') >>> pathtransform(b' a/b/c ', 2, b'') ('a/b/', 'c') >>> pathtransform(b'a/b/c', 0, b'd/e/') ('', 'd/e/a/b/c') >>> pathtransform(b' a//b/c ', 2, b'd/e/') ('a//b/', 'd/e/c') >>> pathtransform(b'a/b/c', 3, b'') Traceback (most recent call last): PatchApplicationError: unable to strip away 1 of 3 dirs from a/b/c rr+/rs*unable to strip away %d of %d dirs from %srN)r%rrr@rr)rr4rupathlenr,counts r) pathtransformr@s*$iG A zFT[[]*** E !) IIdA  7'?@%&'  Q'A+o$q1q5/T"9 FA'A+o$q1q5/T"9   !) 8?? ftABx'88 88r+c|dk(}|dk(}|xr |jdk(xr|jdk(}|xr |jdk(xr|jdk(} t |||\} } | xr|j | } t |||\} }| |k(r| }n| xr|j |}| xr| xr| }| d| j ddz}|d|j ddz}|r8||k(r3| j|r"|jdk(r|jdk(rd}d}| | k(xr|j| }d}|s| r |r|r| }n|}n| r| }|s#|s|r| }n|}n|s| }nttdt|}|r d|_ |S| rd |_ |S) NrrrrTFs&undefined source and destination filesrr) rGrrHrrrrfindr#rrrr)ry afile_orig bfile_origrr4runullanullbr{r|abasergoodabbasergoodbrzabasedirbbasedirisbackuprrs r) makepatchmetaris , &E , &E  :t{{a' :DIINF  :t{{a' :DIINF UF;LE5I /'../E UF;LE5 ~ 3gnnU3i4I4f*G,u{{4(1,-H,u{{4(1,-H    U # KK1  IIN ~9%"2"25"9H E  U E E!!$M"NO O 5 B  I  Ir+c#z Ktjd}t| fd}t jdD]}|j ds|j dr]d}|||} j }|j dr j }|||gz }n j |d|f|j d rd d || fd f|j d rd d|| fdf|j|}|rd|jfd|fyw)zlike patch.iterhunks, but yield different events - ('file', [header_lines + fromfile + tofile]) - ('context', [context_lines]) - ('hunk', [hunk_lines]) - ('range', (-start,len, +start,len, proc)) s'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)c|g}tjdD]/}||r|j|j||S|S)zscan lr while predicate holdsr+)rrcr5r)firstrr0r&rs r) scanwhilezscanpatch..scanwhilesQc* Dw T"     r+r+rsdiff -r c>|jdd}| xs|ddvS)Nrr)rdiff)r$)r&rs r) notheaderzscanpatch..notheaders)JJtQ'u=!,= ==r+rrr)rrrc&|jSrVrr(css r)rzscanpatch..s R8Hr+)rr )rr rrc&|jSrVrrs r)rzscanpatch..sQ\\"5Er+rrN) rrrrrcr#rrr) rDlines_rerr&rrrrrCrrs @@r)rrs*zzEFH BB R[[#&% ??+ , 0L >tY/F{{}H""6*8V,,!6/ ! __T "Bi.HII I __\ *$B9T+EFF Ft$A **n$5%sD7D;c,d} |jj}|j}t |}|j |t|}|j||S#t$r&t|jj }YhwxYw)a Git patches can emit: - rename a to b - change b - copy a to c - change c We cannot apply this sequence as-is, the renamed 'a' could not be found for it would have been renamed already. And we cannot copy from 'b' instead because 'b' would have been changed already. So we scan the git patch for copy and rename commands so we can perform the copies ahead of time. r) rDtellIOErrorr.r rrrrB)r firstliner=rDgitlrrs r) scangitpatchrs} C$eejjl UU rNE JJye$JGGCL  $ beejjl #$s&A$$,BBc#Kd}d}d}d}dx}}d}d}d} t|} t| jdD];} ||k(r| s| jds&| dur| jds| jdrd} |r%|d j ||r|j } | jdrt | | j} n&| | jdrd } t| |dz| | } |dz }|r"d}d ||| | xr| jxsdffd | fnF| jd r0tj| jd}|s$|Mt| | }d|Dcgc]!}|jdvs|j#c}f|jd|j!dz}d|j!dz}|ro|d j ||sZ|j } d d| jzd| jzd| jff|r|d j ||sZ|st#t%d|ddzd }n| jdrO| j}|jds| j'|qd }d} t)| }t)|}n| jdr| j}|jds| j'|| j}| j'||jds| j'|d }d } t)| }t)|}|s4d}d }|}d}>|rF|j } d d| jzd| jzd| jff|rEyycc}ww)aDRead a patch and yield the following events: - ("file", afile, bfile, firsthunk): select a new target file. - ("hunk", hunk): a new hunk is ready to be applied, follows a "file" event. - ("git", gitchanges): current diff is in git format, gitchanges maps filenames to gitpatch records. Unique event. r+NrFr@s***************rrTrrrrgit)rrrrr"s'failed to synchronize metadata for "%s"r+++s***)rrrcr#rrrrrrrrrrrrrrrrr)rDrrrhunknumemitfilerrBFILErLrrrrrCrEl2l3s r) iterhunksrs E E EGHwJ EG BB "++s #L E>Q\\$/u$6H)I||/0Bjn77uE^^%||/0B(?q||4F'G"GGaKW5 qLG ua1A 1ITJJJ1*  \\* + AHHW-.A!)"a0 &0!"ADD%>ue%L^^%BGGOBGGOGGI  Z^%>%>ue%L%@AE!"IMG \\& !B==( GG!!$E!"%E \\& !B==( B GGBK==!34 GG!!$E!"%E GHEGYL\  ^^ $ JJJ gs-E+O-N>N>B.OD&O*AO<Ocd}d}||}||d}||}||d}d}|t|krKt|||dz}|dz }|dzrd}d}|dzrt|||dz}|dz }|dzr|t|||dzdzz}|dz }|d zr|t|||dzd zz}|dz }|dzr|t|||dzd zz}|dz }|d zrt|||dz}|dz }|d zr|t|||dzdzz}|dz }|d zr|t|||dzd zz}|dz }|dk(rd}||z} |||| z }n,|dk7r||z} |||| z }||z }nttd|t|krK|S)z_Apply a binary delta hunk The algorithm used is the algorithm from git's patch-delta.c cld}tj|D]}|dz }t|dzr|cS|S)Nrr)rrry)binchunkr,r;s r) deltaheadz applybindelta..deltahead`sA !!(+ A FAFTM r+r+Nrrrr"rr risunexpected delta opcode 0)r%ryr@r) rrroutrr,cmdrrU offset_ends r)rqrq[s%  C(A|H(A|H A c(m (1q1u%& Q :FDTzXa!a%01QTz#hq1q512a77QTz#hq1q512b88QTz#hq1q512b88QTz8AA./QTzHQQ/0A55QTzHQQ/0B66Qqy$J 4z* *C AXSJ 8Aj) )C HA'*F(GH HI c(m J Jr+c 0t||t|||||S)aNReads a patch from fp and tries to apply it. Returns 0 for a clean patch, -1 if any rejects were found and 1 if there was any fuzz. If 'eolmode' is 'strict', the patch content and patched file are read in binary mode. Otherwise, line endings are ignored when patching then normalized according to 'eolmode'. r4rurw) _applydiffrt)r}rDryrcr4rurws r) applydiffrs)      r+c||r9tj|j|j|}|dk7r|dz }|S)Nr+r)r canonpathr4getcwd)r5rus r) _canonprefixrs8 ##DIIt{{}fE S= dNF Mr+c t|jfd}d} d} d} t|D]b\} } | dk(r| s| j| }|dkDs&d} )| dk(r| r| | j z } d} | \}}}}|r;||j |_|j r(||j |_nt||||}|jdk(r|j|j |s#|jdk(r|j|j d\}}|jd vrD|j|j dd \}}|!ttd |j z|jr|j}|jd k(rd }|s|rr|jdvr<|j|j r!ttd|j z|j|j |||j  ||||||} | dk(rE| D]>}||j }|j|\}}|,|j|||@Dt)j*td| z| r| | j z } | ry| S#t $r9}|j#t%j&|dzd} | dz } Yd}~d}~wwxYw)Nc*t|dz dS)Nr)r)rrur4s r)pstripz_applydiff..pstripsQ 62155r+rrrrrrr)rrr"ssource file '%s' does not existrr+)rrrs,cannot create %s: destination already exists)rwrrunsupported parser state: %sr)rr5rrr{rrrrr|rr@rrrr PatchErrorr+rr|rAbort)r}rDpatcherryrcr4rurwrrejectserr current_filerr9r'rr first_hunkrrrinstrs `` r)rrs',, /F6G CL"2IJ v G $$V,CQw g <--//# +1 (E5*b /::!' !3BJ"UE:ufuu !rzz*55I%NN277+' d5500!&rzz!:2A!>JD$|3@ABJJN7777Duu #4uu <<B4!2!gg &OOBGGT4D &r2wwO f_ 4bjj)$__T2 d< MM$d3 4++a ?@5HI ISIJV<%%'' J3  //5=># 1   s J00 K29.K--K2c8d}g}|j} | r'|jdtj| zd|dj ||tj|fz} |j d| ztj | d} | D]} | j} |j| dz| jdr)tj| } d}|j| b| jd d k\r/d }s|j dzd }|j| dz| jd d k\r|j| dz| jd d k\ss|j dzd }|j| dz |rtj ||| | j#}|r*t%t'dtj(|z|S#|rtj |||wwxYw)ztuse to apply to the working directory. returns whether patch was applied with fuzz factor.Fs-d %ss%s %s -p%d < %srsUsing external patch tool: %s rbrspatching file s with fuzzrTssaving rejects to filesFAILEDspatch command failed: %s)r4r5r shellquoter/rpopenrrr#rparsepatchoutputrCrr+rrKr{r@r explainexit)r}r5r patchnamer4rRr6rdargscwdrrDr&pf printed_filecodes r)_externalpatchr s D D ))C  Hx223778  $ I&   C HH /# 56 U #B9 &D;;=D GGD5L !01**40$  " <(A-#GGBJ'#'Lu %45:u %9%*#GGBJ'#'Lu %' &*    eZ 8 88:D # ) *X-A-A$-G G   K    eZ 8 sC$G=5/G==Hc | t}||jdd}|jtvr!t j t d|z|j}t} t|d} t|||||||} ||k7r|j|j|j|j| dkrtt d| dkDS#t$r|}YwxYw#||k7r|j|j|j|jwxYw)Nrseols!unsupported line endings type: %srrrspatch failed to apply)r7configroeolmodesrrrrPr TypeErrorrr{updater@) r}rypatchobjr4rurRrwrcrDr's r) patchbackendr D s  }))Hf-}}h&kk!@AGKLLmmoG KE (E " GU%  > HHJ W]]_%  Qw#A&>$?@@ 7N   > HHJ W]]_% s3 C4D4 DDAE c >t|||}t|||||||S)zwuse builtin patch to apply to the working directory. returns whether patch was applied with fuzz factor.)r2r ) r}r5rr4rurRrwr6rys r) internalpatchr b s)Rz2G GXufeW MMr+c @t||||} t|| |||||SrV)r`r ) r}r5rbrcrr4rurRrwrys r) patchrepor r s+"dC/G GXufeW MMr+c |jdd}| t}|rt|||||||St||||||||S)aApply to the working directory. 'eolmode' specifies how end of lines should be handled. It can be: - 'strict': inputs are read in binary mode, EOLs are preserved - 'crlf': EOLs are ignored when patching and reset to CRLF - 'lf': EOLs are ignored when patching and reset to LF - None: get it from user settings, default to 'strict' 'eolmode' is ignored when using an external patcher program. Returns whether patch was applied with fuzz factor. suir)rr7rr ) r}r5rr4rurRrwr6rs r)patchry s_*iix(G } gy%     D)UFE7J r+c ~t||j}t||}t|d5}t }t |D]\}} |dk(r| \} } } } | rQt | j|dz |d| _| jr3t | j|dz |d| _nt|| | | ||} |j| j| jdk(s|j| j|dvstjtd|z|cdddS#1swYyxYw)Nrrrr)rrr)rr4rr r7rrrrrrCrrrr)r}r5 patchpathr4ruryrDr9rr9rrrrs r) changedfilesr s.DII&G $ 'F i 2%&r] NME6/5,uj"+BGGUQYGJBGzz%2JJ 6&& 'z5&B BGG$55I%KK +//kk!$C"Du"LMM# N$)sB5D3% D3#D33D<c eZdZy)GitDiffRequiredN)rgrhrirWr+r)rr sr+rc #PK|s|s|jj}||} ||} t|| | |||||||  D]b\} }}}| |Jd| ||}djd|D}|r&|st |dkDrdj|dz|s_|dyw)ayields diff of changes to files between two nodes, or node and working directory. if node1 is None, use first dirstate parent instead. if node2 is None, compare node1 with working directory. losedatafn(**kwarg) is a callable run when opts.upgrade=True and every time some change cannot be represented with the current patch format. Return False to upgrade to git patch format, True to accept the loss or raise an exception to abort the diff. It is called with the name of current file being diffed as 'fn'. If set to None, patches will always be upgraded to git format when necessary. prefix is a filename prefix that is prepended to all filenames on display (used for subrepos). relroot, if not empty, must be normalized with a trailing /. Any match patterns that fall outside it will be ignored. copy, if not empty, should contain mappings {dst@y: src@x} of copy information. if copysourcematch is not None, then copy sources will be filtered by this matcher hunksfilterfn, if not None, should be a function taking a filectx and hunks generator that may yield filtered hunks. ) ctx1ctx2rchangesopts losedatafnpathfnrcopysourcematchNs-fctx2 unexpectly None in diff hunks filteringr+c3DK|]\}}dj|yw)r+Nr/)rhrangehliness r)rzdiff.. sE^VV(Es rr)r=p1 diffhunksr/r%)r5node1node2rrrrrrr hunksfilterfnrrfctx1fctx2r?rrls r)diffr( sT    " ;D ;D$-    ' % uc5  $ ! @? @!!%/ExxEuEE DCHqL**S/E) ) J1s BB&B&c |tj}d} | |sj|}t|tr |dd\n%|j |j |jcsssgSjjrt} nt} jjfD cgc] } | s| | c} 2i|js |jrtj || r.j"D cic]\} }| |s| |c}} t%}t%}t%}D])}|vs|j'||j)|+D]}|vs|j'|t+|t+|t+|t j"D] \} }|vs | =t-j.t ||z|z}j1|fj1|fg}t-j2|f d}|jr4|js( fd}t ||j5d|S||dScc} wcc}} w#t6$r||j5d dcYSwxYw) zYield diff of changes to files in the form of (`header`, `hunks`) tuples where `header` is a list of diff headers and `hunks` is an iterable of (`hunkrange`, `hunklines`) tuples. See diff() for the meaning of parameters. NcBitjfd}|S)Nc|j|j|}|vr3tdkDrj=|j |<nj |j ||S)N)filelog)filectxrr%popleftr,r|r5)rNrbrjcacheorders r) getfilectxz4diffhunks..lrugetfilectx..getfilectx" sg;;q%))A,;7D~u:?emmo.<<>a Q LLOKr+) collectionsdeque)r2r0r1s @@r) lrugetfilectxz diffhunks..lrugetfilectx s#!!# r+)rrc0 t  || SrV)trydiff) rlosedatarrrrr2modifiedrr8r5revss r)difffnzdiffhunks..difffno s4              r+c(r |sty)N)rY)r)rYrs r)r8zdiffhunks..losedata s!r):))*;r+F)gitT)r defaultoptsstatusrlistr9rr8r} debugflagrrnoder=upgrader pathcopiesrr7r|rCrIr matchfilesrev prefetchfilesrr)r5rrrrrrrrrr5hexfuncrBrrM modifiedsetaddedset removedsetrN prefetchmatch revmatchesr;r8rr2r9r8r:s``` ``` @@@@@r)r"r" s& |  "J ++d%+0'4 #*2A; %    MM OO !% E'  ww'+yy{DIIK&@ IdDGDM ID | 88t||$$T4u=D*4NXS#9MSNh-K5zHWJ  D=   q ! LLO  ! D=   a ! k"H 8 EZ G&S d?S  && d;)J67M ]# ]#J $ +   ||DHH 5 * tyyUy3X>? ?dD!!Q JOv 5$)))-t4 4 5s* J/ J/(J49J4?&J::"KKc#K|D]}|jd}|j}|jdrd}n,|jdrd}ntjd|ztj |D] }|jdr|df||f"||k7r|t |d d f||k7s|t |d d fy w) z1yield tokens for a list of lines in a single hunkrr diff.deletedr diff.insertedunexpected hunk line: %srdiff.tabNdiff.trailingwhitespacer+)rr#rProgrammingError tabsplitterfindallr%) hunklinesr& chompline striplinelabeltokens r)diffsinglehunkr\ s0KK( $$& ??4 #E __T "$E(()Dt)KL L ((3 %E&k**en$  %  !S^-.0JK K  I()3/ /)0s B;C>Cc#Kt}t}|D];}|dddk(r ||ddz }|dddk(r ||ddz }%tjd|z|r|st|D]}|ytj t |}tj t |}|Dcgc]}|dk(r|n|dz}}|Dcgc]}|dk(r|n|dz} }dj|} dj| } g} g} tj| | || }|D]\\}}}}}|d k(}tjdj|||D]}| j||ftjdj|||D]}| j||fdd | fdd | ffD]\}}}d }|D]\}}|r||fd}|jd}|rG|dd}|jdr|dd}|t|d}|j}|t|d}tj |D] }d|ddk(rd}n |r|dz}n|dz}||f"|sr|dfdfd }ycc}wcc}ww)zEyield tokens for a list of lines in a single hunk, with inline colorsrrrNr rQrr+)lines1lines2!rOrPTFr rrRs.changeds .unchangedrS) bytearrayrrTr\ wordsplitterrVbytesr/r allblocksr}r5rr%rrU) rWrrr&r&alblralnblnanbnatokensbtokensblocksa1a2b1b2btyper9r[rurZtokens nextisnewline isendoflinechomp endofline endspacesmaybetab currentlabels r)diffsinglehunkinliner| s   A AM !9  abMA !AY$  abMA(()Dt)KL L M A * AG    eAh 'B   eAh 'B35 6aU 1E ) 6C 635 6aU 1E ) 6C 6 #B #BGG __RC >%(!#2JE!#e*,/  !#e*,/ '//6 /HQqM)#.L',{': ',}'< .. /$&@AA #&& $ 7 % %! 7 6s%B.J0I>J JF J)Jc/K|jdr|djrtntgd}dg}d}gfd}||i|D]}|j d}t |} t |D]\} } |r| jdrd}n| r| jdsd }d} |s| r| jd rd } |} |r|} | r!| }| d z| kr|dz }j|s|D]}|| j}| D]5\}}|j|s||f| |k7r| t |d d fn| df| d z| ksd|D]}|y w)z@yields 2-tuples of (output, label) based on the output of func()r) )rs diff.diffline)copy diff.extended)renamer)soldr)snewr)sdeletedr)sindexr)s similarityr)rs diff.file_a)rs diff.file_b)rs diff.hunkFc3@KrD]}|gddyywrVrW)r[ dodiffhunk hunkbuffers r)consumehunkbufferz$difflabel..consumehunkbuffer s1 #J/   JqM r7rr)rr rrrT)r rrNrSr+rr+) rworddiffr|r\r$r%rr#r5r)funcrkw headprefixes textprefixesheadrr1r0 linecountr,r&difflineprefixes bufferedliner[rYrurZrrs @@r) difflabelr s vvf~"V*--) #  L L DJ t"r", E"J  '' 'GAt??4( D3! DHDT__\%B#H'# q59$ E)L!!,//0 EK  KKM %- &MFE ++F3(%009, $S^%5 6 :# & +%q59$&&O' 'P'( EK W,sDE,#.E,E,c(ttg|i|S)zBlike diff(), but yields 2-tuples of (output, label) for ui.write())rr()rrs r)diffuir? s T 'D 'B ''r+c#Kt}|jDcic]\}}|| }}}t|t|} } t||z|zD]r} d} | | }} | | vr6d} | |vrY|jrM|| } | | vr| |vrd} |j | n,d} n)| | vr%d}|jr| |vr|| | vr ||| | k(rl| || ftycc}}ww)agenerates tuples (f1, f2, copyop), where f1 is the name of the file before and f2 is the the name after. For added files, f1 will be None, and for removed files, f2 will be None. copyop may be set to None, 'copy' or 'rename' (the latter two only if opts.git is set).Nrr~)r7rrIr=rC)r9rr8rrgonekrcopytorJrKrNcopyopf1f2s r) _filepairsrD s 5D)tzz| ,tq!ad ,F ,u:s7|jH Hu$w. /AB =BDy88aBZ'BdN!* !( *_BxxKq X-VAY1,"fn/ -sC CB&Cc|sd}t|}tjd|z}|j|t |j S)Nr+sblob %d)r%rsha1rrdigest)rlr(rs r) _gitindexri sA  D A lQ&'AHHTN qxxz?r+s120000s100755s100644)rfrgr+c #DK| jrdx} } nd} d} d}d}tj|j}tj|j}| sd} t ||||| D]\}}}d}d}d}d}d}d}|r(|||}| j s| r|j |}|r(|||}| j s| r|j |}| jrd}ntd ||fD}| r?| j s3|s%||vs!|s||s||r|r |s|s |r|r||k7r | |xs|| |xs|}| |xs|}g}| j r|jd | || |fz|s|jd t|zn|s|jd t|znt|t|} }|| k7r(|jd |z|jd| z|| jr3tj||||dz}!|jd|!z|jd||fz|jd||fzn|r|j||||rO| j r$| j r7| jr+| js|d}|=||j!|sd}n'd}n$||j#}||j#}||||||f}"||||||f}#t%|"|#||| yw)zgiven input data, generate a diff and yield it in blocks If generating a diff would lose data like flags or binary data and losedatafn is not None, it will be called. pathfn is applied to every path in the diff output. r+rrc^dj|Dcgc]}d|z c}}d||fzScc}w)Nrs-r %ss diff %s %sr)rNr:rFrevinfos r)rztrydiff..diffline s3))t<X^<=|++=s *c4|duxs|jdk(Sr)rU)rjs r)isemptyztrydiff..isempty st|/tyy{a//r+c|SrVrW)rNs r)rztrydiff.. s1r+NFc3BK|]}||jywrV)isbinaryr4s r)rztrydiff.. sO!Ossdiff --git %s%s %s%ssnew file mode %ssdeleted file mode %ss old mode %ss new mode %sdssimilarity index %d%%s %s from %ss%s to %ss)noprefixrdatestrdaterr=rirlrr5_gitmodeshowsimilarityrscorenobinaryindexcmpr diffcontent)$r5r:rrr9rr8rr2rrraprefixbprefixrrdate1date2rrrcontent1content2r&r'flag1flag2rpath1path2rmode1mode2simdata1data2s$ r)r7r7u s3, }}',0   TYY[ )E   TYY[ )E $XugtTJd>B r4(Exx: 2 r4(Exx: 2 99FOu~OOF dhhd GENEu~28$rxR rxR  88 MM'7E7E*JJ  1HUOCD 5GH'uE>MM.5"89MM.5"89%**%mmDKeEK &>&DEMM-65/"ABMM+"?@  MM(5$/ 0 TXX$--    $UYYu-=$H&H  ::<  ::<ueUHe<ueUHe<%==Id>sLL c `|\}}}}} } |\} } } }}}||vr t| ntj}| | vr t|ntj}|rM|jrA|js5t j | |}|r|jd||fzd|gff}n|jrM|jdkDr>|}||}|jd|d|j|d|jt|fzt j| | |||| ||\}}|j||| ||fS)aOdiffs two versions of a file. data1 and data2 are tuples containg: * ctx: changeset for the file * fctx: file context for that file * path1: name of the file * flag: flags of the file * content: full content of the file (can be null in case of binary) * date: date of the changeset header: the patch header binary: whether the any of the version of file is binary or not opts: user passed options It exists as a separate function so that extensions like extdiff can wrap it and use the file content directly. s index %s..%sNrsindex %s..%s %s)rr) rrnullhexr=rrb85diffr5rrunidiffextend)rrrrrrr&rrrrrr'rrrrindex1index2rlrflaguheaderss r)rr sE(27.D%x16.D%x$)TMYx 7H7P7PF$)TMYx 7H7P7PF $((4==}}Xx0  MM/VV,<< =! 88 QD| MM"1tzz*1tzz*TN  --        %  h % &&r+cd\}}}}}|D]E\}}}} t|tj|}t|||z}||z }||z }|xs| }G|||||fS)N)rrrrF)rr colwidth) statsmaxfilemaxtotaladdtotal removetotalrrNrr%rs r) diffstatsumr> s7H4GXxf 1agx0034xQ'A q 1  Hh V ;;r+c tjd}g d\ fd}d}|D]-}|jdrx|d}d\|jdr%tj |j d Z|jd sl|j |j d |jd rd}|jd r|sd z |jdr|sd z |jds|jdrd|jdr|dd|jds#d|ddzz 0| S)Ns^diff .*-r [a-z0-9]+\s(.*)$)NrrFc6rjfyyrVrS)addsrrremovesresultssr) addresultzdiffstatdata..addresultP s  NNHdGX> ? r+FrT)rrFrr"sdiff -rrs@@r rrs Binary files rename fromrs rename tos => %sr)rrr#rrr) r0rrr'r&rrrrrs @@@@@r) diffstatdatarJ s[ ZZ7 8FG(9%HdGX@@H. ??7 # KH&1 #D'8/0 <<-33A6,!==.44Q7 __U #H __T "8 AID __T "8 qLG __0 1T__ 6 H __^ ,BCyH __\ *  DI- -H3.4K Nr+c g}t|}t|\}}}}tt}|r|dkrd}||z |z dz dkrdfd} |D]]\} } } } | rd}nd| | zz}d| | z}d| | z}|j d | d |t j | z z||||fz_|r)|j td t|||fzd j|S) NrrrcZkr|St|zztt|SrV)rrbool)r, graphwidthrs r)scalezdiffstat..scale s0 z !H1z>X-s47|<    &  G H5z9l3 4 88F r+c/`Kt|i|jD]}|r|ddvry|jdd\}}|dzdftjd|}|r|j ddftjd |}|r|j dd fn|dfd y w) zOlike diffstat(), but yields 2-tuples of (output, label) for ui.write() rs+-rrr+s\++rsdiffstat.inserteds-+sdiffstat.deletedrN)rrrsplitrrr)rrr&namegraphrCs r) diffstatuir s $%"%002  DH%++dA.KD%$;$ $ '5)Awwqz#788 &%(Awwqz#677+  sB,B.rV)rr+ro)Nro)r+Nror)rr+Nror)rr+) NNNNNNNNNN)NNNNNNN)P)gr3 contextlibrrxrr\r}i18nrrBrrrrr r r r r rrrrrrrrrutilsrrrrr.rrrUrcrrr@r$rcontextmanagerrrzrrrrrr2rPr`rSrZrrtrrr rDrrrrrrrrrrrqrrrrr r r rr Exceptionr diffalloptsdiffoptsdifffeatureoptsr(r"r\r|rrrrrr7rrrrrrWr+r)rs   == /0bjj)* rzzA    ''33 BN 4nb-:-:`*Z((* " "F.*.*b/(Y/(d#,#,L*+/*+\ "**C DbjjKL /ddNM M `kBkB\@Foda,a,H;;|=@M`&9R:z0%f6dKN8v,CL\~.d?HF    N"HQN   B4 i    "" **       H^     C"L02E%PM`( "J99 =M>`6'r <*Z-`r+