| Server IP : 80.87.202.40 / Your IP : 216.73.216.169 Web Server : Apache System : Linux rospirotorg.ru 5.14.0-539.el9.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Dec 5 22:26:13 UTC 2024 x86_64 User : bitrix ( 600) PHP Version : 8.2.27 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : ON | Pkexec : ON Directory : /usr/lib64/python3.9/site-packages/mercurial/__pycache__/ |
Upload File : |
a
�+�bJ � @ s� d dl mZ d dlZddlmZ ddlmZmZ ddlm Z m
Z
m Z m Z m
Z
mZ dd� Zdd
d �Zdd d
�Zdd� Zddd�Zdd� Zddd�Zdd� ZdS ) � )�absolute_importN� )�_)�hex�nullrev)�context�
mergestate�metadata�phases�scmutil� subrepoutilc C s: | j dkrd}d}n | j�dd�}|dk}|dv }||fS )z�return a (changelog, filelog) boolean tuple
changelog: copy related information should be stored in the changeset
filelof: copy related information should be written in the file revision
� changeset-sidedataT� experimentals copies.write-to� changeset-only)r s
compatibility)�filecopiesmode�uiZconfig)�repo�writechangesetcopy�writefilecopymetaZ
writecopiesto� r �6/usr/lib64/python3.9/site-packages/mercurial/commit.py�_write_copy_meta s
r Fc
C s� | � � } |�� |�� }}|�� }| �� ��� | �d���z}t||||d�\}} |�� �� }
|
durzdD ]} |
� | d� qh| j
j dkr�t | |
| �}
| j
�
� } | j�td�� | j
�|� | j
�|| |�� ||�� |�� ||�� |
� }
| |
�� }| | j
�
� k�r| �|| j
�|�� |�� |�r*|�� �p,d }}| jdd t|
�||d
� t� | j|�}| | j
�
� k�ot| | � � }|�r�|�s�t � | |||g� |
W d � W d � S 1 �s�0 Y W d � n1 �s�0 Y dS ) a� Add a new revision to the target repository.
Revision information is passed via the context argument.
ctx.files() should list all files involved in this commit, i.e.
modified/added/removed files. On merge, it may be wider than the
ctx.files() to be committed, since any file nodes derived directly
from p1 or p2 are excluded from the committed ctx.files().
origctx is for convert to work around the problem that bug
fixes to the files list in changesets change hashes. For
convert to be the identity, it can pass an origctx and this
function will use the same files list when it makes sense to
do so.
s commit)�error�origctxN)� p1copies� p2copies�
filesadded� filesremoveds extras committing changelog
� s pretxncommitT)�throw�nodeZparent1Zparent2) Z
unfiltered�p1�p2�user�lockZ transaction�_prepare_files�extra�copy�popZ changelogZ_copiesstorage�_extra_with_copiesZtiprevr �noter Z delayupdate�add� descriptionr �date�revZregister_changesetZchangelogrevisionr �hookr ZnewcommitphaseZphaser
Z registernew)r �ctxr r r! r" r# �tr�mn�filesr& �nameZoldtip�nr. Zxp1Zxp2Z targetphaseZ waspublicr r r � commitctx- sR
� � r6 c C sn |� � }|�� }t|�\}}t�� }tj�|�} t|| |�}
|
D ]} |�| � q@i } |� � � � �
� s�| � � � � D ]"\}
}|�
d�}|d urp|| |
< qp|�� r�| s�|j�d� |�� }|�|�� � |r�|�|�� � |�|�� � n:|�� �s
| �s
|j�d� |�� }nt| || || |d�}|�rD|�� |k�rD|�� }|�|� |�rf|�|�� � |�|�� � ||fS )Ns outside-narrow-merge-actions reusing known manifest
s* reusing manifest from p1 (no file change)
)r ) r r! r r Z
ChangingFilesr �read�
_get_salvagedZ
mark_salvaged� narrowmatch�always� allextras�items�get� manifestnoder �debugZupdate_touchedr3 Z update_added�
filesadded�update_removed� filesremoved�_process_filesZupdate_copies_from_p1�p1copiesZupdate_copies_from_p2�p2copies)r1 r0 r r r r! r r r3 �ms�salvaged�s� narrow_files�f�e�actionr2 Z origfilesr r r r% ~ s@
r% c C sn g }| j dk}|rjt|�� �dkrj|�� rjt|�� �� �D ].}|�|��d�}|dkr:||v r:|� |� q:|S )zzreturns a list of salvaged files
returns empty list if config option which process salvaged files are
not enabledr
r � merge-removal-candidate� yes)
r �len�parents�active�sortedr; �keys�extrasr= �append)r rF r0 rG Zcopy_sd�fnameZ
might_removedr r r r8 � s
r8 c s� |� � }|�� }|�� }t|�\} }
|�� } |�� } | �� }
|
�� � | �� �| �� �g }t|�� �}t |�}|j
� t d�� t
�|�}|�� |�� }|�|�� � |�� |D �]2}|j
� ||�d � ||v �r�|�|�}|tjkr�|�|� |�|� q�|tjk�rL|�|� |�|� �| � |< | �|�d �p<d}� � ||� q�|tj k�r�|� |� |�|� �| � |< | �|�d �p�d}� � ||� q�t d�}t d�}|j ||d��q�z�|| }|d u �r�|�|� nt|�|� t ||��|| |
|�\� |< }|�r>|dk�r |�|� n |d k�r4|�!|� n
|� |� � � ||�"� � W q� t#�y~ |j
�$t d
�||� � � Y q� t%�y� } zLt&|d t'j(�}|�s�|�r�|t'j(k�r�|j
�$t d
�||� � � W Y d }~q�d }~0 0 q���fd d
�|D �}t)� fdd
�|D ��} | D ] }� |= �q|�*� t+k�r<|�,|� n4t-�.|||��f�} |D ]}| |��sT|�|� �qTt/| |||
� |j0|| t1|�� } | S )Ns committing files:
�
r r s/ corrupted mergestate, unknown narrow action: %bs restart the merge)�hint�added�mergeds trouble committing %s!
�errnoc s g | ]}|� v s|�v r|�qS r r ��.0rJ )�m1�m2r r �
<listcomp> r z"_process_files.<locals>.<listcomp>c s g | ]}|� v r|�qS r r r\ )�mr r r` r )2r r! r" r � manifestctxr' r7 �list�removedrO r r* r r Z getuipathfn�modifiedrY �extendrS �sortr= r ZCHANGE_REMOVEDZ mark_removedrU Z CHANGE_ADDEDZ
mark_added�findZsetflagZCHANGE_MODIFIEDZ mark_touchedZAbort� _filecommitZ mark_merged�flags�OSError�warn�IOError�getattrr[ �ENOENTrR r. r rA r Zget_removal_filter�_commit_manifest�touched�bool) r1 r0 rF r3 rI r r r! r" r r �m1ctxZm2ctx�mctxrY rd �linkrevZuipathfnZ all_filesrJ Z
narrow_actionrj �msgrX �fctxZ
is_touched�instZerrcode�dropZrfr2 r )ra r^ r_ r rC � s�
�
� rC c C s |� � }|�|| j�} |�|| j�}
d} | |
kr>| jkrFn nd} t|tj�r�|�� } | | |
fv r�| j�d| � | | jkr�|� |�|� � ks�|
| jkr�|� |�|� � kr�d} | | fS | �
|�}
i }|� � }d}|�r�||k�r�|�|�}|
}|�r$|
| jk�s|du �r$||v �r$|| }| }|�rl| j�d||t |�f � |�r^||d< t |�|d< | j| } }
n| j�
td�||f � n�| | jk�r�|
| j } }
n�|
| jk�r<|�� �r�|�|��d �d
k�r�|
| j } }
nb|�� �r|�|��d �d k�r| | j } }
n4|
�| |
�}| |v �r,|
| j } }
n|
|v �r<| j}
d
}| j�dd��rt|�� �rt|�|��d�d k�rtd}|�� }|
| jk�s�| | jk�s�|�s�|
�| |��s�|�r�| du �r�|
| jk�r�d} nd} |
�||||| |
�}n,||v �r |� |�|� � k�r d} | }n| }|| fS )a
commit an individual file as part of a larger transaction
input:
fctx: a file context with the content we are trying to commit
manifest1: manifest of changeset first parent
manifest2: manifest of changeset second parent
linkrev: revision number of the changeset being created
tr: current transation
includecopymeta: boolean, set to False to skip storing the copy data
(only used by the Google specific feature of using
changeset extra as copy source of truth).
ms: mergestate object
output: (filenode, touched)
filenode: the filenode that should be used by this changeset
touched: one of: None (mean untouched), 'added' or 'modified'
NrY s reusing %s filelog entry
re s %s: copy %s:%s
s copys copyrevs8 warning: can't find ancestor for '%s' copied from '%s'!
s filenode-sources others mergedrN Fr s merge-track-salvagedrM TrZ )�pathr= Znullid�
isinstancer ZfilectxZfilenoder r? rj �fileZ
copysourcer rl r rQ rT ZcommonancestorsheadsZ
configbool�data�cmpr+ )r rw Z manifest1Z manifest2ru r1 ZincludecopymetarF rV Zfparent1Zfparent2rq r Zflog�metaZcfnameZfnodeZcnodeZ
newfparentZfparentancestorsZforce_new_node�textr r r ri s� ����
��
���
������
��
ri c C s� |� � } d}
|�� } |�� } | �� }
|
�� }|sH|�|t�| |�� ��}
|s\|
r\| j �
d� |sd|
r�| j � t d�� |r~d}n| �
� }|j| || �� | �� |||d�}n| j �
d� | �� }|S )a make a new manifest entry (or reuse a new one)
given an initialised manifest context and precomputed list of
- files: files affected by the commit
- added: new entries in the manifest
- drop: entries present in parents but absent of this one
Create a new manifest revision, reuse existing ones if possible.
Return the nodeid of the manifest revision.
NsI not reusing manifest (no file change in changelog, but manifest differs)
s committing manifest
)�matchs; reusing manifest from p1 (listed files actually unchanged)
)r r! r" rb r7 �diffr Z
matchfilesr3 r r? r* r r9 �writer> )r1 ru r0 rt Zmanifestr3 rY ry Zhas_some_narrow_actionr Zmdr! r" rs r^ r� r2 r r r rp � s> ��
�rp c C s� |j }|j}|j}|j}t|j�}t| �d sN|p4d}|p<d}|pDd}|pLd}||||f}|du rxtdd� |D ��rxi }|dur�t� ||�}||d< |dur�t� ||�}||d< |dur�t�
||�}||d< |dur�t�
||�}||d< |S ) z2encode copy information into a `extra` dictionnaryr Nc s s | ]}|d uV qd S )Nr )r] �xr r r � <genexpr>! r z%_extra_with_copies.<locals>.<genexpr>r r r r ) Zcopied_from_p1Zcopied_from_p2rY rd rR rq r �anyr Z encodecopiesZencodefileindices)r r& r3 rD rE r@ rB Z
extrasentriesr r r r) s4
r) )FN)FN)NF)F)Z
__future__r r[ Zi18nr r r r � r r r r
r r r r6 r% r8 rC ri rp r) r r r r �<module> s
Q
+
f / �
J