*1dZddlmZddlZddlZddlmZmZm Z dZ ddZ dZ dZ dd Zd Zd Zd Zdd ZdZdZddZddZddZy)z~Classes for dealing with git am-style patches. These patches are basically unified diffs with some extra metadata tacked on. )SequenceMatcherN)BlobCommit S_ISGITLINKi@c0|xs t|dd}t|tr|j|}|\}}|j d|j zdzt j|jj|zdz|j d|jzdz|j dt jdj|zdz|j d ||fzj||jzdz|j d|j d  d d l }|jd g|j|j} | j|\} } |j | |j d|j ||j d|d dlm} |j d| zy |j |j|dzy #t t"f$rYtwxYw)zWrite a individual file patch. Args: commit: Commit object progress: Tuple with current patch number and total. Returns: tuple with filename and contents encodingasciisFrom   From: sDate: z%a, %d %b %Y %H:%M:%S %ZzSubject: [PATCH %d/%d] --- rNdiffstat)stdoutstdin-- ) __version__sDulwich %d.%d.%d )getattr isinstancestrencodewriteidtimectime commit_timeauthorstrftimemessage subprocessPopenPIPE communicate ImportErrorOSErrordulwichr) fcommitcontentsprogressversionrnumtotalrpr_dulwich_versions lib/third_party/dulwich/patch.pywrite_commit_patchr1(s:71j':H(C ??8,LS%GG ))    **V'' ( / / 9 :   GGI % -.GGDMM"<=DDXNNQVVGG "c5\ 199(C ..    GGENGGH     L     h/ 1  GGHGGH: %78 x(501  !   s=-HHHc|jjd}|jdjddS)zrDetermine the summary line for use in a filename. Args: commit: Commit Returns: Summary string replace)errorsr -)rdecode splitlinesr3)r'decodeds r0 get_summaryr:]s<nn##9#5G     " * *3 44ct|dz}||z }|dk(rdj|S|s|dz}dj||S)z Convert range to the "ed" formatz{}z{},{})format)startstop beginninglengths r0_format_range_unifiedrCisI I E\F {{{9%% Q >>)V ,,r;c #Kd} td||j|D]R} | sd} |rdj|nd} |rdj|nd} dj|j|| |j | dj|j|| |j | | d| d }}t |d |d }t |d |d }dj|||j | | D]d\}}}}}|dk(r|||D] }d|z  |dvr|||D]}|d ddk(s|dz }d|z|dvsG|||D]}|d ddk(s|dz }d|zfUyw)zdifflib.unified_diff that can detect "No newline at end of file" as original "git diff" does. Based on the same function in Python2.7 difflib.py FNTz {}z --- {}{}{}z +++ {}{}{}rr=z@@ -{} +{} @@{}equalr )r3deleter s \ No newline at end of file -)r3insert+)rget_grouped_opcodesr>r7rrC)abfromfiletofile fromfiledate tofiledatenlineterm tree_encodingoutput_encodingstartedgroupfromdatetodatefirstlast file1_range file2_rangetagi1i2j1j2lines r0 unified_diffrhus"G q!,@@CG6Bv}}\2H2 +E!Hd1g> &&{KJQQ   $) CRRg~bHD+%%++bHD9- CC+%%++bHD9- CC+%%$)'Ds EE8$E8cd|dtvS)z}See if the first few bytes contain any null characters. Args: content: Bytestring to check for binary content N)FIRST_FEW_BYTEScontents r0 is_binaryrns G,_- --r;c|y|ddS)Ns0000000)hexshas r0shortidrss ~bqzr;c|y|dz|zS)Ns /dev/null/rq)r-roots r0patch_filenamerwsyd{Qr;c|\}}}|\}} } t|d} t|d} fd} d}|jt||f|| f|| f| ||}| | | }|sJt|jst|jr d| zdz| zdz}|j |y|jt ||||| | y) aWrite the diff for an object. Args: f: File-like object to write to store: Store to retrieve objects from, if necessary old_file: (path, mode, hexsha) tuple new_file: (path, mode, hexsha) tuple diff_binary: Whether to diff files even if they are considered binary files by is_binary(). Note: the tuple elements should be None for nonexistant files abc|tjdSt|rtjd|zdzS|S)Nr;sSubproject commit r )r from_stringr)moderrstores r0rmz"write_object_diff..contentsG >##C( (  ##$9F$BU$JK K= r;c*|sgS|jSNr8rls r0linesz write_object_diff..linessI%%' 'r;s Binary files s and s differ N)rw writelinesgen_diff_headerrndatarrh)r&r~old_filenew_file diff_binaryold_pathold_modeold_idnew_pathnew_modenew_idpatched_old_pathpatched_new_pathrmr old_content new_content binary_diffs ` r0write_object_diffrs$, Xx#+ Xx%h5%h5!( LL8,x.BVVDTU(F+K(F+K Ik&6&679[EUEU;V          k"k"    r;c#K|\}}|\}}|\}}|||}|||}t|d}t|d}d|zdz|zdz||k7rG|/|d|zjdd |zjdnd |zjdd t|zd zt|z||d |zjddyw)zWrite a blob diff header. Args: paths: Tuple with old and new path modes: Tuple with old and new modes shas: Tuple with old and new shas Nryrzs diff --git r r zold file mode %o r znew file mode %o zdeleted file mode %o sindex s..z %o)rwrrs) pathsmodesshasrrrrold_shanew_shas r0rrs!Xx XxWgH0H0h-Hh-H 8 #d *X 5 ==8  #+h6>>wGG'(2::7C C+h6>>wG G gg& & .1A AA 4x''00 KsCCc |\}}}|\}}}t|d} t|d} d} |jt||f||ft|ddt|ddf| |} | |} |jt | | | | y)aWrite blob diff. Args: f: File-like object to write to old_file: (path, mode, hexsha) tuple (None if nonexisting) new_file: (path, mode, hexsha) tuple (None if nonexisting) Note: The use of write_object_diff is recommended over this function. ryrzc*||jSgSrr)blobs r0rzwrite_blob_diff..lines,s  ??$ $Ir;rN)rwrrrrh)r&rrrrold_blobrrnew_blobrrr old_contents new_contentss r0write_blob_diffrs&."Xx%-"Xx%h5%h5 LL x x XtT *GHdD,I J ?L?LLL\<1ACSTr;c ||j||}|D]%\\}}\}} \} } t||||| f|| | f|'y)zWrite tree diff. Args: f: File-like object to write to. old_tree: Old tree id new_tree: New tree id diff_binary: Whether to diff files even if they are considered binary files by is_binary(). )rN) tree_changesr) r&r~old_treenew_treerchangesoldpathnewpatholdmodenewmodeoldshanewshas r0write_tree_diffr@s]  84GDK@'.Wg0@  gv & gv &#  ELr;c||xs t|dd}|xsd}|j}t|trKttj ddr0tj j }|j|}n/tj j}|j|}t||S)zParse a git-am-style patch and split it up into bits. Args: f: File-like object to parse encoding: Encoding to use when creating Git objects Returns: Tuple with commit object, diff contents and git version rr BytesParserN) rreadrbytesemailparserr parsebytesParserparsestrparse_patch_message)r&rr(rmsgs r0git_am_patch_splitrUs:71j':H"7HvvxH(E"wu||]D'Q))+)$$&ooh' sH --r;c2t}|dj||_|dj||_ |dj d}|dj d|}|d|dzd}|j dddzj||_d }|jd }|jd }t|} | D]n} | d k(rng|rN| jd r"| td dj|_n|xjd | zz c_d}Z|xj| z c_pd} | D]} | dk(rn| | z }  t| jd } || | fS#t $r |d}YwxYw#t$rd} Y'wxYw)zExtract a Commit object and patch from an e-mail message. Args: msg: An email message (email.message.Message) encoding: Encoding to use to encode Git commits Returns: Tuple with commit object, diff contents and git version fromsubjectz[PATCHz] rGN rET)r7r r r Fr;r)rrr committerindex ValueErrorr3r get_payloadr8iter startswithlenrstripnext StopIteration) rrcpatch_tag_startcloserr^bodyr line_iterrgdiffr*s r0rris A6{!!(+AHf+$$X.AK.i...x8I$$T?;i.-r*T199(CAI E ??$? 'D OOD !EU I 8   y)I 0188: UT\) E II I D 8    y/((/ dG A !i.!< s#E3F3FF FF)NN)rErErErErHrutf-8r)Fr)__doc__difflibr email.parserrrdulwich.objectsrrrrkr1r:rCrhrnrsrwrrrrrrrqr;r0rs* $  22j5 -  3&l.6 tB F *.(-r;