|
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/hgext/__pycache__/ |
Upload File : |
o
�]Lb� �
@ 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])� helpcategory� defaultc s� t �|�}|�d�}|rt�|�|d< �j�� ��j�� }z��|�}W n t j
y0 d}Y nw �|kr@t j t d�t d�d��d }}�z���
� }��� }t��� ��|�} �fdd�| D �} t| �dkrnt � t d ���t�d
�| |�d }
t��||
��| �t d �t�|
� � d} |d
r�z
�fdd�|d
D �} W n t jy� t d�} t � | ��w tj��| d�j }
|
d kr�W t ||� d S ��|�}�j � �g|�d }t|�dkr�t|�r�|d �kr�t� �|d �W t ||� S W t ||� d S �fdd�|D �}�� |�r|d � t�!�� � � fdd�|D �}t|�dk�r7| �t d�t|�d � W t ||� dS |�sBW t ||� d S d} |�r�|d �rT� |d }}n|d � }}| �t d��j �"|�t#|�f � t�!�|� �| }| �t d�|�"� t#|�f � tj$|dd�} | �s�t�%| |��p�dt�&��'� � }|�d��p�|�d �}tj(|d
d �}�j)||d |d |d �}| �t d ��j �"|�t#|�f � | W t ||� S t ||� w )!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 )�len�children)�.0�head)�repo� �-/usr/lib/python3/dist-packages/hgext/fetch.py�
<listcomp>g s $ 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 s sO other repository doesn't support revision lookup, so a rev cannot be specified.)�heads� c � g | ]}|� kr|�qS r r �r �n)�parentr r r � � c r$ 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
)�reminds Automated merge with %sr s force_editor)�edit�editforms user)�editors5 new changeset %d:%s merges remote changes with local
)*r
� byteskwargs�getr � parsedate�dirstate�p1�branch� branchtipr �RepoLookupError�Abortr �wlockr r �
bailifchanged� branchheadsr r
�get_unique_pull_pathr �peer�status� hidepassword�CapabilityErrorr �pull�cgresult�release� changelog� nodesbetween�update�cleanr r �merge�
logmessage�
removeauth�url�getcommiteditor�commit)�uir �source�opts�dater3 �
branchnoder7 r �bheads�path�revs�err�modheads�newheads� newchildren� firstparent� secondparent�p2ctx�message�editoptr- r& r )r) r! r' r r �fetch& s�
(
��
���
�F
� ?�=� �
��,�)�
�� �����r] )r )�__doc__�
__future__r �mercurial.i18nr �mercurial.noder � mercurialr r r r r r
r �mercurial.utilsr r
rA �cmdtable�command�
testedwith�
commitopts� commitopts2�
remoteopts� CATEGORY_REMOTE_REPO_MANAGEMENTr] r r r r �<module> s@ $
�� �
���