o ﯪgi@sUgdZddlZddlZddlZddlmZddlmZddlm Z ddl m Z ddl m Z mZddlmZmZmZmZmZmZmZmZmZmZdd lmZmZerwdd lmZdd lmZdd l m!Z!dd l"m#Z#ddl$m%Z%ddl&m'Z'edZ(ej)Gdddej*Z+e+j,Z,ee+j,e-d< e+j.Z.ee+j.e-d< e/dZ0dede1fddZ2d'de1de3dee1fddZ4Gdd d Z5ed!d"d#Z6Gd$d%d%ee6Z7Gd&d"d"Z8dS)() DiffConstants NULL_TREEINDEXDiffable DiffIndexDiffN)handle_process_output)defenc)Blob)mode_str_to_int)finalize_process hex_to_bin) AnyIteratorListMatchOptionalTuple TYPE_CHECKINGTypeVarUnioncast)LiteralPathLike)Popen)Git) IndexObject)Commit)Tree)Repo)ADCMRTUc@s"eZdZdZeZ eZdS)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__enumautorrr-r-D/var/www/html/chatdoc2/venv/lib/python3.10/site-packages/git/diff.pyr0s  rrrs \\([0-9]{3})matchobjreturncCs&|d}t|d}tt|f}|S)N)groupintbytes bytearray)r/valuer-r-r. _octal_replbs  r8Tpath has_ab_prefixcCs|dkrdS|dr&|dr&|ddddddd dd d }tt|}|r@|d s:|d s:J|dd}|S)Ns /dev/null"r1s\n s\t s\"s\\\sa/sb/) startswithendswithreplace_octal_byte_resubr8)r9r:r-r-r. decode_pathis,  rFc @seZdZUdZdZded< eZ eZ eZ de e e dfde e e dffddZ ed d fd e e d d ed fde e e e ee dfd fdededdf ddZd S)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`. r-rrepoargsr0cCs|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. r-)selfrHr-r-r._process_diff_argss zDiffable._process_diff_argsNFotherrrpaths. create_patchkwargsDiffIndex[Diff]c  sjg}|d|dtfdddDs|d|r)|d|dn |d |d |d |d urFt|ttfsF|g}|jjj}|turV| d dn+|t url| d d| d d|jjj }n|d ur| d d| d ||jjj }| d ||r|d| |dd<|| |i}|rtjntj}||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-indexc3s|]}|vVqdSNr-).0xrNr-r. sz Diffable.diff..) find_renames no_renamesr#z-Mz-pz --no-ext-diffz--rawz-zz --no-colorNrz--cachedz-rz--rootz--T as_process)appendany isinstancetuplelistrGgitdiffrinsertr diff_treeextendrJr_index_from_patch_format_index_from_raw_formatwait) rIrKrLrMrNrHdiff_cmdproc diff_methodindexr-rSr.r^sD.                   z Diffable.diff)r'r(r)r* __slots____annotations__rrIndexrrrrJrstrrboolrr^r-r-r-r.rys<     rT_Diffr)boundc@s,eZdZdZdZ dedeefddZdS)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_typer0ccs||jvr td||D]J}|j|kr|Vq|dkr$|jr$|Vq|dkr/|jr/|Vq|dkr:|jr:|Vq|dkrE|jrE|Vq|dkrX|jrX|jrX|j|jkrX|VqdS)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)rp ValueErrornew_file deleted_file copied_file renamed_filea_blobb_blob)rIrpdiffidxr-r-r.iter_change_type.s$    zDiffIndex.iter_change_typeN) r'r(r)r*rpLit_change_typerrnryr-r-r-r.rs  rc @seZdZdZedejejBZdZ 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 ddZdedefddZdedefddZdefdd Zdefd!d"Zede efd#d$Zede efd%d&Zede efd'd(Zede efd)d*Zedefd+d,Zedefd-d.Ze d/e d0e d1e de e fd2d3Z!e ddd4ed5de"dfd6d7Z#e$d8e ddd9e"ddd fd:d;Z%e d@d>d?Z&d S)AraA 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)rvrwa_modeb_mode a_rawpath b_rawpathrrrsrtraw_rename_from raw_rename_tor^rpscorerGrr~r a_blob_idN b_blob_idr|r}rrrsrtrrr^rprr0cCsn|dus t|ts J|dust|tsJ||_||_|r"t|nd|_|r+t|nd|_|rK|rK|jD]}|j| t dkrJ| rH| }nq5||dusV||j krZd|_n t|t||j|jd|_||dusr||j krvd|_n t|t||j|jd|_||_| |_| |_| dust| tsJ| dust| tsJ| pd|_| pd|_| |_||_||_dS)NrC)moder9)rZr5r~rr r|r} submodulesr9decoder module_existsmodule NULL_HEX_SHArvr r a_pathrwb_pathrrrsrtrrr^rpr)rIrGr~rrrr|r}rrrsrtrrr^rpr submoduler-r-r.__init__s>    z Diff.__init__rKcCs*|jD]}t||t||krdSqdS)NFT)rigetattr)rIrKnamer-r-r.__eq__s z Diff.__eq__cCs ||k SrPr-)rIrKr-r-r.__ne__s z Diff.__ne__csttfddjDS)Nc3s|]}t|VqdSrP)r)rQnrIr-r.rTsz Diff.__hash__..)hashr[rirr-rr.__hash__sz Diff.__hash__cCsVd}|jr ||jj;}n |jr||jj;}d}d}d}t|j|jfdD]\}}|r4d||j|jf}nd|}tt||}||7}q$|dd|7}|jrS|d 7}|j rZ|d 7}|j rg|d |j |j f7}|j rq|d |j 7}|jr{|d |j7}|jr|d7}z|t|jtr|jtn|j7}Wn ty|d7}Ynw|d7}||S)Nz%sr)lhsrhsz %s: %o | %sz %s: None =z file deleted in rhsz file added in rhsz file %r copied from %rz file renamed from %rz file renamed to %rz ---zOMITTED BINARY DATA)rvr9rwziprhexshamaxlenrsrrrtrr rename_from rename_tor^rZr5rr UnicodeDecodeError)rIhmsgline line_lengthbrr-r-r.__str__sD  &  z Diff.__str__cC|jr |jtdSdSNrC)r~rr rr-r-r.rz Diff.a_pathcCrr)rrr rr-r-r.rrz Diff.b_pathcCrr)rrr rr-r-r.rrzDiff.rename_fromcCrr)rrr rr-r-r.rrzDiff.rename_tocCstjdtdd|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 insteadr@) stacklevel)warningswarnDeprecationWarningrurr-r-r.renamed#s  z Diff.renamedcCs |j|jkS)z::return: ``True`` if the blob of our diff has been renamed)rrrr-r-r.ru5s zDiff.renamed_file path_match rename_matchpath_fallback_matchcCs,|rt|S|rt|ddS|rt|SdS)NF)r:)rF)clsrrrr-r-r._pick_best_path:s zDiff._pick_best_pathrf)rzGit.AutoInterruptcCsxg}t||jdtddd|}t}d}d}d\}} d\} } |j|D]} | \} }}}}}}}}}}} }} t|t|t|}}}| ||| }| | ||} |durg|| | |d_ |pr|pr|or| pr|pr|} | p||p||p|| o|| } |t ||| |o|t|o|t| o| t| o| t|||||ddd| }| }q&|r|r|| d|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_streams)NNr<)rrXr joinr re_headerfinditergroupsrmrendstartr^rrr )rrGrf text_listtextrhprevious_headerheaderrrr|r}_headera_path_fallbackb_path_fallbackold_modenew_moderr new_file_modedeleted_file_modecopied_file_namerrrrrsrtr-r-r.rbGsv      zDiff._index_from_patch_format lines_bytesrhcCs|t}|d\}}}|dD]}|sq|d\}}}|d}|dd\}} } } } tt| d} d| dd}|rGt |nd}| d}| t}| t}d }d }d }d}d}| d krkd} d }nC| d krtd} d }n:| d krd }|dd\}}| t}| t}n!| dkr|dd\}}| t}| t}||}}n| dkr t |||| | || |||||d| |}| |qdS)N:z:rrr1rFr!Tr r"r$r%)rr partitionsplitrstriprrzrisdigitr4stripencoderrX)rrGrhlines_rmetar9rrrr _change_typerp score_strrrrrsrrrtrr a_path_str b_path_strr^r-r-r._handle_diff_linesp           zDiff._handle_diff_linerrOcs(tt|fdddtddS)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` cs|SrP)r)bytrrhrGr-r.sz-Diff._index_from_raw_format..NFr)rrr )rrGrfr-rr.rcszDiff._index_from_raw_format)rGrrfrr0rO)'r'r(r)r*recompileVERBOSE MULTILINErr NULL_BIN_SHArirr5rrlrmrzr4robjectrrrrpropertyrrrrrru classmethodrrrb staticmethodrrcr-r-r-r.rOs!            =-  \ H)T)9__all__r+rrgit.cmdr git.compatr git.objects.blobr git.objects.utilr git.utilr r typingrrrrrrrrrr git.typesrr subprocessrrgit.objects.basergit.objects.commitrgit.objects.treer git.repo.baserrzuniqueEnumrrrjrrrDr5r8rmrFrrnrrr-r-r-r.sB     0         "2