|
Server : Apache System : Linux iad1-shared-b8-43 6.6.49-grsec-jammy+ #10 SMP Thu Sep 12 23:23:08 UTC 2024 x86_64 User : dh_edsupp ( 6597262) PHP Version : 8.2.26 Disable Function : NONE Directory : /lib/python3/dist-packages/mercurial/__pycache__/ |
Upload File : |
o
�]LbJ � @ 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� Z ddd�Zdd� ZdS )� )�absolute_importN� )�_)�hex�nullrev)�context�
mergestate�metadata�phases�scmutil� subrepoutilc C s@ | j dkr
d}d}||fS | 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�ui�config)�repo�writechangesetcopy�writefilecopymeta�
writecopiesto� r �2/usr/lib/python3/dist-packages/mercurial/commit.py�_write_copy_meta s
�r Fc
C s� | � � } |�� |�� }}|�� }| �� �� | �d���}t||||d�\}} |�� �� }
|
dur;dD ]} |
� | d� q2| j
j dkrGt | |
| �}
| j
�
� } | j�td�� | j
�|� | j
�|| |�� ||�� |�� ||�� |
� }
| |
�� }| | j
�
� kr�| �|| j
�|�� |�� |r�|�� p�d}}| jdd t|
�||d
� t� | j|�}| | j
�
� ko�| | � � }|r�|s�t � | |||g� |
W d � W d � S 1 s�w Y W d � dS 1 s�w 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�node�parent1�parent2) �
unfiltered�p1�p2�user�lock� transaction�_prepare_files�extra�copy�pop� changelog�_copiesstorage�_extra_with_copies�tiprevr �noter � delayupdate�add� descriptionr" �date�rev�register_changeset�changelogrevisionr �hookr �newcommitphase�phaser
� registernew)r �ctxr r r& r' r( �tr�mn�filesr, �name�oldtip�nr8 �xp1�xp2� targetphase� waspublicr r r � commitctx- sT
� � R�rJ c C st |� � }|�� }t|�\}}t�� }tj�|�} t|| |�}
|
D ]} |�| � q i } |� � � � �
� sJ| � � � � D ]\}
}|�
d�}|d urI|| |
< q8|�� rr| sr|j�d� |�� }|�|�� � |rq|�|�� � |�|�� � n|�� s�| s�|j�d� |�� }n
t| || || |d�}|r�|�� |kr�|�� }|j�|�s�J �|�|� |r�|�|�� � |� |� � � ||fS )Ns outside-narrow-merge-actions reusing known manifest
s* reusing manifest from p1 (no file change)
)r ) r r& r r �
ChangingFilesr �read�
_get_salvaged�
mark_salvaged� narrowmatch�always� allextras�items�get� manifestnoder �debug�update_touchedrB � update_added�
filesadded�update_removed� filesremoved�_process_files�touched�issubset�update_copies_from_p1�p1copies�update_copies_from_p2�p2copies)r@ r? r r r r& r r rB �ms�salvaged�s� narrow_files�f�e�actionrA � origfilesr r r r+ ~ sF
� �
r+ c C sn g }| j dk}|r5t|�� �dkr5|�� r5t|�� �� �D ]}|�|��d�}|dkr4||v r4|� |� 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�sortedrQ �keys�extrasrS �append)r rb r? rc �copy_sd�fname�
might_removedr r r rM � s
�rM c st |� � }|�� }|�� }t|�\} }
|�� } |�� } | �� }
|
�� � | �� �| �� �g }t|�� �}t |�}|j
� t d�� t
�|�}|�� |�� }|�|�� � |�� |D �]
}|j
� ||�d � ||v r�|�|�}|tjkr~|�|� |�|� nY|tjkr�|�|� |�|� �| � |< | �|�d p�d}� � ||� n4|tj kr�|� |� |�|� �| � |< | �|�d p�d}� � ||� nt d�}t d�}|j ||d��qXzJ|| }|d u r�|�|� n:|�|� t ||��|| |
|�\� |< }|�r|dk�r |�|� n|d k�r|�!|� n|� |� � � ||�"� � W qX t#�y7 |j
�$t d
�||� � � t%�yc } z t&|d t'j(�}|�sR|�r^|t'j(k�r^|j
�$t d
�||� � � d }~ww ��fd d
�|D �}t)� fdd
�|D ��} | D ]}� |= �q{|�*� t+k�r�|�,|� nt-�.|||��f�} |D ]
}| |��s�|�|� �q�t/| |||
� |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 ��.0rf )�m1�m2r r �
<listcomp> s z"_process_files.<locals>.<listcomp>c s g | ]}|� v r|�qS r r r{ )�mr r r s )2r r& r' r � manifestctxr- rL �list�removedrl r r3 r r � getuipathfn�modifiedrx �extendrp �sortrS r �CHANGE_REMOVED� mark_removedrr � CHANGE_ADDED�
mark_added�find�setflag�CHANGE_MODIFIED� mark_touched�Abort� _filecommit� mark_merged�flags�OSError�warn�IOError�getattrrz �ENOENTro r8 r rY r �get_removal_filter�_commit_manifestr\ �bool) r@ r? rb rB re r r r& r' r r �m1ctx�m2ctx�mctxrx r� �linkrev�uipathfn� all_filesrf �
narrow_actionr� �msgrw �fctx�
is_touched�inst�errcode�drop�rfrA r )r� r} r~ r r[ � s�
�
���
�� r[ c C s
|� � }|�|| j�} |�|| j�}
d} | |
kr | jkr#n nd} t|tj�r]|�� } | | |
fv r]| j�d| � | | jkrI|� |�|� � ksW|
| jkrY|� |�|� � krYd} | | fS | �
|�}
i }|� � }d}|r�||kr�|�|�}|
}|r�|
| jks�|du r�||v r�|| }| }|r�| j�d||t |�f � |r�||d< t |�|d< | j|} }
nc| j�
td�||f � nV| | jkr�|
| j} }
nJ|
| jk�r|�� r�|�|��d �d
kr�|
| j} }
n/|�� r�|�|��d �d kr�| | j} }
n|
�| |
�}| |v �r |
| j} }
n|
|v �r| j}
d
}| j�dd��r-|�� �r-|�|��d�d k�r-d}|�� }|
| jk�sJ| | jk�sJ|�sJ|
�| |��sJ|�rh| du �rZ|
| jk�rXd} nd} |
�||||| |
�}|| fS ||v �r|� |�|� � k�rd} | }|| fS | }|| 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'
Nrx s reusing %s filelog entry
r� s %s: copy %s:%s
s copys copyrevs8 warning: can't find ancestor for '%s' copied from '%s'!
s filenode-sources others mergedrk Fr s merge-track-salvagedrj Try )�pathrS �nullid�
isinstancer �filectx�filenoder rU r� �file�
copysourcer r� r rn rq �commonancestorsheads�
configbool�data�cmpr5 )r r� � manifest1� manifest2r� r@ �includecopymetarb rt �fparent1�fparent2r\ r" �flog�meta�cfname�fnode�cnode�
newfparent�fparentancestors�force_new_node�textr r r r� s�
���
�� �
��
��r� c C s� |� � } d}
|�� } |�� } | �� }
|
�� }|s$|�|t�| |�� ��}
|s.|
r.| j �
d� |s2|
rU| j � t d�� |r?d}n| �
� }|j| || �� | �� |||d�}|S | 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' r� rL �diffr �
matchfilesrB r rU r3 r rO �writerT )r@ r� r? r� �manifestrB rx r� �has_some_narrow_actionr �mdr& r' r� r} r� rA r r r r� � s@ ����r� c C s� |j }|j}|j}|j}t|j�}t| �d s'|pd}|p d}|p"d}|p&d}||||f}|du r<tdd� |D ��r<i }|durJt� ||�}||d< |durXt� ||�}||d< |durft�
||�}||d< |durtt�
||�}||d< |S ) z2encode copy information into a `extra` dictionnaryr Nc s s � | ]}|d uV qd S )Nr )r| �xr r r � <genexpr>! s � z%_extra_with_copies.<locals>.<genexpr>r r r r ) �copied_from_p1�copied_from_p2rx r� ro r\ r �anyr � encodecopies�encodefileindices)r r, rB r_ ra rX rZ �
extrasentriesr r r r1 s4
r1 )FN)NF)F)�
__future__r rz �i18nr r" r r � r r r r
r r r rJ r+ rM r[ r� r� r1 r r r r �<module> s
Q+
f /
� J