§
    	^µc– ã                   ó†  — d dl Z d dlZd dlZd dl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 ddlmZ ddlmZmZmZmZmZmZmZmZmZmZmZmZmZ ddlmZmZm Z m!Z! ej"        Z" ej#        d¦  «        Z$ ej#        d	¦  «        Z% ej#        d
¦  «        Z&ej'        Z'ej(        Z(ej)        Z)d„ Z*g d¢Z+ej,        d„ ¦   «         Z-d„ Z. G d„ d¦  «        Z/d„ Z0 G d„ d¦  «        Z1 G d„ d¦  «        Z2 G d„ de2¦  «        Z3 G d„ de3¦  «        Z4 G d„ d¦  «        Z5 G d„ de2¦  «        Z6 ej#        d¦  «        Z7 ej#        d¦  «        Z8g d ¢Z9 G d!„ d"¦  «        Z: G d#„ d$¦  «        Z; G d%„ d&¦  «        Z<d'„ Z=dVd(„Z> G d)„ d*¦  «        Z? G d+„ d,¦  «        Z@d-„ ZAd.„ ZBdVd/„ZCd0„ ZDd1„ ZEd2„ ZFd3„ ZGd4„ ZHd5„ ZIdWd8„ZJd9„ ZK	 dWd:„ZLd;„ ZM	 dXd<„ZN	 	 	 	 dYd=„ZO	 dXd>„ZP	 	 	 	 	 dZd?„ZQd[d@„ZR G dA„ dBeS¦  «        ZTejU        ZVejU        ZUejW        ZW	 	 	 	 	 	 	 	 	 	 d\dC„ZX	 	 	 	 	 	 	 d]dD„ZYdE„ ZZdF„ Z[dG„ Z\dH„ Z]dI„ Z^dJ„ Z_dKdLdMdNœZ`dO„ ZadP„ ZbdQ„ ZcdR„ Zdd^dT„ZedU„ ZfdS )_é    Né   ©Ú_)ÚhexÚsha1nodeconstantsÚshort)Úopen)ÚcopiesÚ
diffhelperÚdiffutilÚencodingÚerrorÚmailÚmdiffÚpathutilÚpycompatÚscmutilÚsimilarÚutilÚvfs)ÚdateutilÚhashutilÚprocutilÚ
stringutils   diff --git a/(.*) b/(.*)s   (\t+|[^\t]+)s9   (\t+| +|[a-zA-Z0-9_\x80-\xff]+|[^ \ta-zA-Z0-9_\x80-\xff])c                 óh  ‡‡— d„ Šd„ Šˆfd„}ˆfd„}ˆfd„}ˆˆfd„}ˆfd„} G d„ d	¦  «        }d
}g }dg}	t          j        | d¦  «        s || ¦  «        } | D ]Ï}
|                     |
¦  «         |
                     d¦  «        r || |¦  «        c S |
                     d¦  «        r || |¦  «        c S  ‰|
|¦  «        rAd}|
                     dd¦  «        d                              ¦   «         |	v r || |¦  «        c S Œª|
                     d¦  «        r|r || |¦  «        c S ŒÐ ||¦  «        S )z6return an iterator of individual patches from a streamc                 óÈ   — |r|                       d¦  «        rdS |                       d¦  «        rdS |                      dd¦  «        }t          |¦  «        dk    o	d|d	         vS )
N)ó    ó   	T)r   ó   -ó   +Fó   : r   é   r   r   )Ú
startswithÚsplitÚlen)ÚlineÚinheaderÚls      ú1/usr/lib/python3/dist-packages/mercurial/patch.pyÚisheaderzsplit.<locals>.isheaderA   sm   € Øð 	˜Ÿš¨Ñ6Ô6ð 	à�4Ø�?Š?Ð-Ñ.Ô.ð 	à�5Ø�JŠJ�u˜aÑ Ô ˆÝ�1‰vŒv˜Š{Ð/˜t¨1¨Q¬4Ð/Ð/ó    c                 óF   — t          d                     | ¦  «        ¦  «        S ©Nr+   )ÚstringioÚjoin)Úliness    r)   Úchunkzsplit.<locals>.chunkK   s   € Ý˜Ÿš ™œÑ(Ô(Ð(r+   c              3   óâ   •K  — d}| D ]U}|                      ¦   «         sd}|s&|                     d¦  «        r ‰|¦  «        V — g }d}|                     |¦  «         ŒV|r ‰|¦  «        V — d S d S )NTFó   # HG changeset patch)Ústripr#   Úappend)ÚstreamÚcurr'   r&   r1   s       €r)   Úhgsplitzsplit.<locals>.hgsplitN   s«   øè è € Øˆàð 	ð 	ˆDØ—:’:‘<”<ð !Ø �Øð   §¢Ð0GÑ HÔ Hð  Ø�e˜C‘j”jÐ Ð Ð Ø�Ø�à�JŠJ�tÑÔÐÐàð 	Ø�%˜‘*”*ÐÐÐÐÐð	ð 	r+   c              3   ó  •K  — | D ]U}|                      d¦  «        r)t           ‰|dd …         ¦  «        ¦  «        D ]}|V — Œg }|                     |¦  «         ŒV|r't           ‰|dd …         ¦  «        ¦  «        D ]}|V — Œd S d S )Nó   From r   )r#   r$   r5   )r6   r7   r&   Úcr1   s       €r)   Ú	mboxsplitzsplit.<locals>.mboxsplit^   sÄ   øè è € Øð 	ð 	ˆDØ�Š˜xÑ(Ô(ð Ý˜u˜u S¨¨¨¤W™~œ~Ñ.Ô.ð ð �AØ�G�G�G�GØ�à�JŠJ�tÑÔÐÐàð 	Ý˜5˜5  Q R R¤™>œ>Ñ*Ô*ð ð �Ø����ð	ð 	ðð r+   c              3   óH  •K  — d„ }| D ]}|                      |¦  «         Œ ‰	|¦  «        }t          j        |¦  «        }|                     ¦   «         s ||¦  «        V — d S d}|                     ¦   «         D ](}|                     ¦   «         }||vrŒ ||¦  «        V — Œ)d S )Nc                 ó¢   — t          ¦   «         }t          j        |d¬¦  «        }|                     | ¦  «         |                     d¦  «         |S )NF)Úmangle_from_r   )r.   r   Ú	GeneratorÚflattenÚseek)ÚmÚfpÚgs      r)   Úmsgfpz'split.<locals>.mimesplit.<locals>.msgfpl   sB   € Ý‘”ˆBå”˜r°Ð6Ñ6Ô6ˆAà�IŠI�a‰LŒLˆLØ�GŠG�A‰JŒJˆJØˆIr+   ©ó
   text/plains   text/x-diffs   text/x-patch)r5   r   ÚparseÚis_multipartÚwalkÚget_content_type)
r6   r7   rF   r&   r;   rC   Úok_typesÚpartÚctr1   s
            €r)   Ú	mimesplitzsplit.<locals>.mimesplitk   sÙ   øè è € ð	ð 	ð 	ð ð 	ð 	ˆDØ�JŠJ�tÑÔÐÐØˆE�#‰JŒJˆåŒJ�q‰MŒMˆØ�~Š~ÑÔð 	"Ø�%˜‘(”(ˆNˆNˆNˆNˆNàGˆHØŸš™œð "ð "�Ø×*Ò*Ñ,Ô,�Ø˜XÐ%Ð%ØØ�e˜D‘k”kÐ!Ð!Ð!Ð!ð	"ð "r+   c              3   óÄ   •K  — d}| D ]F}|s ‰||¦  «        r ‰|¦  «        V — g }d}|r ‰||¦  «        sd}|                      |¦  «         ŒG|r ‰|¦  «        V — d S d S ©NFT©r5   )r6   r7   r'   r&   r1   r*   s       €€r)   Úheadersplitzsplit.<locals>.headersplit„   sµ   øè è € Øˆàð 	ð 	ˆDØð    ¨¨xÑ 8Ô 8ð  Ø�e˜C‘j”jÐ Ð Ð Ø�Ø�Øð !  ¨¨xÑ 8Ô 8ð !Ø �à�JŠJ�tÑÔÐÐàð 	Ø�%˜‘*”*ÐÐÐÐÐð	ð 	r+   c              3   ó&   •K  —  ‰| ¦  «        V — d S ©N© )r7   r1   s    €r)   Ú	remainderzsplit.<locals>.remainder”   s!   øè è € Øˆe�C‰jŒjÐÐÐÐÐr+   c                   ó$   — e Zd Zd„ Zd„ Zd„ ZeZdS )úsplit.<locals>.fiterc                 ó   — || _         d S rV   )rD   ©ÚselfrD   s     r)   Ú__init__zsplit.<locals>.fiter.__init__˜   s   € ØˆDŒGˆGˆGr+   c                 ó   — | S rV   rW   ©r]   s    r)   Ú__iter__zsplit.<locals>.fiter.__iter__›   s   € ØˆKr+   c                 óJ   — | j                              ¦   «         }|st          ‚|S rV   )rD   ÚreadlineÚStopIteration©r]   r(   s     r)   Únextzsplit.<locals>.fiter.nextž   s(   € Ø”× Ò Ñ"Ô"ˆAØð $Ý#Ð#ØˆHr+   N)Ú__name__Ú
__module__Ú__qualname__r^   ra   rf   Ú__next__rW   r+   r)   ÚfiterrZ   —   sB   € € € € € ð	ð 	ð 	ð	ð 	ð 	ð	ð 	ð 	ð ˆˆˆr+   rk   Fs   content-types   nextr3   r:   Tó   :r   r   ó   --- )r   Úsafehasattrr5   r#   r$   Úlower)r6   r8   r<   rP   rT   rX   rk   r'   r7   Úmimeheadersr&   r1   r*   s              @@r)   r$   r$   >   s"  øø€ ð0ð 0ð 0ð)ð )ð )ðð ð ð ð ð ð ð ð ð ð"ð "ð "ð "ð "ð2ð ð ð ð ð ð ð ð ð ð ðð ð ð ð ñ ô ð ð €HØ
€Cà"Ð#€KåÔ˜F GÑ,Ô,ð à��v‘”ˆàð ,ð ,ˆØ�
Š
�4ÑÔÐØ�?Š?Ð2Ñ3Ô3ð 	,Ø�7˜6 3Ñ'Ô'Ð'Ð'Ð'Ø�_Š_˜XÑ&Ô&ð 		,Ø�9˜V SÑ)Ô)Ð)Ð)Ð)ØˆX�d˜HÑ%Ô%ð 	,ØˆHØ�zŠz˜$ Ñ"Ô" 1Ô%×+Ò+Ñ-Ô-°Ð<Ð<à �y ¨Ñ-Ô-Ð-Ð-Ð-ð =ð �_Š_˜WÑ%Ô%ð 	,¨(ð 	,à�;˜v sÑ+Ô+Ð+Ð+Ð+øð ˆ9�S‰>Œ>Ðr+   ))s   Dates   date)s   Branchs   branch)s   Node IDó   nodeidc              #   ó8  K  — t          j        d¬¦  «        \  }}t          j        |d¦  «        }	 t	          | |||¦  «        V — |                     ¦   «          t          j        |¦  «         dS # |                     ¦   «          t          j        |¦  «         w xY w)a¤  extract 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-©ÚprefixÚwbN)r   ÚmkstempÚosÚfdopenÚ_extractÚcloseÚunlink)ÚuiÚfileobjÚfdÚtmpnameÚtmpfps        r)   Úextractr‚   Ì   s˜   è è € õ$ Ô"¨,Ð7Ñ7Ô7�K€BˆÝŒI�b˜$ÑÔ€EðÝ�r˜7 G¨UÑ3Ô3Ð3Ð3Ð3à�Š‰ŒˆÝ
Œ	�'ÑÔÐÐÐøð 	�Š‰ŒˆÝ
Œ	�'ÑÔÐÐøøøs   ±A/ Á/*Bc           	      óJ
  — t          j        dt           j        t           j        z  ¦  «        }i }t	          j        |¦  «        }|d         ot	          j        |d         ¦  «        }|d         ot	          j        |d         ¦  «        |d<   |s<|d         s4d                     d„ |                     ¦   «         D ¦   «         ¦  «        dz   }g }|d         }	|	r1t	          j        |	¦  «        x|d<   }	|  	                    d	|	z  ¦  «         |r}| 
                    d
¦  «        r:|                     d¦  «        }
|
dk    r||
dz   d …                              ¦   «         }t          j        dd|¦  «        }|  	                    d|z  ¦  «         |d         r|  	                    d|d         z  ¦  «         d}d}d}|                     ¦   «         D �]ë}t          j        |                     ¦   «         ¦  «        }|  	                    d|z  ¦  «         ||vrŒF|                     d¬¦  «        }|                     |¦  «        }|�red}d}d}|  	                    d|                     d¦  «        z  ¦  «         |dz  }t+          ¦   «         }|d |                     d¦  «        …                              ¦   «         D �]™}| 
                    d¦  «        rH|sF|  	                    d¦  «         d}d}|                     d¦  «         |                     ¦   «          d }�n|�r | 
                    d¦  «        r,|dd …         |d<   |  	                    d|d         z  ¦  «         nÇ| 
                    d¦  «        r0|                     |dd …                              ¦   «         ¦  «         n‚| 
                    d¦  «        rbt4          D ]Y\  }}d |z  }| 
                    |¦  «        r:|t7          |¦  «        d …         ||<   |  	                    d!|||         fz  ¦  «         ŒZnd}n|d"k    rd}|s,|s*|                     |¦  «         |                     d¦  «         �Œ›|                     ¦   «         }|r?|                     |¦  «         |                     d¦  «        s|                     d¦  «         �ŒÙ|s|r|d#k    r|d|z   z  }�Œí|r| 
                    |¦  «        sd$||fz  }||d%<   |                     ¦   «          |r2|                      d¦  «        |d&<   |r|                      d¦  «        |d'<   |r||d(<   |S ))Ns}   ^(?:Index:[ \t]|diff[ \t]-|RCS file: |retrieving revision [0-9]+(\.[0-9]+)*$|---[ \t].*?^\+\+\+[ \t]|\*\*\*[ \t].*?^---[ \t])ÚSubjectÚFroms   useró   
c              3   óp   K  — | ]1}d                       t          t          j        |¦  «        ¦  «        V — Œ2dS )r!   N)r/   Úmapr   Ú
strtolocal©Ú.0Úhs     r)   ú	<genexpr>z_extract.<locals>.<genexpr>ü   sL   è è € ð ð Ø<=�—
’
�3�xÔ2°AÑ6Ô6Ñ7Ô7ðð ð ð ð ð r+   zX-Mercurial-Noderq   s   Node ID: %s
s   [PATCHó   ]r   r   s   \n[ \t]+r   s   Subject: %s
s	   From: %s
rG   r+   s   Content-Type: %s
T)ÚdecodeFs   found patch at byte %d
r3   s   patch generated by hg export
s   # User é   s	   # Parent é	   ó   # s   # %s s   %s: %s
ó   ---rH   s   %s
%ss   messages   p1s   p2s   filename)!ÚreÚcompileÚ	MULTILINEÚDOTALLr   rI   Ú
headdecoder/   ÚitemsÚdebugr#   ÚfindÚlstripÚsubrK   r   ÚbytestrrL   Úget_payloadÚsearchÚstartr.   Ú
splitlinesrB   Útruncater5   Úpatchheadermapr%   ÚwriteÚgetvalueÚendswithr{   Úpop)r}   r~   r€   r�   ÚdiffreÚdataÚmsgÚsubjectÚparentsÚnodeidÚpendÚ
diffs_seenrM   ÚmessagerN   Úcontent_typeÚpayloadrC   ÚhgpatchÚhgpatchheaderÚ
ignoretextÚcfpr&   ÚheaderÚkeyru   s                             r)   rz   rz   ç   s†  € õ ŒZð	%õ 	Œ•r”yÑ ñô €Fð €Då
Œ*�WÑ
Ô
€Cà�)ŒnÐ@¥¤°°Y´Ñ!@Ô!@€GØ˜”KÐ@¥D¤O°C¸´KÑ$@Ô$@€Dˆ�MØð 
˜4 œ=ð 
ð �JŠJð ð ØADÇÂÁÄðñ ô ñ ô ð ñð 	ð €GàÐ#Ô$€FØð ,Ý#'¤?°6Ñ#:Ô#:Ð:ˆˆY‰˜&Ø
�ŠÐ! FÑ*Ñ+Ô+Ð+àð -Ø×Ò˜iÑ(Ô(ð 	7Ø—<’< Ñ%Ô%ˆDØ�qŠyˆyØ! $¨¡( * *Ô-×4Ò4Ñ6Ô6�Ý”&˜ t¨WÑ5Ô5ˆØ
�ŠÐ! GÑ+Ñ,Ô,Ð,ØˆG„}ð 0Ø
�Š�  g¤Ñ.Ñ/Ô/Ð/Ø€JØ?€HØ€GØ—’‘
”
ð 1'ñ 1'ˆÝÔ'¨×(=Ò(=Ñ(?Ô(?Ñ@Ô@ˆØ
�ŠÐ&¨Ñ5Ñ6Ô6Ð6Ø˜xÐ'Ð'ØØ×"Ò"¨$Ð"Ñ/Ô/ˆØ�MŠM˜'Ñ"Ô"ˆØñ *	'ØˆGØ!ˆMØˆJà�HŠHÐ0°1·7²7¸1±:´:Ñ=Ñ>Ô>Ð>Ø˜!‰OˆJÝ‘*”*ˆCØ  !§'¢'¨!¡*¤* Ô-×8Ò8Ñ:Ô:ð %ñ %�Ø—?’?Ð#:Ñ;Ô;ð &ÀGð &Ø—H’HÐ>Ñ?Ô?Ð?Ø"�GØ$(�Mà—H’H˜Q‘K”K�KØ—L’L‘N”N�NØ"�G‘GØ"ñ &Ø—’ zÑ2Ô2ð .Ø(,¨Q¨R¨R¬˜˜W™ØŸš °°g´Ñ!>Ñ?Ô?Ð?Ð?ØŸš¨Ñ6Ô6ð 	.ØŸš t¨A¨B¨B¤x§¢Ñ'8Ô'8Ñ9Ô9Ð9Ð9ØŸš¨Ñ/Ô/ð .Ý+9ð Lð L™K˜F CØ%-°Ñ%6˜FØ#Ÿš¨vÑ6Ô6ð LØ,0µ°V±´°°Ô,?  S¡	Ø "§¢¨¸ÀÀSÄ	Ð7JÑ)JÑ KÔ KÐ Køð	Lð ).˜˜Ø˜V’^�^Ø!%�JØ$ð %¨Zð %Ø—I’I˜d‘O”O�OØ—I’I˜eÑ$Ô$Ð$ùØ—l’l‘n”nˆGØð 'Ø—’˜GÑ$Ô$Ð$Ø×'Ò'¨Ñ.Ô.ð 'Ø—K’K Ñ&Ô&Ð&ùØð 	' ð 	'¨L¸MÒ,IÐ,IØ�u˜w‘Ñ&ˆGùàð 1�w×)Ò)¨'Ñ2Ô2ð 1Ø˜w¨Ð0Ñ0ˆØ€DˆÑØ	‡K‚K�M„M€MØð )Ø—k’k !‘n”nˆˆU‰Øð 	)Ø!Ÿ+š+ a™.œ.ˆD�‰Kàð $Ø#ˆˆ[Ñà€Kr+   c                   ó<   — e Zd ZdZd„ Zd„ Zd„ Zd„ Zd„ Zd„ Z	d„ Z
d	S )
Ú	patchmetaa¬  Patched 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.
    c                 óL   — || _         d | _        d | _        d| _        d| _        d S )Ns   MODIFYF)ÚpathÚoldpathÚmodeÚopÚbinary)r]   r½   s     r)   r^   zpatchmeta.__init__c  s)   € ØˆŒ	ØˆŒØˆŒ	ØˆŒØˆŒˆˆr+   c                 ó,   — |dz  }|dz  }||f| _         d S )Ni    é@   )r¿   )r]   r¿   ÚislinkÚisexecs       r)   Úsetmodezpatchmeta.setmodej  s$   € Ø˜‘ˆØ˜‘ˆØ˜VÐ$ˆŒ	ˆ	ˆ	r+   c                 óŽ   — t          | j        ¦  «        }| j        |_        | j        |_        | j        |_        | j        |_        |S rV   )r»   r½   r¾   r¿   rÀ   rÁ   )r]   Úothers     r)   Úcopyzpatchmeta.copyo  s:   € Ý˜$œ)Ñ$Ô$ˆØœˆŒØ”YˆŒ
Ø”7ˆŒØ”{ˆŒØˆr+   c                 óN   — |dk    r| j         dk    S |d| j        p| j        z   k    S )Nó	   /dev/nulló   ADDó   a/)rÀ   r¾   r½   )r]   Úafiles     r)   Ú_ispatchingazpatchmeta._ispatchingaw  s3   € Ø�LÒ Ð Ø”7˜fÒ$Ð$Ø˜ ¤Ð!:°´Ñ;Ò;Ð;r+   c                 ó@   — |dk    r| j         dk    S |d| j        z   k    S )NrË   ó   DELETEó   b/©rÀ   r½   )r]   Úbfiles     r)   Ú_ispatchingbzpatchmeta._ispatchingb|  s,   € Ø�LÒ Ð Ø”7˜iÒ'Ð'Ø˜ ¤	Ñ)Ò)Ð)r+   c                 óV   — |                       |¦  «        o|                      |¦  «        S rV   )rÏ   rÕ   )r]   rÎ   rÔ   s      r)   Ú
ispatchingzpatchmeta.ispatching�  s)   € Ø× Ò  Ñ'Ô'ÐD¨D×,=Ò,=¸eÑ,DÔ,DÐDr+   c                 ó(   — d| j         ›d| j        ›d�S )Nz<patchmeta ú ú>rÓ   r`   s    r)   Ú__repr__zpatchmeta.__repr__„  s   € € Ø&*¤g g g¨t¬y¨y¨yÐ9Ð9r+   N)rg   rh   ri   Ú__doc__r^   rÆ   rÉ   rÏ   rÕ   r×   rÛ   rW   r+   r)   r»   r»   X  sŠ   € € € € € ðð ðð ð ð%ð %ð %ð
ð ð ð<ð <ð <ð
*ð *ð *ð
Eð Eð Eð:ð :ð :ð :ð :r+   r»   c                 ó‚  — d}g }| D �]}|                      d¦  «        }|                     d¦  «        rXt                               |¦  «        }|r;|r|                     |¦  «         |                     d¦  «        }t          |¦  «        }Œ…|�r—|                     d¦  «        r|                     |¦  «         d}Œµ|                     d¦  «        rd|_        |dd…         |_        Œá|                     d	¦  «        r|d
d…         |_	        �Œ|                     d¦  «        rd|_        |d
d…         |_        �Œ4|                     d¦  «        r|dd…         |_	        �ŒZ|                     d¦  «        r	d|_        �Œx|                     d¦  «        r4d|_        | 
                    t          |dd…         d¦  «        ¦  «         �ŒÁ|                     d¦  «        r-| 
                    t          |dd…         d¦  «        ¦  «         �Œ|                     d¦  «        rd|_        �Œ!|r|                     |¦  «         |S )z9extract git-style metadata about patches from <patchname>Nó   
ó   diff --git a/r"   rm   s   rename from ó   RENAMEé   s
   rename to é
   s
   copy from ó   COPYs   copy to é   s   deleted filerÑ   s   new file mode rÌ   iúÿÿÿs	   new mode ó   GIT binary patchT)Úrstripr#   ÚgitreÚmatchr5   Úgroupr»   rÀ   r¾   r½   rÆ   ÚintrÁ   )ÚlrÚgpÚ
gitpatchesr&   rC   Údsts         r)   Úreadgitpatchrï   ˆ  sG  € ð 
€BØ€JØð  !ñ  !ˆØ�{Š{˜7Ñ#Ô#ˆØ�?Š?Ð+Ñ,Ô,ð 	!Ý—’˜DÑ!Ô!ˆAØð $Øð *Ø×%Ò% bÑ)Ô)Ð)Ø—g’g˜a‘j”j�Ý˜s‘^”^�øØñ 	!Ø�Š˜wÑ'Ô'ð Ø×!Ò! "Ñ%Ô%Ð%Ø�ØØ�Š˜Ñ/Ô/ð !Ø!�”Ø! " # #œY�”
�
Ø—’ Ñ/Ô/ð !Ø˜r˜s˜sœ)�”‘Ø—’ Ñ/Ô/ð !Ø�”Ø! " # #œY�”
‘
Ø—’ Ñ-Ô-ð 
!Ø˜q˜r˜rœ(�”‘Ø—’ Ñ1Ô1ð !Ø!�”‘Ø—’Ð!2Ñ3Ô3ð !Ø�”Ø—
’
�3˜t B C Cœy¨!Ñ,Ô,Ñ-Ô-Ð-Ñ-Ø—’ Ñ.Ô.ð !Ø—
’
�3˜t B C Cœy¨!Ñ,Ô,Ñ-Ô-Ð-Ñ-Ø—’Ð!4Ñ5Ô5ð !Ø �”	ùØ	ð Ø×Ò˜"ÑÔÐàÐr+   c                   ó&   — e Zd Zd„ Zd„ Zd„ Zd„ ZdS )Ú
linereaderc                 ó"   — || _         g | _        d S rV   )rD   Úbufr\   s     r)   r^   zlinereader.__init__·  s   € ØˆŒØˆŒˆˆr+   c                 óB   — |�| j                              |¦  «         d S d S rV   )ró   r5   ©r]   r&   s     r)   Úpushzlinereader.push»  s*   € ØÐØŒH�OŠO˜DÑ!Ô!Ð!Ð!Ð!ð Ðr+   c                 óp   — | j         r| j         d         }| j         d= |S | j                             ¦   «         S ©Nr   )ró   rD   rc   re   s     r)   rc   zlinereader.readline¿  s9   € ØŒ8ð 	Ø”˜”ˆAØ”˜�ØˆHØŒw×ÒÑ!Ô!Ð!r+   c                 ó,   — t          | j        d¦  «        S r-   )Úiterrc   r`   s    r)   ra   zlinereader.__iter__Æ  s   € Ý�D”M 3Ñ'Ô'Ð'r+   N)rg   rh   ri   r^   rö   rc   ra   rW   r+   r)   rñ   rñ   µ  sP   € € € € € ðð ð ð"ð "ð "ð"ð "ð "ð(ð (ð (ð (ð (r+   rñ   c                   ó8   — e Zd Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Z	dS )	Úabstractbackendc                 ó   — || _         d S rV   )r}   )r]   r}   s     r)   r^   zabstractbackend.__init__Ë  s   € ØˆŒˆˆr+   c                 ó   — t           ‚)z€Return target file data and flags as a (data, (islink,
        isexec)) tuple. Data is None if file is missing/deleted.
        ©ÚNotImplementedError©r]   Úfnames     r)   Úgetfilezabstractbackend.getfileÎ  s
   € õ "Ð!r+   c                 ó   — t           ‚)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.
        rÿ   ©r]   r  rª   r¿   Ú
copysources        r)   Úsetfilezabstractbackend.setfileÔ  s
   € õ "Ð!r+   c                 ó   — t           ‚)zUnlink target file.rÿ   r  s     r)   r|   zabstractbackend.unlinkÜ  s   € å!Ð!r+   c                 ó   — dS )zŸWrite 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]   r  ÚfailedÚtotalr0   s        r)   Úwriterejzabstractbackend.writerejà  s   € € € r+   c                 ó   — t           ‚rV   rÿ   r  s     r)   Úexistszabstractbackend.existsæ  ó   € Ý!Ð!r+   c                 ó   — t           ‚rV   rÿ   r`   s    r)   r{   zabstractbackend.closeé  r  r+   N)
rg   rh   ri   r^   r  r  r|   r  r  r{   rW   r+   r)   rü   rü   Ê  s}   € € € € € ðð ð ð"ð "ð "ð"ð "ð "ð"ð "ð "ðð ð ð"ð "ð "ð"ð "ð "ð "ð "r+   rü   c                   ó<   ‡ — e Zd Zˆ fd„Zd„ Zd„ Zd„ Zd„ Zd„ Zˆ xZ	S )Ú	fsbackendc                 óŠ   •— t          t          | ¦  «                             |¦  «         t          j        |¦  «        | _        d S rV   )Úsuperr  r^   Úvfsmodr   Úopener)r]   r}   ÚbasedirÚ	__class__s      €r)   r^   zfsbackend.__init__î  s6   ø€ Ý�i˜ÑÔ×'Ò'¨Ñ+Ô+Ð+Ý”j Ñ)Ô)ˆŒˆˆr+   c                 óB  — | j                              |¦  «        r| j                              |¦  «        dfS d}	 | j                              |¦  «        j        dz  dk    }n# t
          $ r Y nw xY w	 | j                              |¦  «        d|ffS # t
          $ r Y dS w xY w)N©TFFrÃ   r   ©NN)r  rÄ   ÚreadlinkÚlstatÚst_modeÚFileNotFoundErrorÚread)r]   r  rÅ   s      r)   r  zfsbackend.getfileò  sÊ   € ØŒ;×Ò˜eÑ$Ô$ð 	@Ø”K×(Ò(¨Ñ/Ô/°Ð?Ð?àˆð	Ø”[×&Ò& uÑ-Ô-Ô5¸Ñ=ÀÒBˆFˆFøÝ ð 	ð 	ð 	ØˆDð	øøøð	Ø”K×$Ò$ UÑ+Ô+¨e°V¨_Ð=Ð=øÝ ð 	ð 	ð 	Ø�:�:ð	øøøs#   º&A! Á!
A.Á-A.Á2B Â
BÂBc                 ó  — |\  }}|€| j                              |||¦  «         d S |r| j                              ||¦  «         d S | j                              ||¦  «         |r| j                              |dd¦  «         d S d S rR   )r  ÚsetflagsÚsymlinkr¥   )r]   r  rª   r¿   r  rÄ   rÅ   s          r)   r  zfsbackend.setfile   sŸ   € Ø‰ˆ�Øˆ<ØŒK× Ò  ¨°Ñ7Ô7Ð7ØˆFØð 	9ØŒK×Ò  eÑ,Ô,Ð,Ð,Ð,àŒK×Ò˜e TÑ*Ô*Ð*Øð 9Ø”×$Ò$ U¨E°4Ñ8Ô8Ð8Ð8Ð8ð9ð 9r+   c                 óv   — | j                              dd¦  «        }| j                             |d|¬¦  «         d S )Ns   experimentals   removeemptydirsT)ÚignoremissingÚrmdir)r}   Ú
configboolr  Ú
unlinkpath)r]   r  r&  s      r)   r|   zfsbackend.unlink  s=   € Ø”×"Ò" ?Ð4FÑGÔGˆØŒ×Ò˜u°DÀÐÑFÔFÐFÐFÐFr+   c                 óè   — |dz   }| j                              t          d¦  «        |||fz  ¦  «         |                      |d¦  «        }|                     |¦  «         |                     ¦   «          d S )Ns   .rejs7   %d out of %d hunks FAILED -- saving rejects to file %s
ó   w)r}   Úwarnr   r  Ú
writelinesr{   )r]   r  r
  r  r0   rD   s         r)   r  zfsbackend.writerej  sv   € Ø˜‘ˆØŒ�ŠÝÐIÑJÔJØ�u˜eÐ$ñ%ñ	
ô 	
ð 	
ð �[Š[˜ Ñ%Ô%ˆØ
�Š�eÑÔÐØ
�Š‰
Œ
ˆ
ˆ
ˆ
r+   c                 ó6   — | j                              |¦  «        S rV   )r  Úlexistsr  s     r)   r  zfsbackend.exists  s   € ØŒ{×"Ò" 5Ñ)Ô)Ð)r+   )
rg   rh   ri   r^   r  r  r|   r  r  Ú__classcell__©r  s   @r)   r  r  í  s†   ø€ € € € € ð*ð *ð *ð *ð *ðð ð ð
9ð 
9ð 
9ðGð Gð Gðð ð ð*ð *ð *ð *ð *ð *ð *r+   r  c                   ó>   ‡ — e Zd Zˆ fd„Zd„ Zˆ fd„Zˆ fd„Zd„ Zˆ xZS )Úworkingbackendc                 óÚ   •— t          t          | ¦  «                             ||j        ¦  «         || _        || _        t          ¦   «         | _        t          ¦   «         | _        g | _	        d S rV   )
r  r2  r^   ÚrootÚrepoÚ
similarityÚsetÚremovedÚchangedÚcopied)r]   r}   r5  r6  r  s       €r)   r^   zworkingbackend.__init__  sT   ø€ Ý�n˜dÑ#Ô#×,Ò,¨R°´Ñ;Ô;Ð;ØˆŒ	Ø$ˆŒÝ‘u”uˆŒÝ‘u”uˆŒØˆŒˆˆr+   c                 óº   — | j         j                             |¦  «        j        s4|                      |¦  «        r!t          t          d¦  «        |z  ¦  «        ‚d S d S ©Ns$   cannot patch %s: file is not tracked)r5  ÚdirstateÚ	get_entryÚany_trackedr  ÚPatchApplicationErrorr   r  s     r)   Ú_checkknownzworkingbackend._checkknown'  ss   € ØŒyÔ!×+Ò+¨EÑ2Ô2Ô>ð 	À4Ç;Â;ØñD
ô D
ð 	õ (ÝÐ9Ñ:Ô:¸UÑBñô ð ð	ð 	ð 	ð 	r+   c                 óø   •— |                       |¦  «         t          t          | ¦  «                             ||||¦  «         |�| j                             ||f¦  «         | j                             |¦  «         d S rV   )rA  r  r2  r  r:  r5   r9  Úadd)r]   r  rª   r¿   r  r  s        €r)   r  zworkingbackend.setfile/  sx   ø€ Ø×Ò˜ÑÔÐÝ�n˜dÑ#Ô#×+Ò+¨E°4¸¸zÑJÔJÐJØÐ!ØŒK×Ò 
¨EÐ2Ñ3Ô3Ð3ØŒ×Ò˜ÑÔÐÐÐr+   c                 óê   •— |                       |¦  «         t          t          | ¦  «                             |¦  «         | j                             |¦  «         | j                             |¦  «         d S rV   )rA  r  r2  r|   r8  rC  r9  )r]   r  r  s     €r)   r|   zworkingbackend.unlink6  sg   ø€ Ø×Ò˜ÑÔÐÝ�n˜dÑ#Ô#×*Ò*¨5Ñ1Ô1Ð1ØŒ×Ò˜ÑÔÐØŒ×Ò˜ÑÔÐÐÐr+   c                 óÄ  — | j         d          }t          | j        ¦  «        }| j        D ]'\  }}t	          j        | j        | j         |||¦  «         Œ(| j        rT|                     t          | j        ¦  «        ¦  «         | j        D ]%}|| j         j
        vr|                     |¦  «         Œ&|r t	          j        | j         || j        ¦  «         t          | j        ¦  «        S rV   )r5  r7  r9  r:  r   Údirstatecopyr}   r8  ÚforgetÚsortedr=  ÚdiscardÚmarktouchedr6  )r]   Úwctxr9  Úsrcrî   Úfs         r)   r{   zworkingbackend.close<  sá   € ØŒy˜ŒˆÝ�d”lÑ#Ô#ˆØœð 	Eð 	E‰HˆC�ÝÔ  ¤¨$¬)°T¸3ÀÑDÔDÐDÐDØŒ<ð 	'Ø�KŠK�˜tœ|Ñ,Ô,Ñ-Ô-Ð-Ø”\ð 'ð '�Ø˜DœIÔ.Ð.Ð.ð
 —O’O AÑ&Ô&Ð&øØð 	EÝÔ ¤	¨7°D´OÑDÔDÐDÝ�d”lÑ#Ô#Ð#r+   )	rg   rh   ri   r^   rA  r  r|   r{   r/  r0  s   @r)   r2  r2    sˆ   ø€ € € € € ðð ð ð ð ðð ð ð ð  ð  ð  ð  ð ð  ð  ð  ð  ð$ð $ð $ð $ð $ð $ð $r+   r2  c                   ó*   — e Zd Zdd„Zdd„Zd„ Zd„ ZdS )Ú	filestoreNc                 óv   — d | _         i | _        d| _        || _        | j        €d| _        d| _        i | _        d S )Nr   i  @ )r  ÚfilesÚcreatedÚmaxsizeÚsizerª   )r]   rS  s     r)   r^   zfilestore.__init__P  s?   € ØˆŒØˆŒ
ØˆŒØˆŒØŒ<ÐØ(ˆDŒLØˆŒ	ØˆŒ	ˆ	ˆ	r+   c                 ó¢  — | j         dk     s t          |¦  «        | j        z   | j         k    r,|||f| j        |<   | xj        t          |¦  «        z  c_        d S | j        €.t          j        d¬¦  «        }t          j        |¦  «        | _        d| j	        z  }| j         
                    ||¦  «         | xj	        dz  c_	        |||f| j        |<   d S )Nr   rs   rt   ó   %dr   )rS  r%   rT  rª   r  r   Úmkdtempr  r   rR  r¥   rQ  )r]   r  rª   r¿   r:  r4  Úfns          r)   r  zfilestore.setfileZ  sÎ   € ØŒ<˜!ÒÐ¥ D¡	¤	¨D¬IÑ 5¸$¼,ÒFÐFØ $ d¨FÐ3ˆDŒI�eÑØˆIŒI�˜T™œÑ"ˆIŒIˆIˆIàŒ{Ð"ÝÔ'¨|Ð<Ñ<Ô<�Ý$œj¨Ñ.Ô.�”à˜œÑ%ˆBØŒK×Ò˜b $Ñ'Ô'Ð'ØˆLŒL˜AÑˆLŒLØ!# T¨6Ð 2ˆDŒJ�uÑÐÐr+   c                 ó®   — || j         v r| j         |         S | j        r	|| j        vrdS | j        |         \  }}}| j                             |¦  «        ||fS )N)NNN)rª   r  rQ  r   )r]   r  rX  r¿   r:  s        r)   r  zfilestore.getfileh  sh   € Ø�D”IÐÐØ”9˜UÔ#Ð#ØŒ{ð 	$˜e¨4¬:Ð5Ð5Ø#Ð#Øœ: eÔ,ÑˆˆD�&ØŒ{×Ò Ñ#Ô# T¨6Ð1Ð1r+   c                 óT   — | j         r t          j        | j         j        ¦  «         d S d S rV   )r  ÚshutilÚrmtreeÚbaser`   s    r)   r{   zfilestore.closep  s1   € ØŒ;ð 	,ÝŒM˜$œ+Ô*Ñ+Ô+Ð+Ð+Ð+ð	,ð 	,r+   rV   )rg   rh   ri   r^   r  r  r{   rW   r+   r)   rO  rO  O  sZ   € € € € € ðð ð ð ð3ð 3ð 3ð 3ð2ð 2ð 2ð,ð ,ð ,ð ,ð ,r+   rO  c                   óB   ‡ — e Zd Zˆ fd„Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Z	ˆ xZ
S )Úrepobackendc                 óÜ   •— t          t          | ¦  «                             |¦  «         || _        || _        || _        t          ¦   «         | _        t          ¦   «         | _        i | _	        d S rV   )
r  r_  r^   r5  ÚctxÚstorer7  r9  r8  r:  )r]   r}   r5  ra  rb  r  s        €r)   r^   zrepobackend.__init__v  sW   ø€ Ý�k˜4Ñ Ô ×)Ò)¨"Ñ-Ô-Ð-ØˆŒ	ØˆŒØˆŒ
Ý‘u”uˆŒÝ‘u”uˆŒØˆŒˆˆr+   c                 óV   — || j         vrt          t          d¦  «        |z  ¦  «        ‚d S r<  )ra  r@  r   r  s     r)   rA  zrepobackend._checkknown  s:   € Ø˜œÐ Ð Ý'ÝÐ9Ñ:Ô:¸UÑBñô ð ð !Ð r+   c                 ó¬   — 	 | j         |         }n# t          j        $ r Y dS w xY w|                     ¦   «         }|                     ¦   «         d|v d|v ffS )Nr  ó   ló   x)ra  r   ÚLookupErrorÚflagsrª   )r]   r  Úfctxrh  s       r)   r  zrepobackend.getfile…  sf   € ð	Ø”8˜E”?ˆDˆDøÝÔ ð 	ð 	ð 	Ø�:�:ð	øøøà—
’
‘”ˆØ�yŠy‰{Œ{˜T U˜]¨D°E¨MÐ:Ð:Ð:s   ‚ �#¢#c                 ó   — |r|                       |¦  «         |€| j        |                              ¦   «         }| j                             ||||¦  «         | j                             |¦  «         |r|| j        |<   d S d S rV   )rA  ra  rª   rb  r  r9  rC  r:  r  s        r)   r  zrepobackend.setfile�  s�   € Øð 	)Ø×Ò˜ZÑ(Ô(Ð(Øˆ<Ø”8˜E”?×'Ò'Ñ)Ô)ˆDØŒ
×Ò˜5 $¨¨jÑ9Ô9Ð9ØŒ×Ò˜ÑÔÐØð 	,Ø!+ˆDŒK˜ÑÐÐð	,ð 	,r+   c                 ód   — |                       |¦  «         | j                             |¦  «         d S rV   )rA  r8  rC  r  s     r)   r|   zrepobackend.unlink—  s2   € Ø×Ò˜ÑÔÐØŒ×Ò˜ÑÔÐÐÐr+   c                 ó   — || j         v S rV   )ra  r  s     r)   r  zrepobackend.exists›  s   € Ø˜œÐ Ð r+   c                 ó    — | j         | j        z  S rV   )r9  r8  r`   s    r)   r{   zrepobackend.closež  s   € ØŒ|˜dœlÑ*Ð*r+   )rg   rh   ri   r^   rA  r  r  r|   r  r{   r/  r0  s   @r)   r_  r_  u  s’   ø€ € € € € ðð ð ð ð ðð ð ð;ð ;ð ;ð,ð ,ð ,ð ð  ð  ð!ð !ð !ð+ð +ð +ð +ð +ð +ð +r+   r_  s*   @@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@s.   (?:---|\*\*\*) (\d+)(?:,(\d+))? (?:---|\*\*\*))ó   strictó   crlfó   lfó   autoc                   ó:   — e Zd Zd
d„Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Z	d	S )Ú	patchfilern  c                 ó   — |j         | _        || _        d | _        || _        || _        g | _        d| _        d| _        |j	        | _	        |j
        | _        |j        dv | _        |j        dk    | _        | j        €|                     | j        ¦  «        \  }}n%|                     | j        ¦  «        d d…         \  }}|�ÿ| j        d u p|                     | j        ¦  «        | _        d| _        |rt!          j        |¦  «        | _        | j	        €|| _	        | j        rŸ| j        d                              d¦  «        rd| _        n'| j        d                              d¦  «        rd| _        |d	k    rJg }| j        D ]9}	|	                     d¦  «        r|	d d
…         dz   }	|                     |	¦  «         Œ:|| _        n| j        rd| _        | j	        €d| _	        | j        rV| j                             t+          d¦  «        | j        z  ¦  «         | j                             t+          d¦  «        ¦  «         i | _        d| _        d| _        d| _        g | _        d| _        |                      d¦  «         d| _        d S )NFT)rÌ   rã   rà   rÑ   r"   r   rÞ   r†   rn  éþÿÿÿ)FFs!   unable to find '%s' for patching
sB   (use '--prefix' to apply patch relative to the current directory)
)r½   r  ÚeolmodeÚeolÚbackendr}   r0   r  Úmissingr¿   r¾   r  rÀ   ÚcreateÚremover  r   Úsplitnewlinesr§   r5   r+  r   ÚhashÚdirtyÚoffsetÚskewÚrejÚfileprintedÚ	printfileÚhunks)
r]   r}   rì   rx  rb  rv  rª   r¿   Únlinesr(   s
             r)   r^   zpatchfile.__init__©  sz  € Ø”WˆŒ
ØˆŒØˆŒØˆŒØˆŒØˆŒ
ØˆŒØˆŒØ”GˆŒ	Øœ*ˆŒØ”eÐ;Ð;ˆŒØ”e˜yÒ(ˆŒØŒ?Ð"Ø Ÿš¨¬Ñ4Ô4‰JˆD�$�$àŸš t¤Ñ7Ô7¸¸¸Ô;‰JˆD�$ØÐØœ/¨TÐ1ÐO°W·^²^ÀDÄJÑ5OÔ5OˆDŒKØ ˆDŒLØð 7Ý"Ô0°Ñ6Ô6�”
ØŒyÐ Ø �”	ØŒzð (à”:˜a”=×)Ò)¨'Ñ2Ô2ð %Ø&�D”H�HØ”Z ”]×+Ò+¨EÑ2Ô2ð %Ø$�D”HØ˜iÒ'Ð'Ø�FØ!œZð )ð )˜ØŸ:š: gÑ.Ô.ð /Ø ! # 2 #¤¨¡˜AØŸš aÑ(Ô(Ð(Ð(Ø!'�D”JøàŒ{ð %Ø$�”ØŒyÐ Ø*�”	ØŒ<ð 	ØŒG�LŠL�Ð@ÑAÔAÀDÄJÑNÑOÔOÐOØŒG�LŠLÝð,ñô ñô ð ð ˆŒ	ØˆŒ
ØˆŒØˆŒ	ØˆŒØ ˆÔØ�Š�uÑÔÐØˆŒ
ˆ
ˆ
r+   c                 ó`  — | j         dk    r| j        }n| j         dk    rd}nd}| j         dk    rJ|rH|dk    rBg }|D ];}|r"|                     d¦  «        r|d d…         |z   }|                     |¦  «         Œ<|}| j                             |d                     |¦  «        || j        ¦  «         d S )Nrq  ro  rÞ   r†   rn  éÿÿÿÿr+   )rv  rw  r§   r5   rx  r  r/   r  )r]   r  r0   r¿   rw  Úrawlinesr(   s          r)   r,  zpatchfile.writelineså  sÓ   € ØŒ<˜7Ò"Ð"Ø”(ˆCˆCØŒ\˜WÒ$Ð$ØˆCˆCàˆCàŒ<˜9Ò$Ð$¨Ð$°¸²°ØˆHØð #ð #�Øð %˜Ÿš EÑ*Ô*ð %Ø˜#˜2˜#œ ™�AØ—’ Ñ"Ô"Ð"Ð"ØˆEàŒ×Ò˜U C§H¢H¨U¡O¤O°T¸4¼?ÑKÔKÐKÐKÐKr+   c                 óà   — | j         rd S |s| j        j        rd| _         t          d¦  «        | j        z  }|r| j                             |¦  «         d S | j                             |¦  «         d S )NTs   patching file %s
)r‚  r}   Úverboser   r  r+  Únote)r]   r+  Úss      r)   rƒ  zpatchfile.printfile÷  st   € ØÔð 	ØˆFØð 	$�4”7”?ð 	$Ø#ˆDÔÝÐ#Ñ$Ô$ t¤zÑ1ˆØð 	ØŒG�LŠL˜‰OŒOˆOˆOˆOàŒG�LŠL˜‰OŒOˆOˆOˆOr+   c                 ó–   ‡— | j                              |g ¦  «        }t          |¦  «        dk    r|                     ˆfd„¬¦  «         |S )Nr   c                 ó(   •— t          | ‰z
  ¦  «        S rV   )Úabs)ÚxÚlinenums    €r)   ú<lambda>z%patchfile.findlines.<locals>.<lambda>
  s   ø€ ¥C¨¨G©Ñ$4Ô$4€ r+   )r¹   )r}  Úgetr%   Úsort)r]   r(   r‘  Úcands     ` r)   Ú	findlineszpatchfile.findlines  sL   ø€ ð
 Œy�}Š}˜Q Ñ#Ô#ˆÝˆt‰9Œ9�qŠ=ˆ=à�IŠIÐ4Ð4Ð4Ð4ˆIÑ5Ô5Ð5Øˆr+   c                 ó”  — | j         sd S t          j                             | j        ¦  «        }d||fz  g}| j         D ]Q}|j        D ]G}|                     |¦  «         |dd …         dk    r"|                     dt          j        z   ¦  «         ŒHŒR| j	         
                    | j        t          | j         ¦  «        | j        |¦  «         d S )Ns   --- %s
+++ %s
r‡  r†   )r�  rx   r½   Úbasenamer  Úhunkr5   r   ÚMISSING_NEWLINE_MARKERrx  r  r%   r„  )r]   r]  r0   r�  r(   s        r)   Ú	write_rejzpatchfile.write_rej  sÒ   € ð
 Œxð 	ØˆFÝŒw×Ò ¤
Ñ+Ô+ˆØ$¨¨d |Ñ3Ð4ˆØ”ð 	Lð 	LˆAØ”Vð Lð L�Ø—’˜Q‘”�Ø�R�S�S”6˜U’?�?Ø—L’L ­Ô)JÑ!JÑKÔKÐKøðLð 	Œ×Ò˜dœj­#¨d¬h©-¬-¸¼ÀUÑKÔKÐKÐKÐKr+   c           
      óT
  — |                      ¦   «         s]t          t          d¦  «        |j        |j        t          |j        ¦  «        |j        t          |j        ¦  «        |j	        fz  ¦  «        ‚| xj
        dz  c_
        | j        r| j                             |¦  «         dS | j        r‰| j        r‚| j        r0| j                             t          d¦  «        | j        z  ¦  «         n/| j                             t          d¦  «        | j        z  ¦  «         | j                             |¦  «         dS t)          |t*          ¦  «        rs| j        r | j                             | j        ¦  «         nJ|                     | j        ¦  «        }|| j        d d …<   | xj        t          |¦  «        z  c_        d| _        dS |}| j        dv s| j        d	k    r| j        r|                     ¦   «         }|                      dd
¦  «        \  }}}}|| j        z  }|}| j!        dk    r”tE          j#        || j        |¦  «        ry| j        r | j                             | j        ¦  «         nP|| j        ||t          |¦  «        z   …<   | xj        t          |¦  «        t          |¦  «        z
  z  c_        d| _        dS i | _$        tK          | j        ¦  «        D ]3\  }	}
| j$         &                    |
g ¦  «                             |	¦  «         Œ4tO          | j         (                    dd¦  «        dz   ¦  «        D �]˜}dD �]‘}|                      ||¦  «        \  }}}}|| j        z   | j!        z   }tS          |t          | j        ¦  «        ¦  «        }|r%|  *                    |d         dd …         |¦  «        }n|g}|D �]}|rtE          j#        || j        |¦  «        rñ|| j        ||t          |¦  «        z   …<   | xj        t          |¦  «        t          |¦  «        z
  z  c_        ||z
  | _!        d| _        ||z
  |z
  }|rNt          d¦  «        }|  +                    d¦  «         | j                             ||j        |dz   ||fz  ¦  «         n7t          d¦  «        }| j         ,                    ||j        |dz   |fz  ¦  «         |c c c S �Œ�Œ“�Œš|  +                    d¦  «         | j                             t          d¦  «        |j        |fz  ¦  «         | j                             |¦  «         dS )Ns   bad hunk #%d %s (%d %d %d %d)r   r‡  s-   cannot create %s: destination already exists
s   file %s already exists
Tr   )ro  rp  rq  Fó   patchs   fuzzr  s9   Hunk #%d succeeded at %d with fuzz %d (offset %d lines).
s,   Hunk #%d succeeded at %d (offset %d lines).
s   Hunk #%d FAILED at %d
)-ÚcompleteÚPatchParseErrorr   ÚnumberÚdescr%   ÚaÚlenaÚbÚlenbr„  ry  r�  r5   r  rz  r  r}   r+  r  Ú
isinstanceÚbinhunkr{  rx  r|   Únewr0   r  r~  rv  rw  ÚgetnormalizedÚfuzzitr€  r   Útesthunkr}  Ú	enumerateÚ
setdefaultÚrangeÚ	configintÚminr–  rƒ  r‹  )r]   rŒ   r(   ÚhorigÚoldÚoldstartr¨  ÚnewstartÚ
orig_startr�  rŒ  ÚfuzzlenÚtoponlyr•  r  r«   s                   r)   Úapplyzpatchfile.apply  s@  € Ø�zŠz‰|Œ|ð 	Ý!ÝÐ2Ñ3Ô3Ø”8˜QœV¥S¨¬¡X¤X¨q¬vµs¸1¼3±x´xÀÄÐHñIñô ð ð
 	ˆ
Œ
�a‰ˆ
Œ
àŒ<ð 	ØŒH�OŠO˜AÑÔÐØ�2àŒ;ð 		˜4œ;ð 		ØŒð JØ”—’ÝÐGÑHÔHØ”jñ!ñô ð ð ð
 ”—’�QÐ:Ñ;Ô;¸d¼jÑHÑIÔIÐIØŒH�OŠO˜AÑÔÐØ�2å�a�Ñ!Ô!ð 	ØŒ{ð "Ø”×#Ò# D¤JÑ/Ô/Ð/Ð/à—E’E˜$œ*Ñ%Ô%�Ø !�”
˜1˜1˜1‘Ø�”�s 1™vœvÑ%�”Ø!�”
Ø�1àˆàŒLÐ,Ð,Ð,ØŒ|˜wÒ&Ð&Ø”ð 'ð —’Ñ!Ô!ˆAð ()§x¢x°°5Ñ'9Ô'9Ñ$ˆˆX�s˜HØ�D”KÑˆØˆ
ð Œ9˜Š>ˆ>�jÔ1°#°t´zÀ8ÑLÔLˆ>ØŒ{ð "Ø”×#Ò# D¤JÑ/Ô/Ð/Ð/à=@�”
˜8 hµ°S±´Ñ&9Ð9Ñ:Ø�”�s 3™xœx­#¨c©(¬(Ñ2Ñ2�”Ø!�”
Ø�1ð ˆŒ	Ý˜dœjÑ)Ô)ð 	2ð 	2‰DˆAˆqØŒI× Ò   BÑ'Ô'×.Ò.¨qÑ1Ô1Ð1Ð1å˜TœW×.Ò.¨x¸ÑAÔAÀAÑEÑFÔFð #	'ñ #	'ˆGØ(ð "'ñ "'�Ø/0¯xªx¸ÀÑ/IÔ/IÑ,��X˜s HØ# d¤kÑ1°D´IÑ=�Ý˜x­¨T¬Z©¬Ñ9Ô9�Øð &ØŸ>š>¨#¨a¬&°°°¬*°hÑ?Ô?�D�Dð %˜:�Dàð 'ñ '�AØð '¥*Ô"5°c¸4¼:ÀqÑ"IÔ"Ið 'Ø7:˜œ
 1 q­3¨s©8¬8¡|Ð#3Ñ4Ø˜œ¥s¨3¡x¤xµ#°c±(´(Ñ':Ñ:˜œØ$%¨
¡N˜œ	Ø%)˜œ
Ø!" Z¡°'Ñ!9˜Ø"ð JÝ"#ð!8ñ#ô #˜Cð
 !ŸNšN¨4Ñ0Ô0Ð0Ø œGŸLšLØ # q¤x°°Q±¸ÀÐ&HÑ Hñô ð ð õ #$ð!8ñ#ô #˜Cð !œGŸLšL¨°´¸!¸a¹%ÀÐ/HÑ)HÑIÔIÐIØ&˜˜˜˜˜˜˜ñ-'ñ'ñ"'ðF 	�Š�tÑÔÐØŒ�Š•QÐ1Ñ2Ô2°a´hÀ
Ð5KÑKÑLÔLÐLØŒ�Š˜ÑÔÐØˆrr+   c                 ó¬   — | j         r&|                      | j        | j        | j        ¦  «         |                      ¦   «          t          | j        ¦  «        S rV   )r~  r,  r  r0   r¿   r›  r%   r�  r`   s    r)   r{   zpatchfile.closeˆ  sF   € ØŒ:ð 	?Ø�OŠO˜DœJ¨¬
°D´IÑ>Ô>Ð>Ø�ŠÑÔÐÝ�4”8‰}Œ}Ðr+   N)rn  )
rg   rh   ri   r^   r,  rƒ  r–  r›  r¸  r{   rW   r+   r)   rs  rs  ¨  s�   € € € € € ð:ð :ð :ð :ðxLð Lð Lð$	ð 	ð 	ð	ð 	ð 	ðLð Lð Lð ið ið iðVð ð ð ð r+   rs  c                   ó  — e Zd ZdZ ej        d¦  «        Z ej        d¦  «        Z ej        d¦  «        Z ej        d¦  «        Z	 ej        d¦  «        Z
 ej        d¦  «        Zd„ Zd	„ Zd
„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ ZdS )r¸   zpatch headers   diff --git a/(.*) b/(.*)$s   diff -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 | _        d S rV   )r¸   r„  )r]   r¸   s     r)   r^   zheader.__init__™  s   € ØˆŒØˆŒ
ˆ
ˆ
r+   c                 ó>   — t          d„ | j        D ¦   «         ¦  «        S )Nc              3   ó@   K  — | ]}|                      d ¦  «        V — ŒdS )ó   index N©r#   rŠ   s     r)   r�   z header.binary.<locals>.<genexpr>ž  s.   è è € Ð@Ð@¨q�1—<’< 	Ñ*Ô*Ð@Ð@Ð@Ð@Ð@Ð@r+   ©Úanyr¸   r`   s    r)   rÁ   zheader.binary�  s!   € ÝÐ@Ð@°D´KÐ@Ñ@Ô@Ñ@Ô@Ð@r+   c           	      óf  — | j         D �]'}|                     d¦  «        r%|                     t          d¦  «        ¦  «          d S | j                             |¦  «        rN|                     |¦  «         |                      ¦   «         r"|                     t          d¦  «        ¦  «          d S |                     d¦  «        rX|                     t          d¦  «        t          | j        ¦  «        t          d„ | j        D ¦   «         ¦  «        fz  ¦  «          d S |                     |¦  «         �Œ)d S )Nr¾  s-   this modifies a binary file (all or nothing)
s   this is a binary file
r“   s   %d hunks, %d lines changed
c                 óB   — g | ]}t          |j        |j        ¦  «        ‘ŒS rW   )ÚmaxÚaddedr8  rŠ   s     r)   ú
<listcomp>z!header.pretty.<locals>.<listcomp>¯  s&   € ÐIÐIÐI¸�S ¤¨!¬)Ñ4Ô4ÐIÐIÐIr+   )
r¸   r#   r¥   r   Ú	pretty_rerè   rÁ   r%   r„  Úsum)r]   rD   rŒ   s      r)   Úprettyzheader.pretty   s-  € Ø”ð 	ñ 	ˆAØ�|Š|˜IÑ&Ô&ð Ø—’�ÐLÑMÔMÑNÔNÐNØ��ØŒ~×#Ò# AÑ&Ô&ð Ø—’˜‘”�Ø—;’;‘=”=ð <Ø—H’H�QÐ9Ñ:Ô:Ñ;Ô;Ð;Ø��Ø�|Š|˜FÑ#Ô#ð Ø—’ÝÐ5Ñ6Ô6å˜DœJ™œÝÐIÐI¸d¼jÐIÑIÔIÑJÔJðññô ð ð ��Ø�HŠH�Q‰KŒKˆK‰Kð%	ð 	r+   c                 ó`   — |                      d                     | j        ¦  «        ¦  «         d S r-   )r¥   r/   r¸   r\   s     r)   r¥   zheader.writeµ  s(   € Ø
�Š�—’˜$œ+Ñ&Ô&Ñ'Ô'Ð'Ð'Ð'r+   c                 óD   ‡ — t          ˆ fd„‰ j        D ¦   «         ¦  «        S )Nc              3   óL   •K  — | ]}‰j                              |¦  «        V — Œd S rV   )Úallhunks_rerè   ©r‹   rŒ   r]   s     €r)   r�   z"header.allhunks.<locals>.<genexpr>¹  s4   øè è € ÐBÐB°�4Ô#×)Ò)¨!Ñ,Ô,ÐBÐBÐBÐBÐBÐBr+   rÀ  r`   s   `r)   Úallhunkszheader.allhunks¸  s(   ø€ ÝÐBÐBÐBÐB°d´kÐBÑBÔBÑBÔBÐBr+   c                 ó  — | j                              | j        d         ¦  «        }|r$|                     ¦   «         \  }}||k    r|gS ||gS | j                             | j        d         ¦  «                             ¦   «         S rø   )Ú
diffgit_rerè   r¸   ÚgroupsÚdiff_re)r]   rè   ÚfromfileÚtofiles       r)   rQ  zheader.files»  s}   € Ø”×%Ò% d¤k°!¤nÑ5Ô5ˆØð 	?Ø$Ÿ|š|™~œ~ÑˆH�fØ˜6Ò!Ð!Ø �zÐ!Ø˜fÐ%Ð%à”<×%Ò% d¤k°!¤nÑ5Ô5×<Ò<Ñ>Ô>Ð>r+   c                 ó6   — |                       ¦   «         d         S )Nr‡  )rQ  r`   s    r)   Úfilenamezheader.filenameÅ  s   € Ø�zŠz‰|Œ|˜BÔÐr+   c                 ó�   — dd                      t          j        t          j        |                      ¦   «         ¦  «        ¦  «        z  S )Nz<header %s>rÙ   )r/   r   ÚrapplyÚfsdecoderQ  r`   s    r)   rÛ   zheader.__repr__È  s5   € ØØ�HŠH•X”_¥XÔ%6¸¿
º
¹¼ÑEÔEÑFÔFñ
ð 	
r+   c                 óD   ‡ — t          ˆ fd„‰ j        D ¦   «         ¦  «        S )Nc              3   óL   •K  — | ]}‰j                              |¦  «        V — Œd S rV   )Ú
newfile_rerè   rÎ  s     €r)   r�   z#header.isnewfile.<locals>.<genexpr>Î  s3   øè è € ÐAÐA°�4”?×(Ò(¨Ñ+Ô+ÐAÐAÐAÐAÐAÐAr+   rÀ  r`   s   `r)   Ú	isnewfilezheader.isnewfileÍ  s(   ø€ ÝÐAÐAÐAÐA°T´[ÐAÑAÔAÑAÔAÐAr+   c                 ó¤   ‡ — t          ‰ j        ¦  «        dk    }‰                      ¦   «         o|}|pt          ˆ fd„‰ j        D ¦   «         ¦  «        S )Nr"   c              3   óL   •K  — | ]}‰j                              |¦  «        V — Œd S rV   )Ú
special_rerè   rÎ  s     €r)   r�   z!header.special.<locals>.<genexpr>Ú  sD   øè è € ð #
ð #
Ø)*ˆDŒO×!Ò! !Ñ$Ô$ð#
ð #
ð #
ð #
ð #
ð #
r+   )r%   r¸   rÞ  rÁ  )r]   Ú	nocontentÚemptynewfiles   `  r)   Úspecialzheader.specialÐ  sn   ø€ õ ˜œÑ$Ô$¨Ò)ˆ	Ø—~’~Ñ'Ô'Ð5¨IˆØð 
�sð #
ð #
ð #
ð #
Ø.2¬kð#
ñ #
ô #
ñ  
ô  
ð 	
r+   N)rg   rh   ri   rÜ   r”   r•   rÑ  rÓ  rÍ  rÇ  rá  rÝ  r^   rÁ   rÉ  r¥   rÏ  rQ  r×  rÛ   rÞ  rä  rW   r+   r)   r¸   r¸   �  s%  € € € € € ØÐà�”Ð8Ñ9Ô9€JØˆbŒjÐ,Ñ-Ô-€GØ�"”*Ð7Ñ8Ô8€KØ�”
Ð8Ñ9Ô9€IØ�”ÐFÑGÔG€JØ�”Ð=Ñ>Ô>€Jðð ð ðAð Að Aðð ð ð*(ð (ð (ðCð Cð Cð?ð ?ð ?ð ð  ð  ð
ð 
ð 
ð
Bð Bð Bð
ð 
ð 
ð 
ð 
r+   r¸   c                   ód   — e Zd ZdZ	 dd„Zd„ Zd„ Zd„ Zd„ Zd„ Z	e	Z
d	„ Zej        d
„ ¦   «         ZdS )Ú
recordhunkzKpatch hunk

    XXX shouldn't we merge this with the other hunk class?
    Nc	                 ó  ‡— dˆfd„	}	|| _          |	|d¦  «        \  }
| _        ||
z   | _        ||
z   | _         |	|d¦  «        \  }| _        || _        || _        |                      | j        ¦  «        \  | _        | _	        d S )NFc                 ót   •— ‰�2t          | ¦  «        ‰z
  }|dk    r|r|| |d …         fS || d ‰…         fS d| fS rø   ©r%   )r0   ÚreverseÚdeltaÚ
maxcontexts      €r)   Útrimcontextz(recordhunk.__init__.<locals>.trimcontextð  sZ   ø€ ØÐ%Ý˜E™
œ
 ZÑ/�Ø˜1’9�9Øð 9Ø$ e¨E¨F¨F¤mÐ3Ð3à$ e¨K¨Z¨KÔ&8Ð8Ð8Ø�e�8ˆOr+   T)F)
r¸   ÚbeforeÚfromlineÚtolineÚafterÚprocr™  ÚcountchangesrÅ  r8  )r]   r¸   rï  rð  rò  rî  r™  rñ  rì  rí  ÚtrimedbeforeÚ_trimedafters           `   r)   r^   zrecordhunk.__init__å  s¢   ø€ ð	ð 	ð 	ð 	ð 	ð 	ð ˆŒØ$/ K°¸Ñ$=Ô$=Ñ!ˆ�d”kØ  <Ñ/ˆŒØ˜|Ñ+ˆŒØ#. ;¨u°eÑ#<Ô#<Ñ ˆ�d”jØˆŒ	ØˆŒ	Ø#'×#4Ò#4°T´YÑ#?Ô#?Ñ ˆŒ
�D”L�L�Lr+   c                 óø   — t          |t          ¦  «        sdS |j        | j        k    oS|j        | j        k    oC| j        |j        k    o3| j                             ¦   «         |j                             ¦   «         k    S )NF)r¦  ræ  r™  rò  rï  r¸   rQ  )r]   Úvs     r)   Ú__eq__zrecordhunk.__eq__  sw   € Ý˜!�ZÑ(Ô(ð 	Ø�5ð ŒV�t”yÒ ð :Ø”˜4œ9Ò$ð:à” !¤*Ò,ð:ð ”×"Ò"Ñ$Ô$¨¬¯ªÑ(8Ô(8Ò8ð		
r+   c                 ó¨   — t          t          | j        ¦  «        t          | j                             ¦   «         ¦  «        | j        | j        f¦  «        S rV   )r}  Útupler™  r¸   rQ  rï  rò  r`   s    r)   Ú__hash__zrecordhunk.__hash__  sI   € Ýå�d”iÑ Ô Ý�d”k×'Ò'Ñ)Ô)Ñ*Ô*Ø”Ø”	ð	ñ
ô 
ð 	
r+   c                 ón   — t          d„ |D ¦   «         ¦  «        }t          d„ |D ¦   «         ¦  «        }||fS )zhunk -> (n+,n-)c                 ó<   — g | ]}|                      d ¦  «        ¯|‘ŒS )r    r¿  rŠ   s     r)   rÆ  z+recordhunk.countchanges.<locals>.<listcomp>  ó)   € Ð9Ð9Ð9˜ a§l¢l°4Ñ&8Ô&8Ð9�1Ð9Ð9Ð9r+   c                 ó<   — g | ]}|                      d ¦  «        ¯|‘ŒS )r   r¿  rŠ   s     r)   rÆ  z+recordhunk.countchanges.<locals>.<listcomp>  rþ  r+   ré  )r]   r™  rC  Úrems       r)   ró  zrecordhunk.countchanges  sC   € åÐ9Ð9˜dÐ9Ñ9Ô9Ñ:Ô:ˆÝÐ9Ð9˜dÐ9Ñ9Ô9Ñ:Ô:ˆØ�Cˆxˆr+   c           	      óœ   ‡— ddddœŠˆfd„| j         D ¦   «         }t          | j        | j        | j        | j        | j        || j        ¦  «        S )zëreturn 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.
        r   r    ó   \)r    r   r  c                 óJ   •— g | ]}d ‰|dd…                  |dd…         fz  ‘Œ S )s   %s%sr   r   NrW   )r‹   r(   rC   s     €r)   rÆ  z*recordhunk.reversehunk.<locals>.<listcomp>&  s7   ø€ Ð@Ð@Ð@°�˜1˜Q˜q ˜sœVœ9 a¨¨¨¤eÐ,Ñ,Ð@Ð@Ð@r+   )r™  ræ  r¸   rð  rï  rò  rî  rñ  )r]   r™  rC   s     @r)   Úreversehunkzrecordhunk.reversehunk  sb   ø€ ð ˜t¨EÐ2Ð2ˆØ@Ð@Ð@Ð@°d´iÐ@Ñ@Ô@ˆÝØŒKØŒKØŒMØŒIØŒKØØŒJñ
ô 
ð 	
r+   c           	      ó´  — t          | j        ¦  «        t          | j        ¦  «        z   }| j        r | j        d         t          j        k    r|dz  }|| j        z   }|| j        z   }|                     d| j        || j	        || j
        o	d| j
        z   fz  ¦  «         |                     d                     | j        | j        z   | j        z   ¦  «        ¦  «         d S )Nr‡  r   s   @@ -%d,%d +%d,%d @@%s
r   r+   )r%   rî  rñ  r   rš  r8  rÅ  r¥   rï  rð  rò  r/   r™  )r]   rD   rë  ÚfromlenÚtolens        r)   r¥   zrecordhunk.write1  sÖ   € Ý�D”KÑ Ô ¥3 t¤z¡?¤?Ñ2ˆØŒ:ð 	˜$œ* Rœ.­JÔ,MÒMÐMØ�Q‰JˆEØ˜$œ,Ñ&ˆØ˜œ
Ñ"ˆØ
�ŠØ&à”ØØ”ØØ”	Ð0˜t d¤iÑ/ðññ		
ô 		
ð 		
ð 	�Š�—’˜$œ+¨¬	Ñ1°D´JÑ>Ñ?Ô?Ñ@Ô@Ð@Ð@Ð@r+   c                 ó4   — | j                              ¦   «         S rV   )r¸   r×  r`   s    r)   r×  zrecordhunk.filenameE  s   € ØŒ{×#Ò#Ñ%Ô%Ð%r+   c                 ó>   — d|                       ¦   «         | j        fz  S )Ns   <hunk %r@%d>)r×  rï  r`   s    r)   rÛ   zrecordhunk.__repr__H  s   € à $§-¢-¡/¤/°4´=Ð!AÑAÐAr+   rV   )rg   rh   ri   rÜ   r^   rø  rû  ró  r  r¥   rÉ  r×  r   Ú	strmethodrÛ   rW   r+   r)   ræ  ræ  ß  sÃ   € € € € € ðð ð ð@ð @ð @ð @ð<	
ð 	
ð 	
ð
ð 
ð 
ðð ð ð
ð 
ð 
ð&Að Að Að$ €Fð&ð &ð &ð ÔðBð Bñ ÔðBð Bð Br+   ræ  c                  ód  — t          d¦  «        t          d¦  «        t          d¦  «        t          d¦  «        dœt          d¦  «        t          d¦  «        t          d¦  «        t          d	¦  «        dœt          d
¦  «        t          d¦  «        t          d¦  «        t          d¦  «        dœdœS )Ns   apply change %d/%d to '%s'?s   discard change %d/%d to '%s'?s   keep change %d/%d to '%s'?s   record change %d/%d to '%s'?)s   applys   discards   keepó   records   apply this change to '%s'?s   discard this change to '%s'?s   keep this change to '%s'?s   record 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))ó   multipleó   singleó   helpr   rW   r+   r)   Úgetmessagesr  M  sä   € õ Ð6Ñ7Ô7ÝÐ:Ñ;Ô;ÝÐ4Ñ5Ô5ÝÐ8Ñ9Ô9ð	
ð 
õ Ð5Ñ6Ô6ÝÐ9Ñ:Ô:ÝÐ3Ñ4Ô4ÝÐ7Ñ8Ô8ð	
ð 
õ ð	(ñô õ ð	(ñô õ ð	(ñô õ ð	(ñô ðK1
ð 1
ð?ð ?ð ?r+   c                 ód  ‡ ‡‡‡— t          ¦   «         Š‰€dŠˆˆˆ fd„}t          ¦   «         }i }d\  }}dt          d„ |D ¦   «         ¦  «        }
}	|D �]²}|	t          |j        ¦  «        z  }	d}d}d                     |j        ¦  «        }||v rŒ=|                     |¦  «         |€|                     ‰ ¦  «         | 	                    ¦   «         }t          d	¦  «        t          d
¦  «                             d„ |D ¦   «         ¦  «        z  }t          ˆfd„|D ¦   «         ¦  «        rd\  }}}n ||||d¦  «        \  }}}}|sŒñ|g||                     ¦   «         <   |                     ¦   «         r)||                     ¦   «         xx         |j        z  cc<   �ŒFt          |j        ¦  «        D �]V\  }}|€|€|                     ‰ ¦  «         |
dk    r$‰d         ‰         |                     ¦   «         z  }n@|	t          |j        ¦  «        z
  |z   }‰d         ‰         ||
|                     ¦   «         fz  } |||||¦  «        \  }}}}|rT|r$t          j        |¦  «        }|xj        |z  c_        ||                     ¦   «                                       |¦  «         Œò|�P|D ]K}|j        D ]A}|r|xj        |z  c_        ||                     ¦   «                                       |¦  «         ŒBŒL�ŒD||j        |j        z
  z  }�ŒX�Œ´t          d„ |                     ¦   «         D ¦   «         g ¦  «        i fS )z:Interactively filter patch chunks into applied-only chunksNr  c                 ó¬  •— d}|�|| ||fS | �| | ||fS 	 ‰d         ‰         }‰                      d||fz  ¦  «        }‰                     d¦  «         |dk    rN‰                     |¦  «        d         D ]1\  }}‰                     d|t          j        |¦  «        fz  ¦  «         Œ2Œ’|d	k    rd}	�n |dk    rd
}	�n|dk    �r¼|€8‰                     t          d¦  «        ¦  «         ‰                     d¦  «         Œç|j                             ¦   «         r9‰                     t          d¦  «        ¦  «         ‰                     d¦  «         �Œ9dt          d¦  «        z   }
t          j	        dd¬¦  «        \  }}d}	 t          j        t          j        |d¦  «        ¦  «        }|j                             |¦  «         |                     |¦  «         |                     d                     d„ |
                     ¦   «         D ¦   «         ¦  «        ¦  «         |                     ¦   «          ‰                     ¦   «         }‰                     d||fz  d‰                     ¦   «         id¬¦  «        }	|	d	k    r=‰                     t          d¦  «        |	z  ¦  «         	 t          j        |¦  «         ~�Œ�t-          |d¦  «        }t/          ¦   «         }|D ]@}t          j        |¦  «        }|                     d¦  «        s|                     |¦  «         ŒA|                     ¦   «          |                     d	¦  «         t7          |¦  «        }t          j        |¦  «         ~n# t          j        |¦  «         ~w xY wd
}	nS|dk    rd
x}	} nH|dk    rdx}	} n=|dk    rd
x}	}n2|d k    rdx}	}n'|d!k    r!t9          j        t          d"¦  «        ¦  «        ‚|	| ||fS )#zÙprompt 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) %sr†   rä   r   s   %s - %s
r   Fr"   s    cannot edit patch for whole files!   cannot edit patch for binary filer“   s®  
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)ru   Úsuffixrv   r+   c                 ó   — g | ]
}d |z   dz   ‘ŒS )r’   r†   rW   )r‹   Úis     r)   rÆ  z/filterpatch.<locals>.prompt.<locals>.<listcomp>×  s!   € ÐKÐKÐK°1˜U Q™Y¨Ñ.ÐKÐKÐKr+   s   %s "%s"s   HGUSERs   filterpatch)ÚenvironÚ
blockedtags    editor exited with exit code %d
Úrbó   #é   é   é   é   r�   s	   user quit)Úpromptchoicer¥   Úextractchoicesr   ro   r   r¸   rÁ   r   rw   r   Únativeeolwriterrx   ry   r/   r¢   r{   Ú	geteditorÚsystemÚusernamer+  r|   r	   r.   Úfromnativeeolr#   rB   Ú
parsepatchr   ÚCanceledError)ÚskipfileÚskipallÚqueryr1   Ú
newpatchesÚrespsÚrr;   ÚtÚretÚphelpÚpatchfdÚpatchfnÚ	ncpatchfprM  ÚeditorÚpatchfpr&   ÚmessagesÚ	operationr}   s                     €€€r)   Úpromptzfilterpatch.<locals>.prompt—  s%  ø€ ð ˆ
ØÐØ˜H g¨zÐ9Ð9ØÐØ˜X w°
Ð:Ð:ðY	6Ø˜WÔ% iÔ0ˆEð —’Ð <ÀÀu¸~Ñ MÑNÔNˆAØ�HŠH�U‰OŒOˆOØ�AŠvˆvØ×-Ò-¨eÑ4Ô4°QÔ7ð Dð D‘D�A�qØ—H’H˜\¨Qµ´¸qÑ0AÔ0AÐ,BÑBÑCÔCÐCÐCØØ�a’�Ø�‘Ø�a’�Ø�‘Ø�a’‘Ø�=Ø—H’H�QÐBÑCÔCÑDÔDÐDØ—H’H˜U‘O”O�OØØ”<×&Ò&Ñ(Ô(ð Ø—H’H�QÐCÑDÔDÑEÔEÐEØ—H’H˜U‘O”O�OÙð ¥ð
ñ"ô "ñ �õ &.Ô%5Ø(°ð&ñ &ô &Ñ"�˜'ð !�	ð!"åÔ,­R¬Y°wÀÑ-EÔ-EÑFÔF�AØ”L×&Ò& qÑ)Ô)Ð)Ø—K’K ‘N”N�NØ—G’GØŸšØKÐK¸×8HÒ8HÑ8JÔ8JÐKÑKÔKñô ñô ð ð
 —G’G‘I”I�IàŸ\š\™^œ^�FØŸ)š)Ø$¨°Ð'8Ñ8Ø!*¨B¯KªK©M¬MÐ :Ø#1ð $ñ ô �Cð
 ˜a’x�xØŸš¥Ð"FÑ GÔ GÈ#Ñ MÑNÔNÐNØ õ ”I˜gÑ&Ô&Ð&Ø!™	õ # 7¨DÑ1Ô1�GÝ (¡
¤
�IØ 'ð 2ð 2˜Ý#Ô1°$Ñ7Ô7˜Ø#Ÿš¨tÑ4Ô4ð 2Ø%ŸOšO¨DÑ1Ô1Ð1øØ—M’M‘O”O�OØ—N’N 1Ñ%Ô%Ð%Ý!+¨IÑ!6Ô!6�Jå”I˜gÑ&Ô&Ð&Ø!˜	øõ ”I˜gÑ&Ô&Ð&Ø!�M�M�M�Mð ��Ø�a’�Ø!&Ð&��h�hØ�a’�Ø!%Ð%��h�hØ�a’�Ø %Ð%��g�gØ�a’�Ø $Ð$��g�gØ�a’�ÝÔ)­!¨L©/¬/Ñ:Ô:Ð:Ø˜ '¨:Ð5Ð5s   Å;DM  Ê1BM  Í M7r  r   c              3   ó>   K  — | ]}t          |j        ¦  «        V — Œd S rV   )r%   r„  rŠ   s     r)   r�   zfilterpatch.<locals>.<genexpr>  s*   è è € Ð6Ð6¨�˜AœG™œÐ6Ð6Ð6Ð6Ð6Ð6r+   r   r+   s   examine changes to %s?s    and c              3   ó    K  — | ]	}d |z  V — Œ
dS )s   '%s'NrW   ©r‹   rM  s     r)   r�   zfilterpatch.<locals>.<genexpr>  s7   è è € ð >
ð >
ØˆG�a‰Kð>
ð >
ð >
ð >
ð >
ð >
r+   c              3   óB   •K  — | ]}‰                      |¦  «        V — Œd S rV   )Úexact)r‹   rM  rè   s     €r)   r�   zfilterpatch.<locals>.<genexpr>  s-   øè è € Ð-Ð- !ˆu�{Š{˜1‰~Œ~Ð-Ð-Ð-Ð-Ð-Ð-r+   )TNNr  r  c                 ól   — g | ]1}|d                                ¦   «         st          |¦  «        dk    ¯/|‘Œ2S )r   r   )rä  r%   rŠ   s     r)   rÆ  zfilterpatch.<locals>.<listcomp>;  s4   € ÐIÐIÐI�1¨A¨a¬D¯LªL©N¬NÐI½cÀ!¹f¼fÀqºj¸jˆQ¸j¸j¸jr+   )r  r7  rÈ  r%   r„  r/   r¸   rC  rÉ  rQ  r   Úallr×  rÏ  r¬  rÉ   rð  r5   r8  rÅ  Úvalues)r}   Úheadersrè   r6  r7  ÚseenÚappliedr'  r(  Úposr  rŒ   Ú	fixoffsetÚhdrrQ  r«   r,  Únpr  r1   Úidxr*  ÚnewpatchÚnewhunkr5  s   ` ``                    @r)   ÚfilterpatchrJ  �  sÚ  øøøø€ å‰}Œ}€HàÐØˆ	ðh6ð h6ð h6ð h6ð h6ð h6ð h6õT ‰5Œ5€DØ€GØ"Ñ€HˆgØ•CÐ6Ð6¨gÐ6Ñ6Ô6Ñ6Ô6ˆ€CØð 39ñ 39ˆØ�s�1”7‰|Œ|ÑˆØˆØˆ	Ø�hŠh�q”xÑ Ô ˆØ�$ˆ;ˆ;ØØ�Š�‰ŒˆØˆ?Ø�HŠH�R‰LŒLˆLØ—’‘	”	ˆÝÐ)Ñ*Ô*­Q¨x©[¬[×-=Ò-=ð >
ð >
Ø!&ð>
ñ >
ô >
ñ .
ô .
ñ 
ˆõ Ð-Ð-Ð-Ð- uÐ-Ñ-Ô-Ñ-Ô-ð 	LØ-‰NˆAˆw˜˜à'- v¨h¸ÀÀdÑ'KÔ'KÑ$ˆAˆx˜ "Øð 	ØØ!" ˆ�—
’
‘”ÑØ�:Š:‰<Œ<ð 	Ø�A—J’J‘L”LÐ!Ð!Ô! Q¤WÑ,Ð!Ð!Ñ!ÙÝ! !¤'Ñ*Ô*ð 	9ñ 	9‰HˆAˆuØÐ G OØ—’˜RÑ Ô Ð Ø˜ŠzˆzØ˜yÔ)¨)Ô4°u·~²~Ñ7GÔ7GÑG��à�C ¤™LœLÑ(¨1Ñ,�Ø˜{Ô+¨IÔ6ØØØ—N’NÑ$Ô$ð:ñ �ð
 06¨vØ˜' 3¨ñ0ô 0Ñ,ˆAˆx˜ *ð ð 9Øð .Ý œI eÑ,Ô,�EØ�L”L IÑ-�L”LØ˜ŸšÑ(Ô(Ô)×0Ò0°Ñ7Ô7Ð7Ð7ØÐ'Ø *ð Dð D�HØ#+¤>ð Dð D˜Ø$ð 8Ø#˜NœN¨iÑ7˜NœNØ × 0Ò 0Ñ 2Ô 2Ô3×:Ò:¸7ÑCÔCÐCÐCðDñDð ˜Uœ]¨U¬[Ñ8Ñ8�	‘	ñ7	9õ: 	ØIÐI˜ŸšÑ(Ô(ÐIÑIÔIØñ	
ô 	
ð 	ðð r+   c                   ó>   — e Zd Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Z	d„ Z
d	S )
r™  c                 óê   — || _         || _        |g| _        g | _        g | _        d x| _        | _        d x| _        | _        |�0|r|  	                    |¦  «         d S |  
                    |¦  «         d S d S rV   )r   r¡  r™  r¢  r¤  Ústartar£  Ústartbr¥  Úread_context_hunkÚread_unified_hunk)r]   r¡  Únumrë   Úcontexts        r)   r^   zhunk.__init__C  s‹   € ØˆŒØˆŒ	Ø�FˆŒ	ØˆŒØˆŒØ"&Ð&ˆŒ�d”iØ"&Ð&ˆŒ�d”iØˆ>Øð +Ø×&Ò& rÑ*Ô*Ð*Ð*Ð*à×&Ò& rÑ*Ô*Ð*Ð*Ð*ð	 ˆ>r+   c                 ó@  — d„ }t          | j        | j        dd¦  «        }| j        |_        | j        |_        | j         |_          || j        ¦  «        |_         || j        ¦  «        |_        | j        |_        | j        |_        | j        |_        | j        |_        |S )z1Return a copy with line endings normalized to LF.c                 ó‚   — g }| D ]9}|                      d¦  «        r|d d…         dz   }|                     |¦  «         Œ:|S )NrÞ   ru  r†   )r§   r5   )r0   r…  r&   s      r)   Ú	normalizez%hunk.getnormalized.<locals>.normalizeT  sV   € ØˆFØð $ð $�Ø—=’= Ñ)Ô)ð -Ø   œ9 uÑ,�DØ—’˜dÑ#Ô#Ð#Ð#ØˆMr+   N)	r™  r¡  r   r¢  r¤  rM  rN  r£  r¥  )r]   rU  Únhs      r)   r©  zhunk.getnormalizedQ  s”   € ð	ð 	ð 	õ �$”)˜Tœ[¨$°Ñ5Ô5ˆØ”KˆŒ	Ø”)ˆŒØ”)ˆŒØˆy˜œÑ Ô ˆŒØˆy˜œÑ Ô ˆŒØ”KˆŒ	Ø”KˆŒ	Ø”)ˆŒØ”)ˆŒØˆ	r+   c                 óâ  — t                                | j        ¦  «        }|s$t          t	          d¦  «        | j        z  ¦  «        ‚|                     ¦   «         \  | _        | _        | _	        | _
        | j        €d| _        nt          | j        ¦  «        | _        | j
        €d| _
        nt          | j
        ¦  «        | _
        t          | j        ¦  «        | _        t          | j	        ¦  «        | _	        	 t          j        || j        | j        | j
        | j        | j        ¦  «         n=# t"          j        $ r+}t          t	          d¦  «        | j        |fz  ¦  «        ‚d }~ww xY wt'          | j        d         ¦  «        dk    rV| j        d= | j        d= | j        d= | xj        dz  c_        | xj
        dz  c_
        t'          | j        d         ¦  «        dk    °V|                      |¦  «         d S )Nó   bad hunk #%dr   s   bad hunk #%d: %sr‡  r   )Úunidescrè   r¡  rŸ  r   r   rÒ  rM  r£  rN  r¥  rê   r   Úaddlinesr™  r¢  r¤  r   Ú
ParseErrorr%   Ú_fixnewline)r]   rë   rC   Úes       r)   rP  zhunk.read_unified_hunki  sÈ  € Ý�MŠM˜$œ)Ñ$Ô$ˆØð 	DÝ!¥! OÑ"4Ô"4°t´{Ñ"BÑCÔCÐCØ9:¿º¹¼Ñ6ˆŒ�T”Y ¤¨T¬YØŒ9ÐØˆDŒIˆIå˜DœI™œˆDŒIØŒ9ÐØˆDŒIˆIå˜DœI™œˆDŒIÝ˜$œ+Ñ&Ô&ˆŒÝ˜$œ+Ñ&Ô&ˆŒð	MÝÔØ�D”I˜tœy¨$¬)°T´V¸T¼Vñô ð ð øõ Ôð 	Mð 	Mð 	MÝ!¥!Ð$7Ñ"8Ô"8¸D¼KÈÐ;KÑ"KÑLÔLÐLøøøøð	Møøøõ �$”)˜B”-Ñ Ô  AÒ%Ð%Ø”	˜"�Ø”�r�
Ø”�r�
ØˆIŒI˜‰NˆIŒIØˆIŒI˜‰NˆIŒIõ �$”)˜B”-Ñ Ô  AÒ%Ð%ð 	×Ò˜ÑÔÐÐÐs   Ã62D) Ä)E#Ä8&EÅE#c                 ó@  — |                      ¦   «         | _        t                               | j        ¦  «        }|s$t	          t          d¦  «        | j        z  ¦  «        ‚|                     ¦   «         \  | _        }t          | j        ¦  «        | _        |€| j        }t          |¦  «        | j        z
  | _
        | j        r| xj
        dz  c_
        t          | j
        ¦  «        D ]ñ}|                      ¦   «         }|                     d¦  «        r|                     |¦  «          n°|dd …         }|                     d¦  «        s|                     d¦  «        rd|z   }nA|                     d¦  «        rd	|z   }n&t	          t          d
¦  «        | j        |fz  ¦  «        ‚| j                             |¦  «         | j                             |¦  «         Œò|                      ¦   «         }|                     d¦  «        r=| j        d         d d…         }|| j        d<   || j        d<   |                      ¦   «         }t                               |¦  «        }|s$t	          t          d¦  «        | j        z  ¦  «        ‚|                     ¦   «         \  | _        }t          | j        ¦  «        | _        |€| j        }t          |¦  «        | j        z
  | _        | j        r| xj        dz  c_        d}	t          | j        ¦  «        D �]¡}|                      ¦   «         }|                     d¦  «        r-| j        d         d d…         }|| j        d<   || j        |	dz
  <   ŒY|s|                     |¦  «          �n0|dd …         }|                     d¦  «        s|                     d¦  «        rd|z   }np|                     d¦  «        rd	|z   }nUt)          | j        ¦  «        dk    r|                     |¦  «          n¬t	          t          d
¦  «        | j        |fz  ¦  «        ‚| j                             |¦  «         	 |	t)          | j        ¦  «        k    rd}
n| j        |	         }
|	dz  }	|
|k    rn5|
                     d¦  «        rŒK| j                             |	dz
  |¦  «         	 �Œ£| j        sN| j        D ]F}|                     d¦  «        s|                     d	¦  «        r| j                             |¦  «         ŒG| j        sV| j        D ]N}|                     d¦  «        s|                     d	¦  «        r"| j                             |dd …         ¦  «         ŒOd| j        | j
        | j        | j        fz  | _        | j        | j        d<   |                      |¦  «         d S )NrX  r   r“   r"   s   - s   ! r   s     r   s   bad hunk #%d old text line %dó   \ r‡  s   + r    r   Tr+   s   @@ -%d,%d +%d,%d @@
)rc   r¡  Úcontextdescrè   rŸ  r   r   rÒ  rM  rê   r£  r®  r#   rö   r¢  r5   r™  rN  r¥  r¤  r%   Úinsertr\  )r]   rë   rC   Úaendr�  r(   rŒ  ÚuÚbendÚhunkirŒ   s              r)   rO  zhunk.read_context_hunkˆ  sk  € Ø—K’K‘M”MˆŒ	Ý×Ò˜dœiÑ(Ô(ˆØð 	DÝ!¥! OÑ"4Ô"4°t´{Ñ"BÑCÔCÐCØŸHšH™JœJÑˆŒ�TÝ˜$œ+Ñ&Ô&ˆŒØˆ<Ø”;ˆDÝ˜‘I”I ¤Ñ+ˆŒ	ØŒ;ð 	ØˆIŒI˜‰NˆIŒIÝ�t”yÑ!Ô!ð 	 ð 	 ˆAØ—’‘”ˆAØ�|Š|˜FÑ#Ô#ð à—’˜‘
”
�
Ø�Ø�!�"�"”ˆAØ�|Š|˜EÑ"Ô"ð  a§l¢l°5Ñ&9Ô&9ð Ø˜1‘H��Ø—’˜eÑ$Ô$ð Ø˜1‘H��å%ÝÐ6Ñ7Ô7¸4¼;ÈÐ:JÑJñô ð ð ŒF�MŠM˜!ÑÔÐØŒI×Ò˜QÑÔÐÐà�KŠK‰MŒMˆØ�<Š<˜ÑÔð 	Ø”�r”
˜3˜B˜3”ˆAØˆDŒF�2‰JØˆDŒI�b‰MØ—’‘”ˆAÝ×Ò˜aÑ Ô ˆØð 	DÝ!¥! OÑ"4Ô"4°t´{Ñ"BÑCÔCÐCØŸHšH™JœJÑˆŒ�TÝ˜$œ+Ñ&Ô&ˆŒØˆ<Ø”;ˆDÝ˜‘I”I ¤Ñ+ˆŒ	ØŒ;ð 	ØˆIŒI˜‰NˆIŒIØˆÝ�t”yÑ!Ô!ð (	ñ (	ˆAØ—’‘”ˆAØ�|Š|˜FÑ#Ô#ð ð ”F˜2”J˜s ˜s”O�Ø�”�r‘
Ø'(�”	˜% !™)Ñ$ØØð à—’˜‘
”
�
Ø‘Ø�!�"�"”ˆAØ�|Š|˜EÑ"Ô"ð  a§l¢l°5Ñ&9Ô&9ð Ø˜1‘H��Ø—’˜eÑ$Ô$ð 	Ø˜1‘H��Ý�T”V‘” Ò!Ð!à—’˜‘
”
�
Ø�å%ÝÐ6Ñ7Ô7¸4¼;ÈÐ:JÑJñô ð ð ŒF�MŠM˜!ÑÔÐðØ�C ¤	™NœNÒ*Ð*Ø�A�Aàœ	 %Ô(�AØ˜‘
�Ø˜’6�6ØØ—\’\ $Ñ'Ô'ð Øà”I×$Ò$ U¨Q¡Y°Ñ2Ô2Ð2ØùàŒvð 	%à”Yð %ð %�Ø—<’< Ñ%Ô%ð %¨¯ª°dÑ);Ô);ð %Ø”F—M’M !Ñ$Ô$Ð$øØŒvð 	)à”Yð )ð )�Ø—<’< Ñ%Ô%ð )¨¯ª°dÑ);Ô);ð )Ø”F—M’M ! A B B¤%Ñ(Ô(Ð(øà,ØŒKØŒIØŒKØŒIð	0
ñ 
ˆŒ	ð ”yˆŒ	�!‰Ø×Ò˜ÑÔÐÐÐr+   c                 óÐ   — |                      ¦   «         }|                     d¦  «        r't          j        | j        | j        | j        ¦  «         d S |                     |¦  «         d S )Nr_  )rc   r#   r   Ú
fixnewliner™  r¢  r¤  rö   )r]   rë   r(   s      r)   r\  zhunk._fixnewlineõ  sW   € Ø�KŠK‰MŒMˆØ�<Š<˜ÑÔð 	ÝÔ! $¤)¨T¬V°T´VÑ<Ô<Ð<Ð<Ð<à�GŠG�A‰JŒJˆJˆJˆJr+   c                 óv   — t          | j        ¦  «        | j        k    ot          | j        ¦  «        | j        k    S rV   )r%   r¢  r£  r¤  r¥  r`   s    r)   rž  zhunk.completeü  s+   € Ý�4”6‰{Œ{˜dœiÒ'ÐD­C°´©K¬K¸4¼9Ò,DÐDr+   c                 ó&  — t          |t          |¦  «        ¦  «        }|rîd}d}t          | j        ¦  «        }t          |dz
  ¦  «        D ]+}| j        |dz                                 d¦  «        r|dz  }Œ+ |sAt          |dz
  ¦  «        D ].}| j        ||z
  dz
                                d¦  «        r|dz  }Œ. t          ||¦  «        }t          ||¦  «        }||t          |¦  «        |z
  …         ||t          |¦  «        |z
  …         |fS ||dfS )Nr   r   r   )r°  r%   r™  r®  r#   )	r]   r²  r¨  Úfuzzr·  ÚtopÚbotÚhlenr�  s	            r)   Ú_fuzzitzhunk._fuzzitÿ  s0  € õ �4�˜S™œÑ"Ô"ˆØð 	MØˆCØˆCÝ�t”y‘>”>ˆDÝ˜4 !™8‘_”_ð ð �à”9˜Q ™UÔ#×.Ò.¨tÑ4Ô4ð Ø˜1‘H�C�CàØð Ý˜t a™x™œð ð �AØ”y ¨¡¨a¡Ô0×;Ò;¸DÑAÔAð Ø˜q™˜˜àå�d˜C‘.”.ˆCÝ�d˜C‘.”.ˆCØ�s�S ™XœX¨™^Ð+Ô,¨c°#½¸C¹¼À3¹Ð2FÔ.GÈÐLÐLØ�C˜ˆ{Ðr+   c                 óÊ   — |                       | j        | j        ||¦  «        \  }}}| j        |z   }| j        |z   }| j        r|dk    r|dz  }| j        r|dk    r|dz  }||||fS )Nr   r   )rn  r¢  r¤  rM  rN  r£  r¥  )r]   rj  r·  r²  r¨  rk  r³  r´  s           r)   rª  zhunk.fuzzit  s€   € ØŸš T¤V¨T¬V°T¸7ÑCÔC‰ˆˆS�#Ø”; Ñ$ˆØ”; Ñ$ˆàŒ9ð 	˜ Aš˜Ø˜‰MˆHØŒ9ð 	˜ Aš˜Ø˜‰MˆHØ�H˜c 8Ð+Ð+r+   N)rg   rh   ri   r^   r©  rP  rO  r\  rž  rn  rª  rW   r+   r)   r™  r™  B  s“   € € € € € ð+ð +ð +ðð ð ð0ð ð ð>kð kð kðZð ð ðEð Eð Eðð ð ð6	,ð 	,ð 	,ð 	,ð 	,r+   r™  c                   ó*   — e Zd ZdZd„ Zd„ Zd„ Zd„ ZdS )r§  zA binary patch file.c                 ój   — d | _         d| _        dg| _        || _        |                      |¦  «         d S )NFs   GIT binary patch
)Útextrë  r™  Ú_fnameÚ_read)r]   rë   r  s      r)   r^   zbinhunk.__init__)  s4   € ØˆŒ	ØˆŒ
Ø*Ð+ˆŒ	ØˆŒØ�
Š
�2‰Œˆˆˆr+   c                 ó   — | j         d uS rV   )rr  r`   s    r)   rž  zbinhunk.complete0  s   € ØŒy Ð$Ð$r+   c                 ór   — | j         r)t          | j        d                     |¦  «        ¦  «        gS | j        gS r-   )rë  Úapplybindeltarr  r/   )r]   r0   s     r)   r¨  zbinhunk.new3  s5   € ØŒ:ð 	?Ý! $¤)¨S¯XªX°e©_¬_Ñ=Ô=Ð>Ð>Ø”	ˆ{Ðr+   c                 óÆ  — d„ }	  ||| j         ¦  «        }|s$t          t          d¦  «        | j        z  ¦  «        ‚|                     d¦  «        r*t          |dd …                              ¦   «         ¦  «        }nG|                     d¦  «        r1t          |dd …                              ¦   «         ¦  «        }d| _        nŒ½g } ||| j         ¦  «        }t          |¦  «        dk    �r|d	d…         }|d
k    r)|dk    r#t          |¦  «        t          d¦  «        z
  dz   }n"t          |¦  «        t          d¦  «        z
  dz   }	 | 
                    t          j        |dd …         ¦  «        d |…         ¦  «         nJ# t          $ r=}t          t          d¦  «        | j        t          j        |¦  «        fz  ¦  «        ‚d }~ww xY w ||| j         ¦  «        }t          |¦  «        dk    �°t!          j        d                     |¦  «        ¦  «        }t          |¦  «        |k    r4t          t          d¦  «        | j        t          |¦  «        |fz  ¦  «        ‚|| _        d S )Nc                 ó~   — |                       ¦   «         }|                     |¦  «         |                     d¦  «        S )NrÞ   )rc   r5   ræ   )rë   r™  r(   s      r)   Úgetlinezbinhunk._read.<locals>.getline9  s0   € Ø—’‘”ˆAØ�KŠK˜‰NŒNˆNØ—8’8˜GÑ$Ô$Ð$r+   Ts"   could not extract "%s" binary datas   literal rä   s   delta r  r   r   ó   Zó   Aó   aé   s&   could not decode "%s" binary patch: %sr+   s%   "%s" length is %d bytes, should be %d)r™  rŸ  r   rs  r#   rê   ræ   rë  r%   Úordr5   r   Ú	b85decodeÚ
ValueErrorr   ÚforcebytestrÚzlibÚ
decompressr/   rr  )	r]   rë   rz  r&   rT  Údecr(   r]  rr  s	            r)   rt  zbinhunk._read8  sp  € ð	%ð 	%ð 	%ð
	Ø�7˜2˜tœyÑ)Ô)ˆDØð Ý%ÝÐ;Ñ<Ô<¸t¼{ÑJñô ð ð �Š˜{Ñ+Ô+ð Ý˜4   œ8Ÿ?š?Ñ,Ô,Ñ-Ô-�ØØ�Š˜yÑ)Ô)ð Ý˜4   œ8Ÿ?š?Ñ,Ô,Ñ-Ô-�Ø!�”
Øð	ð ˆØˆw�r˜4œ9Ñ%Ô%ˆÝ�$‰iŒi˜!Šm‰mØ�Q�q�S”	ˆAØ�DŠyˆy˜Q $šY˜YÝ˜‘F”F�S ™YœYÑ&¨Ñ*��å˜‘F”F�S ™YœYÑ&¨Ñ+�ðØ—
’
�4œ>¨$¨q¨r¨r¬(Ñ3Ô3°B°Q°BÔ7Ñ8Ô8Ð8Ð8øÝð ð ð Ý%ÝÐ?Ñ@Ô@Ø”{¥JÔ$;¸AÑ$>Ô$>Ð?ñ@ñô ð øøøøðøøøð
 �7˜2˜tœyÑ)Ô)ˆDõ �$‰iŒi˜!Šm‰mõ Œ˜sŸxšx¨™}œ}Ñ-Ô-ˆÝˆt‰9Œ9˜ÒÐÝ!ÝÐ:Ñ;Ô;Ø”;¥ D¡	¤	¨4Ð0ñ1ñô ð ð ˆŒ	ˆ	ˆ	s   Å7E= Å=
GÆ8F?Æ?GN)rg   rh   ri   rÜ   r^   rž  r¨  rt  rW   r+   r)   r§  r§  &  sV   € € € € € ØÐðð ð ð%ð %ð %ðð ð ð
)ð )ð )ð )ð )r+   r§  c                 óÀ   — | dd …                               d¦  «        }|                     d¦  «        }|dk     r|                     d¦  «        }|dk     r|S |d |…         S )Nr  rÞ   r   r   r   )ræ   r›   )ÚstrrŒ  r  s      r)   Úparsefilenamerˆ  d  s]   € àˆAˆBˆBŒ�Š�wÑÔ€AØ	�Šˆu‰Œ€AØˆ1‚u€uØ�FŠF�4‰LŒLˆØˆqŠ5ˆ5ØˆHØˆRˆaˆRŒ5€Lr+   c                 ó�   — g }| D ]@}t          j        |d¦  «        r|                     ¦   «         }|                     |¦  «         ŒA|S )a³  reverse 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

    s   reversehunk)r   rn   r  r5   )r„  Únewhunksr;   s      r)   Úreversehunksr‹  o  sU   € ðp €HØð ð ˆÝÔ˜A˜~Ñ.Ô.ð 	 Ø—’‘”ˆAØ�Š˜ÑÔÐÐØ€Or+   c                 óª  ‡—  G ˆfd„d¦  «        } |¦   «         }t          ¦   «         }|                     d                     | ¦  «        ¦  «         |                     d¦  «         d}t	          |¦  «        D ]H\  }}	  |j        |         |         ||¦  «         n"# t          $ r t          d||fz  ¦  «        ‚w xY w|}ŒI~|                     ¦   «         S )aD  patch -> [] 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
    c                   óx   •— e Zd ZdZd„ Zd„ Zˆ fd„Zd„ Zd„ Zd„ Z	d„ Z
eeeed	œeeee	d
œeeedœeedœde	idœZdS )úparsepatch.<locals>.parserzpatch parsing state machinec                 óv   — d| _         d| _        d| _        d | _        g | _        g | _        g | _        g | _        d S )Nr   r+   )rï  rð  rò  r¸   rR  rî  r™  r@  r`   s    r)   r^   z#parsepatch.<locals>.parser.__init__Þ  s>   € ØˆDŒMØˆDŒKØˆDŒIØˆDŒKØˆDŒLØˆDŒKØˆDŒIØˆDŒLˆLˆLr+   c                 óž   — |                       g ¦  «         |\  }}}}}t          |¦  «        | _        t          |¦  «        | _        || _        d S rV   )Ú
addcontextrê   rï  rð  rò  )r]   ÚlimitsÚ	fromstartÚfromendÚtostartÚtoendrò  s          r)   Úaddrangez#parsepatch.<locals>.parser.addrangeè  sI   € Ø�OŠO˜BÑÔÐØ7=Ñ4ˆI�w ¨°Ý 	™NœNˆDŒMÝ˜g™,œ,ˆDŒKØˆDŒIˆIˆIr+   c           
      óŽ  •— | j         rµt          | j        | j        | j        | j        | j        | j         |‰¦  «        }| j        j                             |¦  «         | xj        t          | j        ¦  «        |j
        z   z  c_        | xj        t          | j        ¦  «        |j        z   z  c_        g | _        g | _         || _        d S rV   )r™  ræ  r¸   rï  rð  rò  rî  r„  r5   r%   r8  rÅ  rR  )r]   rR  rŒ   rì  s      €r)   r‘  z%parsepatch.<locals>.parser.addcontextï  s¶   ø€ ØŒyð ÝØ”KØ”MØ”KØ”IØ”KØ”IØØñ	ô 	�ð ”Ô!×(Ò(¨Ñ+Ô+Ð+Ø�”¥ T¤[Ñ!1Ô!1°A´IÑ!=Ñ=�”Ø�”�s 4¤;Ñ/Ô/°!´'Ñ9Ñ9�”Ø �”Ø�”	Ø"ˆDŒLˆLˆLr+   c                 ó€   — | j         r| j         | _        g | _         | j        r|                      g ¦  «         || _        d S rV   )rR  rî  r™  r‘  )r]   r™  s     r)   Úaddhunkz"parsepatch.<locals>.parser.addhunk  sC   € ØŒ|ð "Ø"œl�”Ø!�”ØŒyð $Ø—’ Ñ#Ô#Ð#ØˆDŒIˆIˆIr+   c                 ó�   — |                       g ¦  «         t          |¦  «        }| j                             |¦  «         || _        d S rV   )r‘  r¸   r@  r5   )r]   rE  rŒ   s      r)   Únewfilez"parsepatch.<locals>.parser.newfile
  s@   € Ø�OŠO˜BÑÔÐÝ�s‘”ˆAØŒL×Ò Ñ"Ô"Ð"ØˆDŒKˆKˆKr+   c                 ó   — d S rV   rW   rõ   s     r)   Úaddotherz#parsepatch.<locals>.parser.addother  s   € ØˆDr+   c                 ó:   — |                       g ¦  «         | j        S rV   )r‘  r@  r`   s    r)   Úfinishedz#parsepatch.<locals>.parser.finished  s   € Ø�OŠO˜BÑÔÐØ”<Ðr+   )ó   contextó   fileó   hunkó   range)r¢  r£  r¤  ó   other)r¡  r¢  r¤  )r¡  r£  r¥  )r¢  r¡  r£  r¤  r¥  N)rg   rh   ri   rÜ   r^   r—  r‘  rš  rœ  rž  r   Útransitions)rì  s   €r)   ÚparserrŽ  Û  sî   ø€ € € € € Ø)Ð)ð	ð 	ð 	ð	ð 	ð 	ð	#ð 	#ð 	#ð 	#ð 	#ð&	ð 	ð 	ð	ð 	ð 	ð	ð 	ð 	ð	 ð 	 ð 	 ð 'Ø Ø Ø"ð	ð ð !Ø Ø"Ø"ð	ð ð 'Ø Ø"ðð ð
 $.¸Ð@Ð@Ø Ð*ð'
ð 
ˆˆˆr+   r§  r+   r   r¡  s   unhandled transition: %s -> %s)	r.   r¥   r/   rB   Ú	scanpatchr¦  ÚKeyErrorrŸ  r   )Úoriginalchunksrì  r§  ÚprD   ÚstateÚnewstaterª   s    `      r)   r%  r%  ¯  s  ø€ ðXP
ð P
ð P
ð P
ð P
ð P
ð P
ñ P
ô P
ð P
ðd 	ˆ‰Œ€AÝ	‰Œ€BØ‡H‚HˆS�XŠX�nÑ%Ô%Ñ&Ô&Ð&Ø‡G‚GˆA�J„J€Jà€EÝ# B™-œ-ð ð ‰ˆ�$ð	Ø*ˆAŒM˜%Ô  Ô*¨1¨dÑ3Ô3Ð3Ð3øÝð 	ð 	ð 	Ý!Ø1°U¸HÐ4EÑEñô ð ð	øøøð ˆˆØ
Ø�:Š:‰<Œ<Ðs   Á=BÂB:c                 óö  — t          | ¦  «        }d}|dk    rd||                      ¦   «         z   fS |}|dk    r‡|                      d|¦  «        }|dk    r"t          t	          d¦  «        ||| fz  ¦  «        ‚|dz  }||dz
  k     r0| ||dz   …         dk    r|dz  }||dz
  k     r| ||dz   …         dk    °|dz  }|dk    °‡| d|…                              ¦   «         || |d…                              ¦   «         z   fS )aª  turn 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
    r   r+   ó   /r‡  s*   unable to strip away %d of %d dirs from %sr   N)r%   ræ   r›   r@  r   rœ   )r½   r4   ru   Úpathlenr  Úcounts         r)   Úpathtransformr²  ?  s2  € õ* �$‰iŒi€GØ	€AØ�‚z€zØ�F˜TŸ[š[™]œ]Ñ*Ð*Ð*Ø€EØ
�!Š)ˆ)Ø�IŠI�d˜AÑÔˆØ�Š7ˆ7Ý'ÝÐ?Ñ@Ô@Ø˜% Ð&ñ'ñô ð ð 	
ˆQ‰ˆà�'˜A‘+Šoˆo $ q¨1¨q©5 y¤/°TÒ"9Ð"9Ø�‰FˆAð �'˜A‘+Šoˆo $ q¨1¨q©5 y¤/°TÒ"9Ð"9à�‰
ˆð �!Š)ˆ)ð ���Œ8�?Š?ÑÔ˜f t¨A¨B¨B¤x§¢Ñ'8Ô'8Ñ8Ð8Ð8r+   c                 ó<  — |dk    }|dk    }|o|j         dk    o
|j        dk    }|o|j        dk    o
|j        dk    }	t	          |||¦  «        \  }
}| o|                      |¦  «        }t	          |||¦  «        \  }}||k    r|}n| o|                      |¦  «        }| o| o| }|d |                     d¦  «        dz   …         }|d |                     d¦  «        dz   …         }|r5||k    r/|                     |¦  «        r|j         dk    r|j        dk    rd}d}|
|k    o|                     |¦  «        }d }|s|r
|r|r|}n|}n|r|}|s+|s|r|}n$|}n!|s|}nt          t          d¦  «        ¦  «        ‚t          |¦  «        }|rd|_        n	|	rd	|_        |S )
NrË   r   r¯  r   TFs&   undefined source and destination filesrÌ   rÑ   )rM  r£  rN  r¥  r²  r  Úrfindr#   rŸ  r   r»   rÀ   )rx  Ú
afile_origÚ
bfile_origr™  r4   ru   ÚnullaÚnullbrz  r{  ÚabaserÎ   ÚgoodaÚbbaserÔ   Úgoodbry  ÚabasedirÚbbasedirÚisbackupr  rì   s                         r)   ÚmakepatchmetarÀ  h  s:  € Ø˜,Ò&€EØ˜,Ò&€EØÐ:�t”{ aÒ'Ð:¨D¬I¸ªN€FØÐ:�t”{ aÒ'Ð:¨D¬I¸ªN€FÝ  ¨U°FÑ;Ô;�L€Eˆ5ØˆIÐ/˜'Ÿ.š.¨Ñ/Ô/€EÝ  ¨U°FÑ;Ô;�L€Eˆ5Ø�‚~€~Øˆˆà�	Ð3˜gŸnšn¨UÑ3Ô3ˆØˆiÐ4 ˜IÐ4¨f¨*€Gð Ð,�u—{’{ 4Ñ(Ô(¨1Ñ,Ð,Ô-€HØÐ,�u—{’{ 4Ñ(Ô(¨1Ñ,Ð,Ô-€Hàðà˜Ò Ð Ø×Ò˜UÑ#Ô#ð !àŒK˜1ÒÐØŒI˜ŠNˆNàˆØˆð
 ˜Š~Ð9 %×"2Ò"2°5Ñ"9Ô"9€HØ€EØð Øð 	�Uð 	Øð Ø��à��Øð 	ØˆEàð 	PØð 	PØð Ø��à��Øð 	PØˆEˆEå!¥!Ð$MÑ"NÔ"NÑOÔOÐOå	�5Ñ	Ô	€BØð ØˆŒˆØ	ð ØˆŒØ€Ir+   c              #   óà  ‡	‡
K  — t          j        d¦  «        }t          | ¦  «        Š
ˆ
fd„}t          ‰
j        d¦  «        D �]*}|                     d¦  «        s|                     d¦  «        rpd„ } |||¦  «        }‰
                     ¦   «         }|                     d¦  «        r‰
                     ¦   «         }|||gz  }n‰
                     |¦  «         d|fV — Œ�|                     d	¦  «        rd
Š	d ||ˆ	fd„¦  «        fV — ŒÈ|                     d¦  «        rdŠ	d ||ˆ	fd„¦  «        fV — Œó|                     |¦  «        }|rd|                     ¦   «         fV — �Œ$d|fV — �Œ,dS )zálike 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}t          ‰j        d¦  «        D ]8} ||¦  «        r|                     |¦  «         Œ#‰                     |¦  «          |S )zscan lr while predicate holdsr+   )rú   rc   r5   rö   )Úfirstr«  r0   r&   rë   s       €r)   Ú	scanwhilezscanpatch.<locals>.scanwhile°  sa   ø€ à�ˆÝ˜œ cÑ*Ô*ð 	ð 	ˆDØˆq�‰wŒwð Ø—’˜TÑ"Ô"Ð"Ð"à—’˜‘”�ØØˆr+   r+   rß   s   diff -r c                 óH   — |                       d d¦  «        }| p	|d         dvS )Nr   r   )r“   ó   diff)r$   )r&   rŒ  s     r)   Ú	notheaderzscanpatch.<locals>.notheader¾  s,   € Ø—J’J˜t QÑ'Ô'�Ø�uÐ=  !¤Ð,=Ð =Ð=r+   r“   r¢  r   )r   r  r¡  c                 ó.   •— |                       ‰¦  «        S rV   r¿  ©r(   Úcss    €r)   r’  zscanpatch.<locals>.<lambda>Ì  s   ø€ ¸¿ºÀRÑ8HÔ8H€ r+   )r   r    )r   r    r  r£  c                 ó.   •— |                       ‰¦  «        S rV   r¿  rÉ  s    €r)   r’  zscanpatch.<locals>.<lambda>Ï  s   ø€ °Q·\²\À"Ñ5EÔ5E€ r+   r¤  r¥  N)	r”   r•   rñ   rú   rc   r#   rö   rè   rÒ  )rD   Úlines_rerÄ  r&   rÇ  r¸   rÔ  rÕ  rC   rÊ  rë   s            @@r)   r¨  r¨  ¥  sã  øøè è € õ ŒzÐEÑFÔF€HÝ	�B‰Œ€Bð	ð 	ð 	ð 	ð 	õ �R”[ #Ñ&Ô&ð %ñ %ˆØ�?Š?Ð+Ñ,Ô,ð 	%°·²ÀÑ0LÔ0Lð 	%ð>ð >ð >ð �Y˜t YÑ/Ô/ˆFØ—{’{‘}”}ˆHØ×"Ò" 6Ñ*Ô*ð "ØŸš™œ�Ø˜8 VÐ,Ñ,��à—’˜Ñ!Ô!Ð!Ø˜6�/Ð!Ð!Ð!Ð!Ø�_Š_˜TÑ"Ô"ð 	%ØˆBØ˜i˜i¨Ð.HÐ.HÐ.HÐ.HÑIÔIÐIÐIÐIÐIÐIØ�_Š_˜\Ñ*Ô*ð 	%Ø$ˆBØ˜9˜9 TÐ+EÐ+EÐ+EÐ+EÑFÔFÐFÐFÐFÐFÐFà—’˜tÑ$Ô$ˆAØð %Ø §¢¡
¤
Ð*Ð*Ð*Ð*Ñ*à �nÐ$Ð$Ð$Ñ$ð5%ð %r+   c                 óJ  — d}	 | j                              ¦   «         }| j         }n6# t          $ r) t          | j                              ¦   «         ¦  «        }Y nw xY wt          |¦  «        }|                     |¦  «         t          |¦  «        }|                     |¦  «         |S )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   )	rD   ÚtellÚIOErrorr.   r   rñ   rö   rï   rB   )rë   Ú	firstlinerC  rD   Úgitlrrí   s         r)   ÚscangitpatchrÒ  Ø  s›   € ð €Cð$ØŒe�jŠj‰lŒlˆØŒUˆˆøÝð $ð $ð $Ý�b”e—j’j‘l”lÑ#Ô#ˆˆˆð$øøøå�r‰NŒN€EØ	‡J‚JˆyÑÔÐÝ˜eÑ$Ô$€JØ‡G‚GˆC�L„L€LØÐs   „ % ¥0AÁAc              #   óh  K  — d}d}d}d}dx}}d}d}d}	t          | ¦  «        }
t          |
j        d¦  «        D �]±}||k    �r|	s|                     d¦  «        s.|	dur|                     d¦  «        s|                     d¦  «        r¾d}|r0|d	                              ||¦  «        r|                     ¦   «         }|                     d¦  «        rt          |
|j        ¦  «        }n.|	€|                     d¦  «        rd
}	t          ||dz   |
|	¦  «        }|dz  }|r"d}d||||r| 	                    ¦   «         pdffV — d|fV — �nš|                     d¦  «        �r@t                               |                     d¦  «        ¦  «        }|s�ŒT|€4t          |
|¦  «        }dd„ |D ¦   «         fV — |                     ¦   «          d|                     d¦  «        z   }d|                     d¦  «        z   }|rz|d	                              ||¦  «        s^|                     ¦   «         }dd|j        z   d|j        z   d| 	                    ¦   «         ffV — |r|d	                              ||¦  «        ¯^|s't!          t#          d¦  «        |dd…         z  ¦  «        ‚d
}�nD|                     d¦  «        rc|
                     ¦   «         }|                     d¦  «        s|
                     |¦  «         �Œ¸d
}d}	t'          |¦  «        }t'          |¦  «        }nÌ|                     d¦  «        r·|
                     ¦   «         }|                     d¦  «        s|
                     |¦  «         �Œ0|
                     ¦   «         }|
                     |¦  «         |                     d¦  «        s|
                     |¦  «         �Œ…d
}d
}	t'          |¦  «        }t'          |¦  «        }|rd}d
}|}d}�Œ³|rD|                     ¦   «         }dd|j        z   d|j        z   d| 	                    ¦   «         ffV — |°BdS dS )aD  Read 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+   Nr   Fr   ó   @s   ***************rå   r‡  Tr¢  r£  rß   rÞ   ó   gitc                 óH   — g | ]}|j         d v ¯|                     ¦   «         ‘Œ S ))rã   rà   )rÀ   rÉ   )r‹   rE   s     r)   rÆ  ziterhunks.<locals>.<listcomp>"  s4   € ð ð ð Ø!"°A´DÐ<PÐ4PÐ4P�A—F’F‘H”HÐ4PÐ4PÐ4Pr+   rÍ   rÒ   r"   s'   failed to synchronize metadata for "%s"r“   ó   +++s   ***)rñ   rú   rc   r#   r×   r¨   r§  r½   r™  rÉ   rç   rè   ræ   rÒ  rê  ré   rŸ  r   rö   rˆ  )rD   rÎ   rÔ   r¬  ÚhunknumÚemitfilerœ  rí   ÚBFILErR  rë   r�  rì   rŒ   rC   Úl2Úl3s                    r)   Ú	iterhunksrÝ  ó  sÒ  è è € ð €EØ€EØ€EØ€GØÐ€HˆwØ€Jð €EØ€GÝ	�B‰Œ€Bå�"”+˜sÑ#Ô#ð Lñ LˆØ�EŠ>‰>Øð ØŸ\š\¨$Ñ/Ô/ð à˜uÐ$Ð$¨¯ªÐ6HÑ)IÔ)IÐ$Ø�|Š|Ð/Ñ0Ô0ð %ð ˆBØð &˜j¨œn×7Ò7¸¸uÑEÔEð &Ø—^’^Ñ%Ô%�Ø�|Š|Ð/Ñ0Ô0ð 6Ý˜B ¤Ñ(Ô(��à�? q§|¢|Ð4FÑ'GÔ'G�?Ø"�GÝ˜˜G a™K¨¨WÑ5Ô5�Ø�q‰LˆGØð KØ �Ø  u¨a°Ð1A¸¿º¹	¼	Ð1IÀTÐJÐJÐJÐJÐJØ˜1�*ÐÐÐÑØ�\Š\Ð*Ñ+Ô+ñ 2	&Ý—’˜AŸHšH WÑ-Ô-Ñ.Ô.ˆAØð ÙØÐ!å)¨"¨aÑ0Ô0�
Øð ð Ø&0ðñ ô ð ð ð ð ð ×"Ò"Ñ$Ô$Ð$Ø˜AŸGšG A™JœJÑ&ˆEØ˜AŸGšG A™JœJÑ&ˆEØð  Z°¤^×%>Ò%>¸uÀeÑ%LÔ%Lð Ø—^’^Ñ%Ô%�ØØ˜BœG‘OØ˜BœG‘OØØ—G’G‘I”Ið	 ð ð ð ð ð ð  Z°¤^×%>Ò%>¸uÀeÑ%LÔ%Lð ð ð Ý%ÝÐ@ÑAÔAÀEÈ!È"È"ÄIÑMñô ð ð ˆG‰GØ�\Š\˜&Ñ!Ô!ð 	&à—’‘”ˆBØ—=’= Ñ(Ô(ð Ø—’˜‘”�ÙØˆGØˆGÝ! !Ñ$Ô$ˆEÝ! "Ñ%Ô%ˆEˆEØ�\Š\˜&Ñ!Ô!ð 	&à—’‘”ˆBØ—=’= Ñ(Ô(ð Ø—’˜‘”�ÙØ—’‘”ˆBØ�GŠG�B‰KŒKˆKØ—=’=Ð!3Ñ4Ô4ð Ø—’˜‘”�ÙØˆGØˆGÝ! !Ñ$Ô$ˆEÝ! "Ñ%Ô%ˆEàð 	ØˆGØˆHØˆEØˆGùà
ð KØ�^Š^ÑÔˆØ˜ ¤™¨°´©¸$ÀÇÂÁ	Ä	ÐJÐJÐJÐJÐJð ð Kð Kð Kð Kð Kr+   c                 óè  — d„ }d} || ¦  «        }| |d…         }  || ¦  «        }| |d…         } d}|t          | ¦  «        k     �r¬t          | ||dz   …         ¦  «        }|dz  }|dz  �r9d}d}|dz  rt          | ||dz   …         ¦  «        }|dz  }|dz  r%|t          | ||dz   …         ¦  «        dz  z  }|dz  }|d	z  r%|t          | ||dz   …         ¦  «        d
z  z  }|dz  }|dz  r%|t          | ||dz   …         ¦  «        dz  z  }|dz  }|d
z  rt          | ||dz   …         ¦  «        }|dz  }|dz  r%|t          | ||dz   …         ¦  «        dz  z  }|dz  }|dz  r%|t          | ||dz   …         ¦  «        d
z  z  }|dz  }|dk    rd}||z   }	||||	…         z  }n:|dk    r||z   }	|| ||	…         z  }||z  }nt          t          d¦  «        ¦  «        ‚|t          | ¦  «        k     �°¬|S )z_Apply a binary delta hunk
    The algorithm used is the algorithm from git's patch-delta.c
    c                 ón   — d}t          j        | ¦  «        D ]}|dz  }t          |¦  «        dz  s|c S Œ|S )Nr   r   é€   )r   rž   r  )Úbinchunkr  r;   s      r)   Ú	deltaheadz applybindelta.<locals>.deltahead_  sO   € ØˆÝÔ! (Ñ+Ô+ð 	ð 	ˆAØ�‰FˆAÝ˜‘F”F˜T‘Mð Ø���ðàˆr+   r+   Nr   r   rà  r"   rä   r  é   é   é    rÃ   i   s   unexpected delta opcode 0)r%   r  r@  r   )
rá  rª   râ  ÚoutrŒ  r  Úcmdr  rT  Ú
offset_ends
             r)   rw  rw  Z  s«  € ð
ð ð ð €CØˆ	�(ÑÔ€AØ˜˜˜Œ|€HØˆ	�(ÑÔ€AØ˜˜˜Œ|€HØ	€AØ
�c�(‰mŒmÒ
Ñ
Ý�(˜1˜q 1™u˜9Ô%Ñ&Ô&ˆØ	ˆQ‰ˆØ�‰:ñ !	IØˆFØˆDØ�T‰zð Ý˜X a¨!¨a©% iÔ0Ñ1Ô1�Ø�Q‘�Ø�T‰zð Ø�#˜h q¨1¨q©5 yÔ1Ñ2Ô2°aÑ7Ñ7�Ø�Q‘�Ø�T‰zð Ø�#˜h q¨1¨q©5 yÔ1Ñ2Ô2°bÑ8Ñ8�Ø�Q‘�Ø�T‰zð Ø�#˜h q¨1¨q©5 yÔ1Ñ2Ô2°bÑ8Ñ8�Ø�Q‘�Ø�T‰zð Ý˜8 A¨¨A© IÔ.Ñ/Ô/�Ø�Q‘�Ø�T‰zð Ø�˜H Q¨¨Q© YÔ/Ñ0Ô0°AÑ5Ñ5�Ø�Q‘�Ø�T‰zð Ø�˜H Q¨¨Q© YÔ/Ñ0Ô0°BÑ6Ñ6�Ø�Q‘�Ø�qŠyˆyØ�Ø $™ˆJØ�4˜˜zÐ)Ô*Ñ*ˆCˆCØ�AŠXˆXØ˜S™ˆJØ�8˜A˜j˜LÔ)Ñ)ˆCØ�‰HˆAˆAå'­Ð*FÑ(GÔ(GÑHÔHÐHðI �c�(‰mŒmÒ
Ñ
ðJ €Jr+   r+   rn  c           
      ó:   — t          | |t          |||||¬¦  «        S )aN  Reads 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'.
    ©r4   ru   rv  )Ú
_applydiffrs  )r}   rD   rx  rb  r4   ru   rv  s          r)   Ú	applydiffrì  •  s3   € õ Ø
Ø
ÝØØØØØð	ñ 	ô 	ð 	r+   c                 óz   — |r8t          j        | j        |                      ¦   «         |¦  «        }|dk    r|dz  }|S )Nr+   r¯  )r   Ú	canonpathr4  Úgetcwd)r5  ru   s     r)   Ú_canonprefixrð  «  s?   € Øð ÝÔ# D¤I¨t¯{ª{©}¬}¸fÑEÔEˆØ�SŠ=ˆ=Ø�d‰NˆFØ€Mr+   c           	      óà  ‡‡— t          |j        ‰¦  «        Šˆˆfd„}d}	d}
d }t          |¦  «        D �]œ\  }}|dk    r!|sŒ|                     |¦  «        }|dk    rd}
Œ-|dk    �r÷|r|	|                     ¦   «         z  }	d }|\  }}}}|r2 ||j        ¦  «        |_        |j        r ||j        ¦  «        |_        nt          ||||‰‰¦  «        }|j        dk    r| 	                    |j        ¦  «         |�s	|j        dk    r| 	                    |j        ¦  «         Œìd\  }}|j        d	v rK| 
                    |j        ¦  «        d d
…         \  }}|€$t          t          d¦  «        |j        z  ¦  «        ‚|j        r|j        }|j        dk    rd}|s|ri|j        dv r>|                     |j        ¦  «        r$t          t          d¦  «        |j        z  ¦  «        ‚|                     |j        |||j        ¦  «         �ŒÏ	  || ||||¬¦  «        }�Œâ# t           $ r<}|                      t%          j        |¦  «        dz   ¦  «         d }|	dz  }	Y d }~�Œ#d }~ww xY w|dk    rI|D ]D} ||j        ¦  «        }| 
                    |¦  «        \  }}|€Œ-|                     |||¦  «         ŒE�Œzt)          j        t          d¦  «        |z  ¦  «        ‚|r|	|                     ¦   «         z  }	|	rdS |
S )Nc                 ó8   •— t          | ‰dz
  ‰¦  «        d         S )Nr   )r²  )r«  ru   r4   s    €€r)   Úpstripz_applydiff.<locals>.pstrip¸  s   ø€ Ý˜Q ¨¡	¨6Ñ2Ô2°1Ô5Ð5r+   r   r£  r   r¢  rà   rÑ   r  )rà   rã   r"   s   source file '%s' does not existrÌ   r+   )rÌ   rà   rã   s,   cannot create %s: destination already exists)rv  r†   rÕ  ó   unsupported parser state: %sr‡  )rð  r5  rÝ  r¸  r{   r½   r¾   rÀ  rÀ   r|   r  r@  r   r¿   r  r  Ú
PatchErrorr+  r   r‚  r   ÚAbort)r}   rD   Úpatcherrx  rb  r4   ru   rv  ró  ÚrejectsÚerrÚcurrent_filer¬  r?  r.  rÎ   rÔ   Ú
first_hunkrì   rª   r¿   Úinstr½   s        ``                r)   rë  rë  ³  s¾  øø€ õ ˜'œ,¨Ñ/Ô/€Fð6ð 6ð 6ð 6ð 6ð 6ð €GØ
€CØ€Lå" 2™œð IJñ IJ‰ˆˆvØ�GÒÐØð ØØ×$Ò$ VÑ,Ô,ˆCØ�QŠwˆwØ�øØ�gÒÑØð $Ø˜<×-Ò-Ñ/Ô/Ñ/�Ø#�Ø+1Ñ(ˆE�5˜* bØð Ø ˜& ¤™/œ/�”Ø”:ð 4Ø!' ¨¬
Ñ!3Ô!3�B”Jøå"Ø˜U E¨:°u¸fñô �ð Œu˜	Ò!Ð!Ø—’˜rœzÑ*Ô*Ð*Øñ Ø”5˜IÒ%Ð%Ø—N’N 2¤7Ñ+Ô+Ð+ØØ'‘
��dØ”5Ð0Ð0Ð0Ø!&§¢¨r¬zÑ!:Ô!:¸2¸A¸2Ô!>‘J�D˜$Ø�|å3ÝÐ@ÑAÔAÀBÄJÑNñô ð ð ”7ð #Øœ7�DØ”u ’�ð  #˜Øð E˜4ð EØ”uÐ <Ð<Ð<ÀÇÂØœñBô BÐ<õ 4Ýð!2ñô ð !œgñ	&ñô ð ð —O’O B¤G¨T°4¸¼ÑDÔDÐDÙðØ&˜w r¨2¨w¸ÀwÐOÑOÔO�‘øÝð ð ð Ø—’�
Ô/°Ñ5Ô5¸Ñ=Ñ>Ô>Ð>Ø#�Ø˜1‘�Ø���‘øøøøð	øøøð
 �fŠ_ˆ_Øð 
4ð 
4�Ø�v˜bœjÑ)Ô)�Ø$Ÿ_š_¨TÑ2Ô2‘
��dØ�<ð
 à—M’M $¨¨dÑ3Ô3Ð3Ð3ñ
4õ ”+�aÐ ?Ñ@Ô@À5ÑHÑIÔIÐIàð (Ø�<×%Ò%Ñ'Ô'Ñ'ˆàð ØˆrØ€Js   ÈHÈ
IÈ1IÉIc                 ó°  — d}g }|j         }	|	r*|                     dt          j        |	¦  «        z  ¦  «         d|d                     |¦  «        |t          j        |¦  «        fz  }
|                      d|
z  ¦  «         t          j        |
d¦  «        }	 |D �]?}|                     ¦   «         }|                      |dz   ¦  «         | 	                    d¦  «        r,t          j        |¦  «        }d}|                     |¦  «         Œp|                     d	¦  «        d
k    r7d}|s|                      |dz   ¦  «         d}|                      |dz   ¦  «         ŒÀ|                     d¦  «        d
k    r|                      |dz   ¦  «         Œò|                     d¦  «        d
k    r4|s|                      |dz   ¦  «         d}|                      |dz   ¦  «         �ŒA	 |rt          j        |||¦  «         n# |rt          j        |||¦  «         w w xY w|                     ¦   «         }|r1t%          t'          d¦  «        t          j        |¦  «        z  ¦  «        ‚|S )ztuse <patcher> to apply <patchname> to the working directory.
    returns whether patch was applied with fuzz factor.Fs   -d %ss   %s %s -p%d < %sr   s   Using external patch tool: %s
ó   rbr†   s   patching file s	   with fuzzr   Ts   saving rejects to files   FAILEDs   patch command failed: %s)r4  r5   r   Ú
shellquoter/   rš   Úpopenræ   r‹  r#   r   ÚparsepatchoutputrC  r›   r+  r   rJ  r{   r@  r   Úexplainexit)r}   r5  r÷  Ú	patchnamer4   rQ  r6  rj  ÚargsÚcwdrç  rD   r&   ÚpfÚprinted_fileÚcodes                   r)   Ú_externalpatchr	  	  s€  € ð €DØ€DØ
Œ)€CØ
ð 9Ø�Š�H�xÔ2°3Ñ7Ô7Ñ7Ñ8Ô8Ð8Ø
ØØ�	Š	�$‰ŒØÝÔ˜IÑ&Ô&ð	 ñ €Cð ‡H‚HÐ/°#Ñ5Ñ6Ô6Ð6Ý	Œ˜˜UÑ	#Ô	#€Bð9Øð 	&ñ 	&ˆDØ—;’;‘=”=ˆDØ�GŠG�D˜5‘LÑ!Ô!Ð!Ø�ŠÐ0Ñ1Ô1ð &ÝÔ*¨4Ñ0Ô0�Ø$�Ø—	’	˜"‘”��Ø—’˜<Ñ(Ô(¨AÒ-Ð-Ø�Ø#ð (Ø—G’G˜B ™JÑ'Ô'Ð'Ø#'�LØ—’˜˜u™Ñ%Ô%Ð%Ð%Ø—’Ð4Ñ5Ô5¸Ò:Ð:Ø—’˜˜u™Ñ%Ô%Ð%Ð%Ø—’˜9Ñ%Ô%¨Ò*Ð*Ø#ð (Ø—G’G˜B ™JÑ'Ô'Ð'Ø#'�LØ—’˜˜u™Ñ%Ô%Ð%ùð'	&ð* ð 	9ÝÔ  e¨ZÑ8Ô8Ð8øøð ð 	9ÝÔ  e¨ZÑ8Ô8Ð8Ð8ð	9øøøà�8Š8‰:Œ:€DØð 
Ý#ÝÐ)Ñ*Ô*­XÔ-AÀ$Ñ-GÔ-GÑGñ
ô 
ð 	
ð €Ks   ÂEG1 Ç1Hc           	      ó:  — |€t          ¦   «         }|€|                      dd¦  «        }|                     ¦   «         t          vr$t	          j        t          d¦  «        |z  ¦  «        ‚|                     ¦   «         }t          ¦   «         }	 t          |d¦  «        }n# t          $ r |}Y nw xY w	 t          | ||||||¬¦  «        }	||k    r|                     ¦   «          |                     |                     ¦   «         ¦  «         |                     ¦   «          nZ# ||k    r|                     ¦   «          |                     |                     ¦   «         ¦  «         |                     ¦   «          w xY w|	dk     rt          t          d¦  «        ¦  «        ‚|	dk    S )Nr�  s   eols!   unsupported line endings type: %srþ  rê  r   s   patch failed to apply)r7  Úconfigro   Úeolmodesr   rö  r   rO  r	   Ú	TypeErrorrì  r{   Úupdater@  )
r}   rx  Úpatchobjr4   ru   rQ  rv  rb  rD   r.  s
             r)   Úpatchbackendr  C	  s‚  € ð €}Ý‘”ˆØ€Ø—)’)˜H fÑ-Ô-ˆØ‡}‚}�„�hÐ&Ð&ÝŒk�!Ð@ÑAÔAÀGÑKÑLÔLÐLØ�mŠm‰oŒo€Gå‰KŒK€EðÝ�(˜EÑ"Ô"ˆˆøÝð ð ð ØˆˆˆðøøøðÝØ��G˜U¨%¸Èð
ñ 
ô 
ˆð �Š>ˆ>Ø�HŠH‰JŒJˆJØ�Š�W—]’]‘_”_Ñ%Ô%Ð%Ø�Š‰Œˆˆøð �Š>ˆ>Ø�HŠH‰JŒJˆJØ�Š�W—]’]‘_”_Ñ%Ô%Ð%Ø�Š‰ŒˆˆøøøØ
ˆQ‚w€wÝ#¥AÐ&>Ñ$?Ô$?Ñ@Ô@Ð@Ø�Š7€Ns   ÂB ÂB+Â*B+Â/D ÄAE2c           	      óN   — t          | ||¦  «        }t          | ||||||¦  «        S )zwuse builtin patch to apply <patchobj> to the working directory.
    returns whether patch was applied with fuzz factor.)r2  r  )	r}   r5  r  r4   ru   rQ  rv  r6  rx  s	            r)   Úinternalpatchr  a	  s/   € õ ˜R  zÑ2Ô2€GÝ˜˜G X¨u°f¸eÀWÑMÔMÐMr+   c	           	      óP   — t          | |||¦  «        }	t          | |	|||||¦  «        S rV   )r_  r  )
r}   r5  ra  rb  r  r4   ru   rQ  rv  rx  s
             r)   Ú	patchrepor  q	  s1   € õ ˜"˜d C¨Ñ/Ô/€GÝ˜˜G X¨u°f¸eÀWÑMÔMÐMr+   c           
      ó¨   — |                       dd¦  «        }|€t          ¦   «         }|rt          | ||||||¦  «        S t          | |||||||¦  «        S )aê  Apply <patchname> 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.
    s   uir�  )r  r7  r	  r  )	r}   r5  r  r4   ru   rQ  rv  r6  r÷  s	            r)   Úpatchr  x	  ss   € ð* �iŠi˜˜xÑ(Ô(€GØ€}Ý‘”ˆØð 
ÝØ��g˜y¨%°¸
ñ
ô 
ð 	
õ Ø
ˆD�)˜U F¨E°7¸Jñô ð r+   c           
      ó   — t          | |j        ¦  «        }t          ||¦  «        }t          |d¦  «        5 }t	          ¦   «         }t          |¦  «        D ]à\  }}	|dk    r­|	\  }
}}}|rPt          |j        |dz
  |¦  «        d         |_        |j        r$t          |j        |dz
  |¦  «        d         |_        nt          ||
||||¦  «        }| 
                    |j        ¦  «         |j        dk    r| 
                    |j        ¦  «         Œ¸|dvr$t          j        t          d¦  «        |z  ¦  «        ‚Œá|cd d d ¦  «         S # 1 swxY w Y   d S )Nrþ  r¢  r   rà   )r£  rÕ  rô  )r  r4  rð  r	   r7  rÝ  r²  r½   r¾   rÀ  rC  rÀ   r   rö  r   )r}   r5  Ú	patchpathr4   ru   rx  rD   r9  r¬  r?  rÎ   rÔ   rû  rì   s                 r)   Úchangedfilesr  ™	  s¯  € Ý˜˜DœIÑ&Ô&€GÝ˜$ Ñ'Ô'€FÝ	ˆi˜Ñ	Ô	ð  2Ý‘%”%ˆÝ& r™]œ]ð 	Nð 	N‰MˆE�6Ø˜ÒÐØ/5Ñ,��u˜j¨"Øð 	Ý+¨B¬G°U¸Q±YÀÑGÔGÈÔJ�B”GØ”zð Ý%2ØœJ¨°©	°6ñ&ô &àô&˜œ
øõ 'Ø ¨¨z¸5À&ñô �Bð —’˜BœGÑ$Ô$Ð$Ø”5˜IÒ%Ð%Ø—K’K ¤
Ñ+Ô+Ð+øØÐ/Ð/Ð/Ý”k¥!Ð$CÑ"DÔ"DÀuÑ"LÑMÔMÐMð 0àð)ð ð ð ñ ô ð ð ð ð ð ð øøøð ð ð ð ð ð s   ¶D EÅEÅ
Ec                   ó   — e Zd ZdS )ÚGitDiffRequiredN)rg   rh   ri   rW   r+   r)   r  r  ³	  s   € € € € € Ø€Dr+   r  c              #   ó†  K  — |s|s| j                              ¦   «         }| |         }| |         }t          | |||||||||	¬¦
  «
        D ]w\  }}}}|
�|€
J d¦   «         ‚ |
||¦  «        }d                     d„ |D ¦   «         ¦  «        }|r/|st	          |¦  «        dk    rd                     |¦  «        dz   V — |r|V — ŒxdS )a‘  yields 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.
    )	Úctx1Úctx2rè   ÚchangesÚoptsÚ
losedatafnÚpathfnrÉ   ÚcopysourcematchNs-   fctx2 unexpectly None in diff hunks filteringr+   c              3   óF   K  — | ]\  }}d                       |¦  «        V — ŒdS )r+   N©r/   )r‹   ÚhrangeÚhliness      r)   r�   zdiff.<locals>.<genexpr> 
  s2   è è € ÐEÐE©^¨V°V˜Ÿš Ñ(Ô(ÐEÐEÐEÐEÐEÐEr+   r   r†   )r=  Úp1Ú	diffhunksr/   r%   )r5  Únode1Únode2rè   r  r   r!  r"  rÉ   r#  Úhunksfilterfnr  r  Úfctx1Úfctx2rE  r„  rr  s                     r)   Údiffr/  ¼	  s(  è è € ðT ð #˜ð #Ø”× Ò Ñ"Ô"ˆà�Œ;€DØ�Œ;€Då$-ØØØØØØØØØØ'ð%ñ %ô %ð ð Ñ ˆˆu�c˜5ð Ð$ð
 Ð!Ð!Ø?ñ "Ô!Ð!à!�M %¨Ñ/Ô/ˆEØ�xŠxÐEÐE¸uÐEÑEÔEÑEÔEˆØð 	*�Dð 	*�C ™HœH qšL˜LØ—*’*˜S‘/”/ EÑ)Ð)Ð)Ð)Øð 	ØˆJˆJˆJøð1ð r+   c
           
      óÂ  ‡ ‡‡‡‡‡‡	‡‡‡‡‡‡— |€t           j        }d„ }
 |
¦   «         Š|s‰                     ‰|¬¦  «        }t          |t          ¦  «        r|dd…         \  ŠŠŠn|j        |j        |j        cŠŠŠ‰s‰s‰sg S ‰ j        j	        rt          Šnt          Šˆfd„‰                     ¦   «         ‰                     ¦   «         fD ¦   «         Š‰€'i Š|j        s|j        rt          j        ‰‰|¬¦  «        Š‰	rˆ	fd„ ‰j        ¦   «         D ¦   «         Št%          ‰¦  «        }t%          ‰¦  «        }t%          ‰¦  «        }‰D ]0}|‰vr*|                     |¦  «         |                     |¦  «         Œ1‰D ]}|‰vr|                     |¦  «         Œt+          |¦  «        Št+          |¦  «        Št+          |¦  «        Št	           ‰j        ¦   «         ¦  «        D ]\  }}|‰vr‰|= Œt-          j        ‰ t	          ||z  |z  ¦  «        ¦  «        }‰                     ¦   «         |f‰                     ¦   «         |fg}t-          j        ‰ |¦  «         ˆˆˆˆˆˆˆˆˆ ˆf
d„}|j        rj|j        sc	 ˆfd„}t	           ||                     d	¬
¦  «        |¦  «        ¦  «        S # t6          $ r#  ||                     d¬
¦  «        d¦  «        cY S w xY w ||d¦  «        S )zîYield 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.
    Nc                  ó@   ‡‡— i Št          j        ¦   «         Šˆˆfd„} | S )Nc                 ó8  •— |                      | ‰                     | ¦  «        ¬¦  «        }| ‰vr@t          ‰¦  «        dk    r‰‰                     ¦   «         = |                     ¦   «         ‰| <   n‰                     | ¦  «         ‰                     | ¦  «         |S )N)Úfilelogé   )Úfilectxr“  r%   Úpopleftr3  r{  r5   )rM  ra  ri  ÚcacheÚorders      €€r)   Ú
getfilectxz4diffhunks.<locals>.lrugetfilectx.<locals>.getfilectx!
  s€   ø€ Ø—;’;˜q¨%¯)ª)°A©,¬,�;Ñ7Ô7ˆDØ˜ˆ~ˆ~Ý�u‘:”: ’?�?Ø˜eŸmšm™oœoÐ.ØŸ<š<™>œ>��a‘�à—’˜Q‘”�Ø�LŠL˜‰OŒOˆOØˆKr+   )ÚcollectionsÚdeque)r9  r7  r8  s    @@r)   Úlrugetfilectxz diffhunks.<locals>.lrugetfilectx
  s=   øø€ ØˆÝÔ!Ñ#Ô#ˆð		ð 		ð 		ð 		ð 		ð 		ð Ðr+   )rè   r  c                 ó*   •— g | ]}|¯ ‰|¦  «        ‘ŒS rW   rW   )r‹   ÚnodeÚhexfuncs     €r)   rÆ  zdiffhunks.<locals>.<listcomp>B
  s&   ø€ ÐIÐIÐI˜dÀDÐIˆGˆG�D‰MŒMÐIÐIÐIr+   c                 ó2   •— i | ]\  }} ‰|¦  «        ¯||“ŒS rW   rW   )r‹   rî   rL  r#  s      €r)   ú
<dictcomp>zdiffhunks.<locals>.<dictcomp>L
  s.   ø€ ÐNÐNÐN™X˜S #¸¸ÈÑ9MÔ9MÐN��SÐNÐNÐNr+   c                 ó8   •
— t          ‰
‰‰‰‰‰‰	‰‰| |‰¦  «        S rV   )Útrydiff)r   ÚlosedatarÅ  rÉ   r  r  r9  Úmodifiedr"  r8  r5  Úrevss     €€€€€€€€€€r)   Údifffnzdiffhunks.<locals>.difffnn
  s9   ø€ ÝØØØØØØØØØØØØñ
ô 
ð 	
r+   c                 ó2   •— ‰r ‰| ¬¦  «        st           ‚d S )N)rX  )r  )rX  r!  s    €r)   rD  zdiffhunks.<locals>.losedata�
  s/   ø€ Ø!ð *¨¨°rÐ):Ñ):Ô):ð *Ý)Ð)ð*ð *r+   F)ÚgitT)r   ÚdefaultoptsÚstatusr¦  ÚlistrE  rÅ  r8  r}   Ú	debugflagr   r   r>  rI  Úupgrader
   Ú
pathcopiesr™   r7  r{  rC  rH  r   Ú
matchfilesÚrevÚprefetchfilesrÉ   r  )r5  r  r  rè   r  r   r!  r"  rÉ   r#  r<  ÚmodifiedsetÚaddedsetÚ
removedsetrM  rî   rL  ÚprefetchmatchÚ
revmatchesrG  rD  rÅ  r9  r?  rE  r8  rF  s   ```   ````           @@@@@@r)   r)  r)  
  s«  øøøøøøøøøøøøø€ ð& €|ÝÔ ˆðð ð ð" �‘”€Jàð 1Ø—+’+˜d¨%�+Ñ0Ô0ˆÝ�'�4Ñ Ô ð 
Ø#*¨2¨A¨2¤;Ñ ˆ�%˜˜ð ÔØŒMØŒOð 	!ˆ�%˜ð ð ˜Eð ¨'ð Øˆ	à„wÔð ÝˆˆåˆØIÐIÐIÐI t§y¢y¡{¤{°D·I²I±K´KÐ&@ÐIÑIÔI€Dà€|ØˆØŒ8ð 	>�t”|ð 	>ÝÔ$ T¨4°uÐ=Ñ=Ô=ˆDàð Oð OÐNÐNÐN¨¨¬©¬ÐNÑNÔNˆå�h‘-”-€KÝ�5‰zŒz€HÝ�W‘”€JØð ð ˆØ�Dˆ=ˆ=ð ×Ò˜qÑ!Ô!Ð!Ø�LŠL˜‰OŒOˆOøØð !ð !ˆØ�Dˆ=ˆ=ð ×Ò˜aÑ Ô Ð øÝ�kÑ"Ô"€HÝ�8ÑÔ€EÝ�ZÑ Ô €GÝ˜˜œ™œÑ&Ô&ð ð ‰ˆˆSØ�dˆ?ˆ?ð �S�	øåÔ&Ø�d�; Ñ)¨JÑ6Ñ7Ô7ñô €Mð 
�Š‰Œ�]Ð#Ø	�Š‰Œ�]Ð#ð€Jõ Ô˜$ 
Ñ+Ô+Ð+ð
ð 
ð 
ð 
ð 
ð 
ð 
ð 
ð 
ð 
ð 
ð 
ð 
ð 
ð  „|ð "˜DœHð "ð		5ð*ð *ð *ð *ð *õ
 ˜˜˜tŸyšy¨U˜yÑ3Ô3°XÑ>Ô>Ñ?Ô?Ð?øÝð 	5ð 	5ð 	5Ø�6˜$Ÿ)š)¨˜)Ñ-Ô-¨tÑ4Ô4Ð4Ð4Ð4ð	5øøøð ˆv�d˜DÑ!Ô!Ð!s   É31J% Ê%*KËKc              #   óö  K  — | D ]ó}|                      d¦  «        }|                      ¦   «         }|                     d¦  «        rd}n/|                     d¦  «        rd}nt          j        d|z  ¦  «        ‚t                               |¦  «        D ]$}|                     d¦  «        r|dfV — Œ||fV — Œ%||k    r|t          |¦  «        d	…         d
fV — ||k    r|t          |¦  «        d	…         dfV — Œôd	S )z1yield tokens for a list of lines in a single hunkrÞ   r   ó   diff.deletedr    ó   diff.insertedó   unexpected hunk line: %sr   ó   diff.tabNó   diff.trailingwhitespacer+   )ræ   r#   r   ÚProgrammingErrorÚtabsplitterÚfindallr%   )Ú	hunklinesr&   Ú	chomplineÚ	striplineÚlabelÚtokens         r)   Údiffsinglehunkrf  �
  sF  è è € àð 0ð 0ˆà—K’K Ñ(Ô(ˆ	à×$Ò$Ñ&Ô&ˆ	Ø�?Š?˜4Ñ Ô ð 	MØ#ˆEˆEØ�_Š_˜TÑ"Ô"ð 	MØ$ˆEˆEåÔ(Ð)DÀtÑ)KÑLÔLÐLÝ ×(Ò(¨Ñ3Ô3ð 	%ð 	%ˆEØ×Ò Ñ&Ô&ð %Ø˜kÐ*Ð*Ð*Ð*Ð*à˜e�nÐ$Ð$Ð$Ð$à˜	Ò!Ð!Ø�S ™^œ^Ð-Ð-Ô.Ð0JÐKÐKÐKÐKØ˜ÒÐØ�˜I™œÐ(Ð(Ô)¨3Ð/Ð/Ð/Ð/øð)0ð 0r+   c              #   ó¶  K  — t          ¦   «         }t          ¦   «         }| D ]P}|dd…         dk    r||dd…         z  }Œ|dd…         dk    r||dd…         z  }Œ:t          j        d|z  ¦  «        ‚|r|st          | ¦  «        D ]}|V — ŒdS t                               t          |¦  «        ¦  «        }t                               t          |¦  «        ¦  «        }d„ |D ¦   «         }d„ |D ¦   «         }d	                     |¦  «        }	d	                     |¦  «        }
g }g }t          j	        |	|
||¬
¦  «        }|D ]¢\  \  }}}}}|dk    }t          j
        d	                     |||…         ¦  «        ¦  «        D ]}|                     ||f¦  «         Œt          j
        d	                     |||…         ¦  «        ¦  «        D ]}|                     ||f¦  «         ŒŒ£dd|fdd|ffD ]ï\  }}}d}|D ]ä\  }}|r||fV — d}|                     d¦  «        }|rk|dd…         }|                     d¦  «        r
|dd…         }|t          |¦  «        d…         }|                     ¦   «         }|t          |¦  «        d…         }t                               |¦  «        D ]&}d|dd…         k    rd}n|r|dz   }n|dz   }||fV — Œ'|r|r|dfV — |d	fV — d}ŒåŒðdS )zEyield tokens for a list of lines in a single hunk, with inline colorsr   r   r   Nr    r[  c                 ó(   — g | ]}|d k    r|n|d z   ‘ŒS ©r†   rW   ©r‹   rŒ  s     r)   rÆ  z(diffsinglehunkinline.<locals>.<listcomp>»
  ó(   € Ð
6Ð
6Ð
6¨a��U’
�
ˆ1ˆ1  E¡	Ð
6Ð
6Ð
6r+   c                 ó(   — g | ]}|d k    r|n|d z   ‘ŒS ri  rW   rj  s     r)   rÆ  z(diffsinglehunkinline.<locals>.<listcomp>¼
  rk  r+   r+   )Úlines1Úlines2ó   !rY  rZ  TFr†   r‡  ó   r   r\  s   .changeds
   .unchangedr]  )Ú	bytearrayr   r^  rf  Úwordsplitterr`  Úbytesr/   r   Ú	allblocksr|  r5   r§   r%   ræ   r_  )ra  r¢  r¤  r&   r-  ÚalÚblÚalnÚblnÚanÚbnÚatokensÚbtokensÚblocksÚa1Úa2Úb1Úb2Úbtyper9  re  ru   rd  ÚtokensÚnextisnewlineÚisendoflineÚchompÚ	endoflineÚ	endspacesÚmaybetabÚcurrentlabels                                  r)   Údiffsinglehunkinliner‹  ¦
  s«  è è € õ 	‰Œ€AÝ‰Œ€AØð Mð MˆØ��!�Œ9˜ÒÐØ��a�b�b”‰MˆAˆAØ�!�A�#ŒY˜$ÒÐØ��a�b�b”‰MˆAˆAåÔ(Ð)DÀtÑ)KÑLÔLÐLàð �Að Ý 	Ñ*Ô*ð 	ð 	ˆAØˆGˆGˆGˆGØˆå	×	Ò	�e A™hœhÑ	'Ô	'€BÝ	×	Ò	�e A™hœhÑ	'Ô	'€Bà
6Ð
6°2Ð
6Ñ
6Ô
6€CØ
6Ð
6°2Ð
6Ñ
6Ô
6€CØ	�Š�#‰Œ€BØ	�Š�#‰Œ€Bà€GØ€GÝŒ_˜R ¨C¸Ð<Ñ<Ô<€FØ#)ð -ð -ÑÑˆˆR��R˜%Ø˜4’-ˆÝÔ(¨¯ª°"°R¸°U´)Ñ)<Ô)<Ñ=Ô=ð 	-ð 	-ˆEØ�NŠN˜G UÐ+Ñ,Ô,Ð,Ð,ÝÔ(¨¯ª°"°R¸°U´)Ñ)<Ô)<Ñ=Ô=ð 	-ð 	-ˆEØ�NŠN˜G UÐ+Ñ,Ô,Ð,Ð,ð	-ð
 
ˆ Ð(Ø	Ð Ð)ð"ð  %ð  %Ñˆ��vð ˆØ$ð 	%ð 	%‰NˆG�UØð &Ø˜u�oÐ%Ð%Ð%Ø %�àŸ.š.¨Ñ/Ô/ˆKØð 0Ø˜c˜r˜cœ
�Ø—>’> %Ñ(Ô(ð 'Ø! # 2 #œJ�EØ!¥# e¡*¤* , ,Ô/�	ØŸš™œ�Ø!¥# e¡*¤* , ,Ô/�	å'×/Ò/°Ñ6Ô6ð /ð /�Ø˜H Q q SœMÒ)Ð)Ø#.�L�Làð =Ø',¨{Ñ':˜˜à',¨}Ñ'<˜Ø Ð.Ð.Ð.Ð.Ð.Øð %Øð BØ$Ð&@ÐAÐAÐAÐAØ  #Ð&Ð&Ð&Ð&Ø $�øð7	%ð %ð  %r+   c              /   ó<  ‡‡K  — |                      d¦  «        r|d         j        rt          Šnt          Šg d¢}dg}d}g Šˆˆfd„} | |i |¤ŽD �]K}|                     d¦  «        }t          |¦  «        }	t          |¦  «        D �]\  }
}|r|                     d¦  «        rd}n|r|                     d¦  «        sd	}d}|s|r|                     d
¦  «        rd	}|}|r|}|r&|}|
dz   |	k     r|dz  }‰                     |¦  «         Œ„ |¦   «         D ]}|V — Œ| 	                    ¦   «         }|D ]C\  }}|                     |¦  «        r)||fV — ||k    r|t          |¦  «        d…         dfV —  nŒD|dfV — |
dz   |	k     rdV — �Œ |¦   «         D ]}|V — Œ�ŒMdS )z@yields 2-tuples of (output, label) based on the output of func()r   )
)rÆ  s   diff.diffline)ó   copyó   diff.extended)ó   renamerŽ  )s   oldrŽ  )s   newrŽ  )s   deletedrŽ  )s   indexrŽ  )s
   similarityrŽ  )r“   s   diff.file_a)r×  s   diff.file_b)rÔ  s	   diff.hunkFc               3   óF   •K  — ‰r ‰‰¦  «        D ]} | V — Œg ‰d d …<   d S d S rV   rW   )re  Ú
dodiffhunkÚ
hunkbuffers    €€r)   Úconsumehunkbufferz$difflabel.<locals>.consumehunkbuffer	  sN   øè è € Øð 	Ø#˜ JÑ/Ô/ð ð �Ø����ØˆJ�q�q�q‰MˆMˆMð	ð 	r+   r†   rÔ  )r   r    r   rÔ  r  T)r    r   r   Nr]  r+   ©r†   r+   )
r“  Úworddiffr‹  rf  r$   r%   r¬  r#   r5   ræ   )Úfuncr  ÚkwÚheadprefixesÚtextprefixesÚheadr“  r1   r0   Ú	linecountr  r&   ÚdifflineÚprefixesÚbufferedlinere  rc  ru   rd  r‘  r’  s                      @@r)   Ú	difflabelrŸ  î
  s§  øøè è € à	‡v‚vˆf�~„~ð $˜"˜Vœ*Ô-ð $Ý)ˆ
ˆ
å#ˆ
ðð ð €Lð 	ð€Lð €Dð €Jðð ð ð ð ð ð ��tÐ"˜rÐ"Ð"ð ,ñ ,ˆØ—’˜EÑ"Ô"ˆÝ˜‘J”Jˆ	Ý  Ñ'Ô'ð '	'ñ '	'‰GˆAˆtØð  Ø—?’? 4Ñ(Ô(ð !Ø �Døàð   §¢Ø3ñ!ô !ð  ð  �DØˆHØð  ˜Dð   T§_¢_°\Ñ%BÔ%Bð  Ø�à#ˆHØð (Ø'�Øð 'à#�Ø�q‘5˜9Ò$Ð$Ø  EÑ)�LØ×!Ò! ,Ñ/Ô/Ð/Ð/ð /Ð.Ñ0Ô0ð  ð  �EØ�K�K�K�KØ ŸKšK™MœM�	Ø%-ð 
&ð 
&‘M�F˜EØ ×+Ò+¨FÑ3Ô3ð Ø(¨%Ð0Ð0Ð0Ð0Ø 9Ò,Ð,à $¥S¨¡^¤^Ð%5Ð%5Ô 6Ø :ð#ð ð ð ð ˜ðð   ˜+Ð%Ð%Ð%Ø�q‘5˜9Ò$Ð$Ø&Ð&Ð&Ð&ùØ&Ð&Ñ(Ô(ð 	ð 	ˆEØˆKˆKˆKˆKñ	ðW,ð ,r+   c                  ó,   — t          t          g| ¢R i |¤ŽS )zBlike diff(), but yields 2-tuples of (output, label) for ui.write())rŸ  r/  )r  r—  s     r)   Údiffuir¡  >  s    € å•TÐ'˜DÐ'Ð'Ð' BÐ'Ð'Ð'r+   c              #   ó²  K  — t          ¦   «         }d„  |j        ¦   «         D ¦   «         }t          |¦  «        t          |¦  «        }}t          | |z   |z   ¦  «        D ]y}	d}
|	|	}}|	|v r8d}|	|v r1|j        r*||	         }||v r||vrd}
|                     |¦  «         n1d}
n.|	|v r*d}|j        r!|	|v r||	         |v r|||	                  |	k    rŒr|||
fV — ŒzdS )a  generates 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).c                 ó   — i | ]\  }}||“Œ	S rW   rW   )r‹   Úkr÷  s      r)   rA  z_filepairs.<locals>.<dictcomp>J  s   € Ð,Ð,Ð,‘t�q˜!ˆa�Ð,Ð,Ð,r+   Nr�  r�  )r7  r™   rH  rI  rC  )rE  rÅ  r8  rÉ   r   ÚgoneÚcopytorT  rU  rM  ÚcopyopÚf1Úf2s                r)   Ú
_filepairsrª  C  s0  è è € õ
 ‰5Œ5€Dà,Ð,˜z˜tœz™|œ|Ð,Ñ,Ô,€Få˜u™:œ:¥s¨7¡|¤|ˆj€Hå�H˜uÑ$ wÑ.Ñ/Ô/ð ð ˆØˆØ�AˆBˆØ�ˆ=ˆ=ØˆBØ�DˆyˆyØ”8ð )Ø˜aœ�BØ˜ZÐ'Ð'¨B°d¨N¨NØ!*˜ØŸš ™œ˜˜à!(˜øØ�*ˆ_ˆ_ØˆBØŒxð ð ˜�K�KØ˜qœ	 XÐ-Ð-Ø˜V AœYœ¨1Ò,Ð,àØ�"�fˆnÐÐÐÐð/ð r+   c                 óÂ   — | sd} t          | ¦  «        }t          j        d|z  ¦  «        }|                     | ¦  «         t	          |                     ¦   «         ¦  «        S )Nr+   s   blob %d )r%   r   Úsha1r  r   Údigest)rr  r(   rŒ  s      r)   Ú	_gitindexr®  h  sQ   € Øð ØˆÝˆD‰	Œ	€AÝŒ�l QÑ&Ñ'Ô'€AØ‡H‚HˆT�N„N€NÝˆq�xŠx‰zŒz‰?Œ?Ðr+   s   120000s   100755s   100644)re  rf  r+   c              #   ó¾  K  — |	j         rdx}}nd}d}d„ }d„ }t          j        |                     ¦   «         ¦  «        }t          j        |                     ¦   «         ¦  «        }|sd„ }t	          |||||	¦  «        D �]Þ\  }}}d}d}d}d}d}d}|r* |||¦  «        }|	j        s|
r|                     |¦  «        }|r* |||¦  «        }|	j        s|
r|                     |¦  «        }|	j        rd}nt          d	„ ||fD ¦   «         ¦  «        }|
rB|	j        s;|s,||v s(|s ||¦  «        s ||¦  «        r|r|s|s
|r|r||k    r |
|p|¦  «          ||p|¦  «        } ||p|¦  «        }g }|	j        �r3| 	                    d
||||fz  ¦  «         |s%| 	                    dt          |         z  ¦  «         �n|s$| 	                    dt          |         z  ¦  «         nët          |         t          |         } }|| k    r0| 	                    d|z  ¦  «         | 	                    d| z  ¦  «         |�w|	j        r<t          j        ||         ||         ¦  «        dz  }!| 	                    d|!z  ¦  «         | 	                    d||fz  ¦  «         | 	                    d||fz  ¦  «         n!|r| 	                     |||¦  «        ¦  «         |r?|	j        r|	j        r1|	j        r*|	j        s#|�d}|�|�|                     |¦  «        sd}n/d}n,|�|                     ¦   «         }|�|                     ¦   «         }||||||f}"||||||f}#t%          |"|#|||	¦  «        V — �ŒàdS )zígiven 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+   rÍ   rÒ   c                 óN   — d                      d„ |D ¦   «         ¦  «        }d|| fz  S )Nr   c                 ó   — g | ]}d |z  ‘ŒS )s   -r %srW   )r‹   rQ  s     r)   rÆ  z-trydiff.<locals>.diffline.<locals>.<listcomp>‘  s   € Ð<Ð<Ð<°˜X¨™^Ð<Ð<Ð<r+   s
   diff %s %sr%  )rM  rF  Úrevinfos      r)   rœ  ztrydiff.<locals>.diffline�  s1   € Ø—)’)Ð<Ð<°tÐ<Ñ<Ô<Ñ=Ô=ˆØ ¨˜|Ñ+Ð+r+   c                 ó:   — | d u p|                       ¦   «         dk    S rø   )rT  )ri  s    r)   Úisemptyztrydiff.<locals>.isempty”  s   € Ø�tˆ|Ð/˜tŸyšy™{œ{¨aÒ/Ð/r+   c                 ó   — | S rV   rW   )rM  s    r)   r’  ztrydiff.<locals>.<lambda>›  s   € ˜1€ r+   NFc              3   óB   K  — | ]}|®|                      ¦   «         V — Œd S rV   )Úisbinaryr:  s     r)   r�   ztrydiff.<locals>.<genexpr>°  s*   è è € ÐOÐO¨!ÀÀ˜Ÿš™œÀÀÀÀÐOÐOr+   s   diff --git %s%s %s%ss   new file mode %ss   deleted file mode %ss   old mode %ss   new mode %séd   s   similarity index %d%%s
   %s from %ss   %s to %só    s     )Únoprefixr   ÚdatestrÚdaterª  rI  rh  rr  rÁ  r5   Ú_gitmodeÚshowsimilarityr   ÚscoreÚnobinaryÚindexÚcmprª   Údiffcontent)$r5  rF  r  r  rE  rÅ  r8  rÉ   r9  r   r!  r"  ÚaprefixÚbprefixrœ  r´  Údate1Údate2r¨  r©  r§  Úcontent1Úcontent2r-  r.  Úflag1Úflag2rÁ   Úpath1Úpath2r¸   Úmode1Úmode2ÚsimÚdata1Údata2s$                                       r)   rC  rC  t  s�  è è € ð, „}ð ØÐˆ�'�'àˆØˆð,ð ,ð ,ð0ð 0ð 0õ Ô˜TŸYšY™[œ[Ñ)Ô)€EÝÔ˜TŸYšY™[œ[Ñ)Ô)€Eàð Ø�ˆå$ X¨u°g¸tÀTÑJÔJð d>ñ d>‰ˆˆB�ØˆØˆØˆØˆØˆØˆØð 	'Ø�J˜r 4Ñ(Ô(ˆEØŒxð '˜:ð 'ØŸ
š
 2™œ�Øð 	'Ø�J˜r 4Ñ(Ô(ˆEØŒxð '˜:ð 'ØŸ
š
 2™œ�àŒ9ð 	PØˆFˆFåÐOÐO°°u¨~ÐOÑOÔOÑOÔOˆFàð 	%˜dœhð 	%àð%ð �d�
�
ð ð ð $˜G E™NœNð ð �˜‘”ð ð )+ð ð ð ð "ð ð ð ð ð ð  %¨š~˜~à�
˜2˜8 Ñ$Ô$Ð$à��r�x˜RÑ Ô ˆØ��r�x˜RÑ Ô ˆØˆØŒ8ñ 	1Ø�MŠMØ'¨7°E¸7ÀEÐ*JÑJñô ð ð ð AØ—’Ð1µH¸U´OÑCÑDÔDÐDÑDØð AØ—’Ð5½À¼ÑGÑHÔHÐHÐHå'¨œµ¸´�u�Ø˜E’>�>Ø—M’M .°5Ñ"8Ñ9Ô9Ð9Ø—M’M .°5Ñ"8Ñ9Ô9Ð9ØÐ%ØÔ*ð FÝ%œm¨D°¬K¸¸e¼ÑEÔEÈÑK˜ØŸšÐ&>ÀÑ&DÑEÔEÐEØ—M’M -°6¸5°/Ñ"AÑBÔBÐBØ—M’M +°¸°Ñ"?Ñ@Ô@Ð@øØð 	1Ø�MŠM˜(˜( 5¨$Ñ/Ô/Ñ0Ô0Ð0ð ð 	(Ø”ð	(Ø!œXð	(Ø*.¬-ð	(Ø@DÄ
ð	(ð Ð Ø �ØÐ ØÐ$¨U¯YªY°uÑ-=Ô-=Ð$Ø$�H�Hà&�Høð Ð Ø Ÿ:š:™<œ<�ØÐ Ø Ÿ:š:™<œ<�à�u˜e U¨H°eÐ<ˆØ�u˜e U¨H°eÐ<ˆÝ˜% ¨°¸Ñ=Ô=Ð=Ð=Ð=Ñ=ðId>ð d>r+   c           
      óV  — | \  }}}}}	}
|\  }}}}}}||v rt          |	¦  «        nt          j        }||v rt          |¦  «        nt          j        }|rF|j        r?|j        s8t          j        |	|¦  «        }|r|                     d||fz  ¦  «         d|gff}nŒ|j        rQ|j        dk    rF|}|€|}|                     d|d|j        …         |d|j        …         t          |         fz  ¦  «         t          j
        |	|
||||||¬¦  «        \  }}|                     |¦  «         ||||fS )aO  diffs 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..%sNr   s   index %s..%s %s)rÁ   r   )r®  r   ÚnullhexrI  rÀ  r   Úb85diffr5   rÁ  r½  ÚunidiffÚextend)rÑ  rÒ  r¸   rÁ   r   r  r-  rÌ  rÊ  rÈ  rÆ  r  r.  rÍ  rË  rÉ  rÇ  Úindex1Úindex2rr  r„  ÚflagÚuheaderss                          r)   rÃ  rÃ    sƒ  € ð( 27Ñ.€Dˆ%�˜˜x¨Ø16Ñ.€Dˆ%�˜˜x¨Ø$)¨T M M�Y�xÑ Ô Ð Õ7HÔ7P€FØ$)¨T M M�Y�xÑ Ô Ð Õ7HÔ7P€FØð  �$”(ð   4¤=ð  ÝŒ}˜X xÑ0Ô0ˆØð 	>Ø�MŠM˜/¨V°VÐ,<Ñ<Ñ=Ô=Ð=Ø˜˜�Ð!ˆˆàŒ8ð 	˜œ
 Qš˜ØˆDØˆ|Ø�Ø�MŠMØ"à˜1˜tœz˜>Ô*Ø˜1˜tœz˜>Ô*Ý˜T”Nðññô ð õ  œ-ØØØØØØØØð	
ñ 	
ô 	
‰ˆ�%ð 	�Š�hÑÔÐØ�%˜ Ð&Ð&r+   c                 óº   — d\  }}}}}| D ]J\  }}}}	t          |t          j        |¦  «        ¦  «        }t          |||z   ¦  «        }||z  }||z  }|p|	}ŒK|||||fS )N)r   r   r   r   F)rÄ  r   Úcolwidth)
ÚstatsÚmaxfileÚmaxtotalÚaddtotalÚremovetotalrÁ   rM  r¢  r,  r¤  s
             r)   Údiffstatsumrã  =  s…   € Ø7HÑ4€GˆX�x ¨fØð ð ‰
ˆˆ1ˆa�Ý�g�xÔ0°Ñ3Ô3Ñ4Ô4ˆÝ�x  Q¡Ñ'Ô'ˆØ�A‰ˆØ�qÑˆØ�˜1ˆˆà�H˜h¨°VÐ;Ð;r+   c                 ó^  ‡‡‡‡‡	— t          j        d¦  «        }g Š	d\  ŠŠŠŠˆˆˆˆˆ	fd„}d}| D �]q}|                     d¦  «        r“ |¦   «          d}d\  ŠŠŠ|                     d¦  «        r.t                               |¦  «                             d	¦  «        ŠŒm|                     d
¦  «        r(|                     |¦  «                             d¦  «        ŠŒ«|                     d¦  «        rd}ŒÃ|                     d¦  «        r|s‰dz  ŠŒà|                     d¦  «        r|s‰dz  ŠŒý|                     d¦  «        s|                     d¦  «        rdŠ�Œ+|                     d¦  «        r|dd …         Š�ŒL|                     d¦  «        r‰d|dd …         z  z  Š�Œs |¦   «          ‰	S )Ns   ^diff .*-r [a-z0-9]+\s(.*)$)Nr   r   Fc                  óB   •— ‰r‰                      ‰‰ ‰‰f¦  «         d S d S rV   rS   )Úaddsr×  r·  ÚremovesÚresultss   €€€€€r)   Ú	addresultzdiffstatdata.<locals>.addresultO  s9   ø€ Øð 	@Ø�NŠN˜H d¨G°XÐ>Ñ?Ô?Ð?Ð?Ð?ð	@ð 	@r+   FrÆ  T)r   r   Frß   r"   s   diff -rr   s   @@r    r   rå   s   Binary files   rename fromrá   s	   rename tos    => %srâ   )r”   r•   r#   rç   r    ré   )
r0   r©   ré  r'   r&   ræ  r×  r·  rç  rè  s
        @@@@@r)   Údiffstatdatarê  I  s  øøøøø€ ÝŒZÐ7Ñ8Ô8€Fà€GØ(9Ñ%€Hˆd�G˜Xð@ð @ð @ð @ð @ð @ð @ð @ð @ð €Hàð .ñ .ˆØ�?Š?˜7Ñ#Ô#ð 	.ØˆI‰KŒKˆKð ˆHØ&1Ñ#ˆD�'˜8Ø�ŠÐ/Ñ0Ô0ð 8Ý Ÿ<š<¨Ñ-Ô-×3Ò3°AÑ6Ô6��Ø—’ Ñ,Ô,ð 8à!Ÿ=š=¨Ñ.Ô.×4Ò4°QÑ7Ô7�øØ�_Š_˜UÑ#Ô#ð 	.ØˆHˆHØ�_Š_˜TÑ"Ô"ð 	.¨8ð 	.Ø�A‰IˆDˆDØ�_Š_˜TÑ"Ô"ð 		.¨8ð 		.Ø�q‰LˆGˆGØ�_Š_Ð0Ñ1Ô1ð 	.°T·_²_Øñ6
ô 6
ð 	.ð ˆH‰HØ�_Š_˜^Ñ,Ô,ð 	.Ø˜B˜C˜C”yˆH‰HØ�_Š_˜\Ñ*Ô*ð 	.Ø˜	 D¨¨¨¤IÑ-Ñ-ˆHùØ€I�K„K€KØ€Nr+   éP   c           
      ó:  ‡‡— g }t          | ¦  «        }t          |¦  «        \  }Š}}}t          t          ‰¦  «        ¦  «        }|r|dk     rd}||z
  |z
  dz
  Š‰dk     rdŠˆˆfd„}	|D ]f\  }
}}}|rd}nd||z   z  }d |	|¦  «        z  }d |	|¦  «        z  }|                     d	|
d
|t          j        |
¦  «        z
  z  ||||fz  ¦  «         Œg|r5|                     t          d¦  «        t          |¦  «        ||fz  ¦  «         d                     |¦  «        S )Nr  r  râ   c                 ót   •— ‰‰k    r| S t          | ‰z  ‰z  t          t          | ¦  «        ¦  «        ¦  «        S rV   )rÄ  rê   Úbool)r  Ú
graphwidthrà  s    €€r)   Úscalezdiffstat.<locals>.scale‚  s:   ø€ Ø�zÒ!Ð!ØˆHõ �1�z‘> XÑ-­sµ4¸±7´7©|¬|Ñ<Ô<Ð<r+   s   BinrV  r    r   s    %s%s |  %*s %s%s
r   s5    %d files changed, %d insertions(+), %d deletions(-)
r+   )	rê  rã  r%   r‡  r5   r   rÝ  r   r/   )r0   ÚwidthÚoutputrÞ  ÚmaxnameÚ	totaladdsÚtotalremovesÚ	hasbinaryÚ
countwidthrð  r×  ræ  rç  r·  r±  ÚplusesÚminusesrï  rà  s                    @@r)   Údiffstatrú  v  s•  øø€ Ø€FÝ˜ÑÔ€EÝ<GÈÑ<NÔ<NÑ9€GˆX�y ,°	å•S˜‘]”]Ñ#Ô#€JØð �Z !’^�^Øˆ
Ø˜Ñ# gÑ-°Ñ1€JØ�B‚€Øˆ
ð=ð =ð =ð =ð =ð =ð .3ð 
ð 
Ñ)ˆ�$˜ Øð 	-ØˆEˆEà˜T G™^Ñ,ˆEØ˜˜˜d™œÑ#ˆØ˜˜˜w™œÑ'ˆØ�ŠØ"àØ˜¥(Ô"3°HÑ"=Ô"=Ñ=Ñ>ØØØØðññ
	
ô 
	
ð 
	
ð 
	
ð ð 
Ø�ŠÝÐGÑHÔHÝ�5‰zŒz˜9 lÐ3ñ4ñ	
ô 	
ð 	
ð
 �8Š8�FÑÔÐr+   c               /   ó~  K  — t          | i |¤Ž                     ¦   «         D ]›}|r�|d         dv rƒ|                     dd¦  «        \  }}|dz   dfV — t          j        d|¦  «        }|r|                     d¦  «        dfV — t          j        d	|¦  «        }|r|                     d¦  «        d
fV — n|dfV — dV — ŒœdS )zOlike diffstat(), but yields 2-tuples of (output, label) for
    ui.write()
    r‡  s   +-r   r   r+   s   \++r   s   diffstat.inserteds   -+s   diffstat.deletedr”  N)rú  r¢   Úrsplitr”   r    ré   )r  r—  r&   ÚnameÚgraphrC   s         r)   Ú
diffstatuirÿ  ¦  s  è è € õ
 ˜$Ð% "Ð%Ð%×0Ò0Ñ2Ô2ð ð ˆØð 
	�D˜”H Ð%Ð%ØŸ+š+ d¨AÑ.Ô.‰KˆD�%Ø˜$‘; Ð$Ð$Ð$Ð$Ý”	˜' 5Ñ)Ô)ˆAØð 9Ø—w’w˜q‘z”zÐ#7Ð8Ð8Ð8Ð8Ý”	˜& %Ñ(Ô(ˆAØð 8Ø—w’w˜q‘z”zÐ#6Ð7Ð7Ð7Ð7øà˜�+ÐÐÐØÐÐÐÐðð r+   rV   )r   r+   rn  )Nrn  )r+   Nrn  r   )r   r+   Nrn  r   )r   r+   )
NNNNNNNNNN)NNNNNNN)rë  )gr:  Ú
contextlibrÉ   rx   r”   r[  rƒ  Úi18nr   r>  r   r   r   r   r	   Ú r
   r   r   r   r   r   r   r   r   r   r   r   r  Úutilsr   r   r   r   r.   r•   rç   r_  rr  rõ  rŸ  r@  r$   r¤   Úcontextmanagerr‚   rz   r»   rï   rñ   rü   r  r2  rO  r_  rY  r`  r  rs  r¸   ræ  r  rJ  r™  r§  rˆ  r‹  r%  r²  rÀ  r¨  rÒ  rÝ  rw  rì  rð  rë  r	  r  r  r  r  r  Ú	Exceptionr  ÚdiffalloptsÚdiffoptsÚdifffeatureoptsr/  r)  rf  r‹  rŸ  r¡  rª  r®  r½  rC  rÃ  rã  rê  rú  rÿ  rW   r+   r)   ú<module>r	     sË  ðð Ð Ð Ð Ø Ð Ð Ð Ø €€€Ø 	€	€	€	Ø 	€	€	€	Ø €€€Ø €€€à Ð Ð Ð Ð Ð ðð ð ð ð ð ð ð ð ð ð
 Ð Ð Ð Ð Ð ðð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ð ðð ð ð ð ð ð ð ð ð ð ð ð Œ=€àˆŒ
Ð/Ñ0Ô0€ØˆbŒjÐ)Ñ*Ô*€ØˆrŒzØAñô €ð Ô€
ØÔ'€ØÔ3Ð ð
Bð Bð BðNð ð €ð Ôðð ñ Ôðð4nð nð nðb-:ð -:ð -:ð -:ð -:ñ -:ô -:ð -:ð`*ð *ð *ðZ(ð (ð (ð (ð (ñ (ô (ð (ð* "ð  "ð  "ð  "ð  "ñ  "ô  "ð  "ðF.*ð .*ð .*ð .*ð .*�ñ .*ô .*ð .*ðb.$ð .$ð .$ð .$ð .$�Yñ .$ô .$ð .$ðb#,ð #,ð #,ð #,ð #,ñ #,ô #,ð #,ðL*+ð *+ð *+ð *+ð *+�/ñ *+ô *+ð *+ð\ ˆ"Œ*ÐCÑ
DÔ
D€ØˆbŒjÐKÑLÔL€Ø/Ð/Ð/€ðdð dð dð dð dñ dô dð dðNM
ð M
ð M
ð M
ð M
ñ M
ô M
ð M
ð`kBð kBð kBð kBð kBñ kBô kBð kBð\@ð @ð @ðFoð oð oð oðda,ð a,ð a,ð a,ð a,ñ a,ô a,ð a,ðH;ð ;ð ;ð ;ð ;ñ ;ô ;ð ;ð|ð ð ð=ð =ð =ð@Mð Mð Mð Mð`&9ð &9ð &9ðR:ð :ð :ðz0%ð 0%ð 0%ðfð ð ð6dKð dKð dKðN8ð 8ð 8ðvð ð ð ð,ð ð ð CLð\ð \ð \ð \ð~.ð .ð .ðd ?Hðð ð ð ðF Ø
ØØðNð Nð Nð Nð" HQðNð Nð Nð Nð ØØ
ØØðð ð ð ðBð ð ð ð4	ð 	ð 	ð 	ð 	�iñ 	ô 	ð 	ð Ô€ØÔ"€ØÔ*€ð
 Ø
Ø
ØØ	ØØØ	ØØðHð Hð Hð Hð^ ØØ	ØØØ	ØðC"ð C"ð C"ð C"ðL0ð 0ð 0ð2E%ð E%ð E%ðPMð Mð Mð`(ð (ð (ð
"ð "ð "ðJð ð ð  9°9Ð=Ð=€ðM>ð M>ð M>ð`6'ð 6'ð 6'ðr	<ð 	<ð 	<ð*ð *ð *ðZ-ð -ð -ð -ð`ð ð ð ð r+   