mxi$jlUgdZddlZddlZddlZddlmZddlmZddlm Z ddl m Z ddl m Z mZddlmZmZmZmZmZmZmZmZmZmZmZdd lmZmZer$dd lmZdd lm Z dd l!m"Z"dd l#m$Z$ddl%m&Z&ddl'm(Z(edZ)ejTGddejVZ,e,jZZ-ee,jZe.d< e,j^Z/ee,j^e.d< ej`dZ1dede2fdZ3d$de2de4dee2fdZ5GddZ6edd Z7Gd!d"ee7Z8Gd#dZ9y)%) DiffConstants NULL_TREEINDEXDiffable DiffIndexDiffN)handle_process_output)defenc)Blob)mode_str_to_int)finalize_process hex_to_bin) AnyIteratorListMatchOptionalSequenceTuple TYPE_CHECKINGTypeVarUnioncast)PathLikeLiteral)Popen)Git) IndexObject)Commit)Tree)Repo)ADCMRTUcVeZdZdZej Z ej Zy)raySpecial objects for :meth:`Diffable.diff`. See the :meth:`Diffable.diff` method's ``other`` parameter, which accepts various values including these. :note: These constants are also available as attributes of the :mod:`git.diff` module, the :class:`Diffable` class and its subclasses and instances, and the top-level :mod:`git` module. N)__name__ __module__ __qualname____doc__enumautorr?/home/htdocs/ttos/venv/lib/python3.12/site-packages/git/diff.pyrr1s/  I DIIKEr1rrrs \\([0-9]{3})matchobjreturncj|jd}t|d}tt|f}|S)N)groupintbytes bytearray)r3values r2 _octal_replr=cs1 NN1 E qME )UH% &E Lr1path has_ab_prefixcj|dk(ry|jdrV|jdrE|ddjddjddjd djd d }tj t |}|r)|jd s|jd sJ|dd}|S)Ns /dev/null"r6s\n s\t s\"s\\\sa/sb/) startswithendswithreplace_octal_byte_resubr=)r>r?s r2 decode_pathrLjs | tt!4Abz!!&%088GOOPVX\]eefmotu   k4 0Du%)???ABx Kr1c eZdZUdZdZded< eZ eZ eZ de e e dfde e e dffdZ edd fd e e d d edfd e e e e ee dfdfdededdf dZy)raGCommon interface for all objects that can be diffed against another object of compatible type. :note: Subclasses require a :attr:`repo` member, as it is the case for :class:`~git.objects.base.Object` instances. For practical reasons we do not derive from :class:`~git.objects.base.Object`. r0r!repoargsr4c|S)z :return: Possibly altered version of the given args list. This method is called right before git command execution. Subclasses can use it to alter the behaviour of the superclass. r0)selfrOs r2_process_diff_argszDiffable._process_diff_argss  r1NFotherr rpaths. create_patchkwargsDiffIndex[Diff]c Jg}|jd|jdtfddDs|jd|r#|jd|jdn"|jd|jd |jd |t|ttfs|g}|j j j}|tur|jd d n|turE|jd d |jd d|j j j}nF|D|jd d |jd ||j j j}|jd ||r"|jd|j|dd<||j|i}|rtjntj }||j |} |j#| S)aCCreate diffs between two items being trees, trees and index or an index and the working tree. Detects renames automatically. :param other: This the item to compare us with. * If ``None``, we will be compared to the working tree. * If a :class:`~git.types.Tree_ish` or string, it will be compared against the respective tree. * If :const:`INDEX`, it will be compared against the index. * If :const:`NULL_TREE`, it will compare against the empty tree. This parameter defaults to :const:`INDEX` (rather than ``None``) so that the method will not by default fail on bare repositories. :param paths: This a list of paths or a single path to limit the diff to. It will only include at least one of the given path or paths. :param create_patch: If ``True``, the returned :class:`Diff` contains a detailed patch that if applied makes the self to other. Patches are somewhat costly as blobs have to be read and diffed. :param kwargs: Additional arguments passed to :manpage:`git-diff(1)`, such as ``R=True`` to swap both sides of the diff. :return: A :class:`DiffIndex` representing the computed diff. :note: On a bare repository, `other` needs to be provided as :const:`INDEX`, or as an instance of :class:`~git.objects.tree.Tree` or :class:`~git.objects.commit.Commit`, or a git command error will occur. z --abbrev=40z --full-indexc3&K|]}|v ywNr0).0xrVs r2 z Diffable.diff..sL11;Ls) find_renames no_renamesr%z-Mz-pz --no-ext-diffz--rawz-zz --no-colorrz--cachedz-rz--rootz--T as_process)appendany isinstancetuplelistrNgitdiffrinsertr diff_treeextendrRr_index_from_patch_format_index_from_raw_formatwait) rQrSrTrUrVrOdiff_cmdproc diff_methodindexs ` r2rgz Diffable.diffs\13 M" N#L(KLL KK   KK  KK ( KK KK  L!  Zt}%EGE99==%% E> KK: & i  KK4 KK8 $yy}}..H   KK4 KK5 !yy}}..H At  KK  KK  $|006A&A7Cd33IdId DIIt,  r1)r*r+r,r- __slots____annotations__rrIndexrrrrRrstrrboolrrgr0r1r2rrzsI LRI E E  5:-./  eHj() * DIMQ" _]FHc4?@_XtH~uXs]/CTIJ_ _  _  _r1rT_Diffr)boundcDeZdZUdZdZeeded< dede e fdZ y)rzAn index for diffs, allowing a list of :class:`Diff`\s to be queried by the diff properties. The class improves the diff handling convenience. )r"r$r#r&r%r' change_typer4c#K||jvrtd|z|D]}|j|k(r||dk(r|jr|-|dk(r|jr|C|dk(r|jr|Y|dk(r|j r|o|dk(su|j s|js|j |jk7s|yw)a :return: Iterator yielding :class:`Diff` instances that match the given `change_type` :param change_type: Member of :attr:`DiffIndex.change_type`, namely: * 'A' for added paths * 'D' for deleted paths * 'R' for renamed paths * 'M' for paths with modified data * 'T' for changed in the type paths zInvalid change type: %sr"r#r$r&r%N)rz ValueErrornew_file deleted_file copied_file renamed_filea_blobb_blob)rQrzdiffidxs r2iter_change_typezDiffIndex.iter_change_type/s d.. .6DE E G""k1 #(8(8 #(<(< #(;(; #(<(< #7>>gnn`g`n`nNn  sBC C# C0C CN) r*r+r,r-rzrrrsLit_change_typerrwrr0r1r2rrs= DbK'">?@aO@Pr1rc xeZdZdZej dej ejzZdZ dZ dZ ddde e d e e d eee d fd eee d fd ee ed fdee ed fdededede e de e deee d fde ede edd f dZdedefdZdedefdZdefdZdefdZede efdZede efdZede efd Zede efd!Zedefd"Zedefd#Ze d$e d%e d&e de e fd'Z!e ddd(ed)de"dfd*Z#e$d+e ddd,e"ddd fd-Z%e d/d.Z&y )0raA Diff contains diff information between two Trees. It contains two sides a and b of the diff. Members are prefixed with "a" and "b" respectively to indicate that. Diffs keep information about the changed blob objects, the file mode, renames, deletions and new files. There are a few cases where ``None`` has to be expected as member variable value: New File:: a_mode is None a_blob is None a_path is None Deleted File:: b_mode is None b_blob is None b_path is None Working Tree Blobs: When comparing to working trees, the working tree blob will have a null hexsha as a corresponding object does not yet exist. The mode will be null as well. The path will be available, though. If it is listed in a diff, the working tree version of the file must differ from the version in the index or tree, and hence has been modified. s ^diff[ ]--git [ ](?P"?[ab]/.+?"?)[ ](?P"?[ab]/.+?"?)\n (?:^old[ ]mode[ ](?P\d+)\n ^new[ ]mode[ ](?P\d+)(?:\n|$))? (?:^similarity[ ]index[ ]\d+%\n ^rename[ ]from[ ](?P.*)\n ^rename[ ]to[ ](?P.*)(?:\n|$))? (?:^new[ ]file[ ]mode[ ](?P.+)(?:\n|$))? (?:^deleted[ ]file[ ]mode[ ](?P.+)(?:\n|$))? (?:^similarity[ ]index[ ]\d+%\n ^copy[ ]from[ ].*\n ^copy[ ]to[ ](?P.*)(?:\n|$))? (?:^index[ ](?P[0-9A-Fa-f]+) \.\.(?P[0-9A-Fa-f]+)[ ]?(?P.+)?(?:\n|$))? (?:^---[ ](?P[^\t\n\r\f\v]*)[\t\r\f\v]*(?:\n|$))? (?:^\+\+\+[ ](?P[^\t\n\r\f\v]*)[\t\r\f\v]*(?:\n|$))? (0000000000000000000000000000000000000000s)rra_modeb_mode a_rawpath b_rawpathr}r~rraw_rename_from raw_rename_torgrzscorerNr!rr a_blob_idN b_blob_idrrr}r~rrrrgrzrr4ct|t|tsJ|t|tsJ||_||_|r t |nd|_|r t |nd|_|rX|rV|jD]G}|j|jtdk(s'|jr|j}n||||jk(rd|_n1t|t!||j |j"|_||||jk(rd|_n1t|t!||j |j&|_||_| |_| |_| t| tsJ| t| tsJ| xsd|_| xsd|_| |_||_||_y)NrI)moder>)rcr:rrr rr submodulesr>decoder module_existsmodule NULL_HEX_SHArr ra_pathrb_pathr}r~rrrrgrzr)rQrNrrrrrrr}r~rrrrgrzr submodules r2__init__z Diff.__init__s$ Jy%$@@@ Jy%$@@@""17of-T 17of-T  I!__  >>Y%5%5fi%HH ..0(//1     T->-> >DKtZ %:SWS^S^_DK   T->-> >DKtZ %:SWS^S^_DK& ".!,&*_e*LLL$ =%(HHH.6$*2d 9D r1rSc\|jD]}t||t||k7syy)NFT)rrgetattr)rQrSnames r2__eq__z Diff.__eq__s3NN DtT"geT&:: r1c||k( SrZr0)rQrSs r2__ne__z Diff.__ne__sEM""r1cRttfdjDS)Nc36K|]}t|ywrZ)r)r[nrQs r2r]z Diff.__hash__..sCq'$*Cs)hashrdrrrQs`r2__hash__z Diff.__hash__sECDNNCCDDr1cd}|jr||jjz}n%|jr||jjz}d}d}d}t|j|jfdD]C\}}|rd||j|j fz}nd|z}t t||}||z }E|dd|zzz }|jr|d z }|jr|d z }|jr|d |jd |jz }|jr|d |jzz }|jr|d|jzz }|jrS|dz } |t!|jt"r|jj%t&n |jz }|dz }||zS#t($r|dz }YwxYw)Nz%sr)lhsrhsz %s: %o | %sz %s: None =z file deleted in rhsz file added in rhsz file z copied from z file renamed from %rz file renamed to %rz ---zOMITTED BINARY DATA)rr>rziprhexshamaxlenr~r}rrr rename_from rename_torgrcr:rr UnicodeDecodeError)rQhmsgline line_lengthbrs r2__str__z Diff.__str__s  ;; !! !A [[ !! !A dkk2NC DAq&!QVVQXX)>>#a'c$i5K 4KC  TC+% %%    * *C == ( (C    dkkJ JC    +d.>.>> >C >> )DNN: :C 99 7NC -:dii3Otyy''/UYU^U^^ 7NC3w & -,, -s"AF44GGc^|jr |jjtdSdSNrI)rrr rs r2rz Diff.a_path$;?>>t~~$$VY7StSr1c^|jr |jjtdSdSr)rrr rs r2rz Diff.b_pathrr1c^|jr |jjtdSdSr)rrr rs r2rzDiff.rename_froms)AEAUAUt##**69=_[__r1c^|jr |jjtdSdSr)rrr rs r2rzDiff.rename_to s)?C?Q?Qt!!((;[W[[r1cRtjdtd|jS)aDeprecated, use :attr:`renamed_file` instead. :return: ``True`` if the blob of our diff has been renamed :note: This property is deprecated. Please use the :attr:`renamed_file` property instead. z9Diff.renamed is deprecated, use Diff.renamed_file insteadrF) stacklevel)warningswarnDeprecationWarningrrs r2renamedz Diff.renamed$s'  G     r1c4|j|jk7S)z::return: ``True`` if the blob of our diff has been renamed)rrrs r2rzDiff.renamed_file6s4>>11r1 path_match rename_matchpath_fallback_matchcV|r t|S|r t|dS|r t|Sy)NF)r?)rL)clsrrrs r2_pick_best_pathzDiff._pick_best_path;s2 z* * |5A A 23 3r1ro)rzGit.AutoInterruptcg}t||jdtddj|}t }d}d}d\}} d\} } |j j |D]D} | j\} }}}}}}}}}}} }} t|t|t|}}}|j||| }|j| ||} |)||j| j|d_ |xs|xs|xr | xs|xs|} | xs|xs |xs| xr| } |jt||| |xr|jt|xr|jt| xr| jt| xr| jt|||||ddd| }| }G|r|r||jd|d_ |S)aCreate a new :class:`DiffIndex` from the given process output which must be in patch format. :param repo: The repository we are operating on. :param proc: :manpage:`git-diff(1)` process to read from (supports :class:`Git.AutoInterrupt ` wrapper). :return: :class:`DiffIndex` NFdecode_streamsr1)NNrB)r rar joinr re_headerfinditergroupsrvrendstartrgrrr )rrNro text_listtextrqprevious_headerheaderrrrr_headera_path_fallbackb_path_fallbackold_modenew_moderr new_file_modedeleted_file_modecopied_file_namerrr}r~rs r2rkzDiff._index_from_patch_formatHs""$ dI$4$4drrrr _change_typerz score_strrrrr~r}rrr a_path_str b_path_strrgs r2_handle_diff_linezDiff._handle_diff_lines ""6*ooc* 1eKK(@ D NN62MD!T;;v&DFJZZPTVWEX BHh 9l,0a+QK QR 01I&/&7&7&9C NtE::d#D[[(F[[(F LHKKIc! # # #" )-FA)>& J#**62#**62#)-FA)>& J#**62#**62)/Y #D" LL A@ r1cRtt|fddtdS)a!Create a new :class:`DiffIndex` from the given process output which must be in raw format. :param repo: The repository we are operating on. :param proc: Process to read output from. :return: :class:`DiffIndex` c*j|SrZ)r)bytrrqrNs r2z-Diff._index_from_raw_format..s--c4?r1NFr)rr r )rrNrorqs`` @r2rlzDiff._index_from_raw_formats*"'[  ?     r1)rNr!rorr4rW)'r*r+r,r-recompileVERBOSE MULTILINErr NULL_BIN_SHArrrr:rrurvrr9robjectrrrrpropertyrrrrrr classmethodrrrk staticmethodrrlr0r1r2rrPsB  $ R\\!'I.LLI";;E?;E? ; eT)* ; eT)* ;eS$&';eS$&';;;;"%; ;C$%;o.; }!;" #;zFt#F#t#E#E++ZT TTT TT`Xc]``\8C=\\!!!"2d22  e Z_ dlmrds  ZFZ%@\:]ZbklrbsZZxFuFFF9VCTFY]FFPr1)T):__all__r.rrgit.cmdr git.compatr git.objects.blobr git.objects.utilr git.utilr rtypingrrrrrrrrrrr git.typesrr subprocessrrgit.objects.basergit.objects.commitrgit.objects.treer git.repo.baser!runiqueEnumrrrsrrrJr:r=rvrLrrwrrr0r1r2rsD S R )!,1    ( ,)%";< DII 8/<.E.E 7=** +E'4&9&9w}""#9,-%E e D HUO  ^^B  (.V .dxxr1