||
d d |
d d | j j j }n?|=|
d d |
d | | j j j }|
d | |r*| d |
| dd< || | i }|r t j n t j } || j | } | | S )a Creates diffs between two items being trees, trees and index or an
index and the working tree. It will detect renames automatically.
:param other:
Is the item to compare us with.
If None, we will be compared to the working tree.
If Treeish, it will be compared against the respective tree
If Index ( type ), it will be compared against the index.
If git.NULL_TREE, it will compare against the empty tree.
It defaults to Index to assure the method will not by-default fail
on bare repositories.
:param paths:
is 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 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 git-diff, such as
R=True to swap both sides of the diff.
:return: git.DiffIndex
:note:
On a bare repository, 'other' needs to be provided as Index or as
as Tree/Commit, or a git command error will occurz --abbrev=40z --full-indexc 3 K | ]}|v V d S NrD ).0xrR s r1 z Diffable.diff.. s' LL11;LLLLLLr3 ) find_renames
no_renamesr z-Mz-pz--rawz-zz
--no-colorNHas_Repor z--cachedz-rz--rootz--T
as_process)appendany
isinstancetuplelisthasattrrepogitdiffrJ insertr' diff_treeextendrN r& _index_from_patch_format_index_from_raw_formatwait)
rM rO rP rQ rR rK diff_cmdproc diff_methodindexs
` r1 re z
Diffable.diffj sP J QS M""" N### LLLL(KLLLLL KK KK KK KK
L!!! Zt}%E%E GE 4 $ $ * $ DI9=% DJ KK: & & & &
i
KK4 KK8 $ $ $y}.HH
KK4 KK5 ! ! !y}.H At KK KK $| x0066A&AA7Cdd33Id DIt,, r3 )rG rH rI __doc__ __slots__objectrJ r r strr rN r r boolr
re rD r3 r1 r$ r$ R s8 1 1 I
sJ5E0F NOP
eCT*:%;VCD E LQMQ " X XT']FHdCGHX XtH~uXs]/CTIJX X
X
X X X X X Xr3 r$ T_Diffr& )boundc 2 e Zd ZdZdZdedee fdZdS )r% zImplements an Index for diffs, allowing a list of Diffs to be queried by
the diff properties.
The class improves the diff handling convenience)r r r r! r r" change_typer) c # J K || j vrt d|z | D ]}|j |k r|V |dk r |j r|V $|dk r |j r|V 6|dk r |j r|V H|dk r |j r|V Z|dk r"|j r|j r|j |j k r|V dS )a
:return:
iterator yielding Diff instances that match the given change_type
:param change_type:
Member of 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)rx
ValueErrornew_file deleted_file copied_filerenameda_blobb_blob)rM rx diffidxs r1 iter_change_typezDiffIndex.iter_change_type s d . . . 6 DEE E G"k11
##(8#
##(<#
##(;#
###
###7>#gn`g`nNnNn
r3 N) rG rH rI rp rx Lit_change_typer ru r rD r3 r1 r% r% sL 8 8 1K O @P r3 r% c e Zd ZdZ ej dej ej z ZdZ dZ
dZ ddde e
d e e
d
eee
d f d eee
d f d
ee
ed f dee
ed f dededede e
de e
deee
d f de e de e dd f dZdedefdZdedefdZdefd Zdefd Zede e fd Zede e fd Zede e fd Z ede e fd! Z edefd" Z edefd# Z e d$e
d%e
d&e
de e
fd' Z!e ddd(ed) de"fd* Z#e$d+e
ddd,e"dd fd- Z%e d1d0 Z&d S )2r& a A 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 inidcate 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.
But the path will be available though.
If it is listed in a diff the working tree version of the file must
be different to 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 )r r a_modeb_mode a_rawpath b_rawpathr{ r| r} raw_rename_from
raw_rename_tore rx scorerc r r r a_blob_idN b_blob_idr r r{ r| r} r r re rx r r) c |t |t sJ |t |t sJ || _ || _ |rt | nd | _ |rt | nd | _ |rZ|rX|j D ]P}|j | t d k r*| r| } nQ| | || j
k rd | _ n/t |t! | | j | j | _ | | || j
k rd | _ n/t |t! | | j | j | _ || _ | | _ |
| _ | t | t sJ | t | t sJ | pd | _ | pd | _ |
| _ || _ || _ d S )Nr? )moder4 ) r_ r. r r r r r
submodulesr4 decoder
module_existsmodule NULL_HEX_SHAr r r a_pathr b_pathr{ r| r} r r re rx r )rM rc r r r r r r r{ r| r} r r re rx r submodules r1 __init__z
Diff.__init__C s & Jy%$@$@ @ Jy%$@$@ @""17Aof---T 17Aof---T I !_
>Y%5%5fi%H%HHH ..00 2 ( / / 1 1E I
/ T-> > > DKK tZ %:%:SWS^___DK / T-> > > DKK tZ %:%:SWS^___DK &
".!, &*_e*L*L&&L $
=%(H(H$$H . 6$ * 2d 9D
r3 rO c d | j D ]'}t | | t || k r dS (dS )NFT)rq getattr)rM rO names r1 __eq__z Diff.__eq__ sE N DtT""geT&:&::: uu ; tr3 c | |k S rU rD )rM rO s r1 __ne__z Diff.__ne__ s EM""r3 c ^ t t fd j D S )Nc 3 8 K | ]}t | V d S rU )r )rV nrM s r1 rX z Diff.__hash__.. s- CCq'$**CCCCCCr3 )hashr` rq rM s `r1 __hash__z
Diff.__hash__ s0 ECCCCDNCCCCCDDDr3 c d}| j r|| j j z }n| j r|| j j z }d}d }d}t | j | j fd D ]A\ }}|rd||j |j fz }nd|z }t
t | | }||z
}B|dd|z z z
}| j r|d z
}| j r|d
z
}| j
r|d | j d | j z
}| j
r
|d
| j
z z
}| j r
|d| j z z
}| j rd|dz
} |t! | j t" r | j t& n| j z
}n# t( $ r |dz
}Y nw xY w|dz
}||z }|S )Nz%s r )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)r r4 r zipr hexshamaxlenr| r{ r} r r rename_from rename_tore r_ r. r r UnicodeDecodeError)rM hmsgline line_lengthbr ress r1 __str__z Diff.__str__ s ; "
! !AA
[ "
! !A dk2NCC DAq
(&!QVQX)>>#a' c$ii55K 4KCC
TC+%
%% + * *C = ) ( (C K CdkkJ JC ? +d.>> >C > ; )DN: :C 9 7NC
-:di3O3O^ty''///UYU^^%
-
-
-,,
-
7NC
#g
s AE E E c T | j r | j t d nd S Nr? )r r r r s r1 r z Diff.a_path & ;?>St~$$VY777tSr3 c T | j r | j t d nd S r )r r r r s r1 r z Diff.b_path r r3 c T | j r | j t d nd S r )r r r r s r1 r zDiff.rename_from s) AEAU_t#**69===[__r3 c T | j r | j t d nd S r )r r r r s r1 r zDiff.rename_to s) ?C?Q[t!((;;;W[[r3 c | j S )z:returns: True if the blob of our diff has been renamed
:note: This property is deprecated, please use ``renamed_file`` instead.
) renamed_filer s r1 r~ z Diff.renamed s
r3 c " | j | j k S )z7:returns: True if the blob of our diff has been renamed)r r r s r1 r zDiff.renamed_file s 4>11r3
path_match rename_matchpath_fallback_matchc p |rt | S |rt |d S |rt | S d S )NF)r5 )rB )clsr r r s r1 _pick_best_pathzDiff._pick_best_path sP + z** * B |5AAA A 4 233 3tr3 rm )r zGit.AutoInterruptc g }t ||j dt d d | }t }d}d}d\ }} d\ }
} | j | D ]n} | \ }
}}}}}}}}}}} }} t | t | t | }}}| |||
}| | || } |9||
| |d _ |p |p|o| p|p|}
| p|p|p| o|
} | t ||| |o| t |o| t |
o|
t | o| t |||||ddd | }| }p|r)|r'||
d |d _ |S )a Create a new DiffIndex from the given text which must be in patch format
:param repo: is the repository we are operating on - it is required
:param stream: result of 'git diff' as a stream (supporting file protocol)
:return: git.DiffIndexNFdecode_streamsr3 )NNr8 )r r] r joinr% re_headerfinditergroupsrt r endstartre r& r r )r rc rm text_listtextro previous_headerheaderr r r r _headera_path_fallbackb_path_fallbackold_modenew_moder r
new_file_modedeleted_file_modecopied_file_namer r r{ r| r} s r1 ri z Diff._index_from_patch_format s^ "$ dI$4d)>&
J#**622#**622 ##)-FA)>)>&
J#**622#**622)/Y ## D"
LL CA A r3 r r% c d t t | fddt d S )zhCreate a new DiffIndex from the given stream which must be in raw format.
:return: git.DiffIndexc 2 | S rU )r )bytr ro rc s r1 z-Diff._index_from_raw_format.. s --c4?? r3 NFr )r% r r )r rc rm ro s `` @r1 rj zDiff._index_from_raw_format sL '[[ ? ? ? ? ? ?
r3 )rc r rm r r) r% )'rG rH rI rp recompileVERBOSE MULTILINEr r NULL_BIN_SHArq r r. r rs rt r r- r rr r r r r propertyr r r r r~ r classmethodr r% ri staticmethodr rj rD r3 r1 r& r& s Z Z>
$
R\!' I, L LI"<< E?< E? <
eT)* < eT)*
< eS$&'< eS$&'< < < < "% < < C$% < o. < }!<"
#< < < <|F t #F #t # # # #E# E E E E/ / / / /b T
T T T XT T
T T T XT `Xc] ` ` ` X` \8C= \ \ \ X\ ! ! ! ! X! 2d 2 2 2 X2
e
Z_
dlmrds
[
QF Q%@\:] Qbk Q Q Q [Qf G u G F G 9 G QU G G G \G R [ r3 )T)5r git.cmdr
git.compatr git.utilr r objects.blobr objects.utilr typingr
r r r
r r r r r r r git.typesr r objects.treer objectsr
git.repo.baser git.objects.baser
subprocessr rd r r __all__rr r' r r@ r. r2 rt rB r$ ru r% r& rD r3 r1 r
s
) ) ) ) ) ) 1 1 1 1 1 1 1 1 ) ) ) ) ) )
( ' ' ' ' ' ' ' """""" """""",,,,,, ;< 9
FHH -..% E
e
D
HUO
p p p p pv p p pf
( ( (, , , , , V , , , `^ ^ ^ ^ ^6 ^ ^ ^ ^ ^r3