| 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 : /lib64/python3.9/site-packages/hgext/__pycache__/ |
Upload File : |
a
�+�b� �
@ s� d Z ddlmZ ddlmZ ddlmZ ddlmZm Z m
Z
m Z m Z m
Z
mZ ddlmZmZ e jZi Ze�e�ZdZedd d
g ed �ed �fd
dded�fd
dded�fd
dded�fgej ej ej ed�ejd�ddd��ZdS )z2pull, update and merge in one command (DEPRECATED)� )�absolute_import)�_)�short)�cmdutil�error�exchange�hg�lock�pycompat� registrar)�dateutil�urlutils ships-with-hg-core� fetch� r� revs* a specific revision you would like to pulls REV� � editNs invoke editor on commit messagess force-editors edit commit message (DEPRECATED)s
switch-parents switch parents when mergings hg fetch [SOURCE])Z helpcategory� defaultc s� t �|�}|�d�}|r&t�|�|d< �j�� ��j�� }z��|�}W n t j
y` d}Y n0 �|kr�t j t d�t d�d��d }}�z2��
� }��� }t��� ��|�} �fdd�| D �} t| �dkr�t � t d ���t�d
�| |�d }
t��||
��| �t d �t�|
� � d} |d
�rhz�fdd�|d
D �} W n( t j�yf t d�} t � | ��Y n0 tj��| d�j }
|
d k�r�W t ||� d S ��|�}�j � �g|�d }t|�dk�rt|��r|d �k�r�t� �|d �W t ||� S W t ||� d S �fdd�|D �}�� |�r4|d � t�!�� � � fdd�|D �}t|�dk�r~| �t d�t|�d � W t ||� dS |�s�W t ||� d S d} |�r(|d �r�� |d }}n0|d � }}| �t d��j �"|�t#|�f � t�!�|� �| }| �t d�|�"� t#|�f � tj$|dd�} | �s�t�%| |��pLdt�&��'� � }|�d��pb|�d �}tj(|d
d �}�j)||d |d |d �}| �t d ��j �"|�t#|�f � | W t ||� S t ||� 0 dS )!a� pull changes from a remote repository, merge new changes if needed.
This finds all changes from the repository at the specified path
or URL and adds them to the local repository.
If the pulled changes add a new branch head, the head is
automatically merged, and the result of the merge is committed.
Otherwise, the working directory is updated to include the new
changes.
When a merge is needed, the working directory is first updated to
the newly pulled changes. Local changes are then merged into the
pulled changes. To switch the merge order, use --switch-parent.
See :hg:`help dates` for a list of formats valid for -d/--date.
Returns 0 on success.
s dateNs# working directory not at branch tips' use 'hg update' to check out branch tip)�hintc s$ g | ] }t � | �� �d kr|�qS )r )�lenZchildren)�.0�head)�repo� �1/usr/lib64/python3.9/site-packages/hgext/fetch.py�
<listcomp>g r zfetch.<locals>.<listcomp>� sH multiple heads in this branch (use "hg heads ." and "hg merge" to merge)r r s pulling from %s
r c s g | ]}� � |��qS r )�lookup)r �rev)�otherr r r v r sO other repository doesn't support revision lookup, so a rev cannot be specified.)Zheads� c s g | ]}|� kr|�qS r r �r �n)�parentr r r � r c s g | ]}|� kr|�qS r r r! )� newparentr r r � r s[ not merging with %d other new branch heads (use "hg heads ." and "hg merge" to merge them)
Fs
switch_parents updating to %d:%s
s merging with %d:%s
)Zreminds Automated merge with %sr s force_editor)ZeditZeditforms user)�editors5 new changeset %d:%s merges remote changes with local
)*r
Z byteskwargs�getr Z parsedateZdirstateZp1�branchZ branchtipr ZRepoLookupErrorZAbortr �wlockr r Z
bailifchangedZ branchheadsr r
Zget_unique_pull_pathr Zpeer�statusZ hidepasswordZCapabilityErrorr ZpullZcgresult�releaseZ changelogZ nodesbetween�updateZcleanr r �mergeZ
logmessageZ
removeauth�urlZgetcommiteditorZcommit)Zuir �sourceZopts�dater' Z
branchnoder( r Zbheads�pathZrevs�errZmodheadsZnewheadsZ newchildrenZ firstparentZ secondparentZp2ctx�messageZeditoptr% r" r )r$ r r# r r �fetch& s� (
�
��
�
F
�
?
�=
� �
��,
�)
�
�� �����
�r3 )r )�__doc__Z
__future__r Zmercurial.i18nr Zmercurial.noder Z mercurialr r r r r r
r Zmercurial.utilsr r
r* ZcmdtableZcommandZ
testedwithZ
commitoptsZ commitopts2Z
remoteoptsZ CATEGORY_REMOTE_REPO_MANAGEMENTr3 r r r r �<module> s> $
�� �
���