| Server IP : 162.144.4.212 / Your IP : 216.73.216.108 Web Server : Apache System : Linux gator2125.hostgator.com 5.14.0-162.23.1.9991722448259.nf.el9.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Jul 31 18:11:45 UTC 2024 x86_64 User : cozeellc ( 2980) PHP Version : 8.3.31 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : ON | Pkexec : ON Directory : /lib64/python3.9/site-packages/mercurial/__pycache__/ |
Upload File : |
a
�+�bUh � @ s� d dl mZ d dlZd dlZd dlZddlmZ ddlmZ ddl m
Z
ddl m Z ddl
mZ dd lmZmZmZmZmZmZmZmZmZmZm Z m Z m Z m Z ej Z!ej"Z#d
d � Z$dId d
�Z%G dd� de&�Z'dd� Z(dd� Z)dd� Z*dd� Z+dd� Z,dd� Z-G d d � d e&�Z.dJd d �Z/d!d"� Z0dKd#d$�Z1d%d&� Z2d'd(� Z3d)d*� Z4d+d,� Z5e
j6d-d.�G d/d0� d0e&��Z7dLd1d2�Z8d3d4� Z9d5Z:d6Z;d7Z<d8Z=dMd9d:�Z>dNd;d<�Z?dOd=d>�Z@dPd?d@�ZAdQdAdB�ZBdRdCdD�ZCdSdEdF�ZDdTdGdH�ZEdS )U� )�absolute_importN� )�_)�nullrev)�attr)�
stringutil)� timestamp)�copies�encoding�error� filemerge�match�
mergestate�obsutil�pathutil�policy�pycompat�scmutil� subrepoutil�util�workerc C sX | j �||�}g d�}||vrTd�dd� |D ��}td�}|||||f; }t�|��|S )N)� aborts ignore� warns , c S s g | ]}d | d �qS )� '� )�.0�vr r �5/usr/lib64/python3.9/site-packages/mercurial/merge.py�
<listcomp>, � z*_getcheckunknownconfig.<locals>.<listcomp>s$ %s.%s not valid ('%s' is none of %s))�ui�config�joinr r Z ConfigError)�repo�section�namer! ZvalidZvalidstr�msgr r r �_getcheckunknownconfig( s
r' c C sV |� � r dS |d u r|}| jj�|�oT| j�|�oT| j�|�| jvoT|| �|| �S )NF)�
isinmemory�wvfs�audit�check� isfileorlink�dirstate� normalize�cmp)r# �wctx�mctx�f�f2r r r �_checkunknownfile3 s
���r4 c @ s e Zd ZdZdd� Zdd� ZdS )�_unknowndirscheckeray
Look for any unknown files or directories that may have a path conflict
with a file. If any path prefix of the file exists as a file or link,
then it conflicts. If the file itself is a directory that contains any
file that is not tracked, then it conflicts.
Returns the shortest path at which a conflict occurs, or None if there is
no conflict.
c C s t � | _t � | _d S �N)�set�_unknowndircache�_missingdircache��selfr r r �__init__Q s z _unknowndirschecker.__init__c C s |� � r dS ttt�|���D ]~}|| jv r2 d S || jv r>q |jj� |�r |j�
|�rr|j � |�|j vrr| S |j�
|�s�| j�|� d S | j�|� q |jj� |��r|j�|��r|j�|�D ]N\}}}|D ]>}t�|j�||��}|j j |dd�}||j vr�| S q�q�d S )NFT)Zisknown)r( �reversed�listr �finddirsr9 r8 r) r* r+ r, r- r. �lexists�add�isdir�walkr ZpconvertZreljoin) r; r# r0 r2 �p�dirs�files�fnZrelfr r r �__call__\ s2
��
z _unknowndirschecker.__call__N)�__name__�
__module__� __qualname__�__doc__r< rH r r r r r5 F s
r5 c
s. t � }t � �t � �t � � t�dd�}t�dd�}�j�dd�} |�s$� �fdd�}
t� } |�tjtjf�D ]H} t �||| �r�|�
| � qj| rj| |vrj| �|| �}
|
durj��
|
� qj|� tj g�D ](\} }}t �||| |d �r�|�
| � q�|�B }�fd
d �|D �}|| }|
||� |
||� n�t
|� tjg��D ]�\} }}|\}}t �||| �}�j�| ��rj|}n|}|�s�|�| tj|d fd
� nn|�s�|dk�r�|�| tj| | dd |fd� n@|dk�rЈ �
| � n*|dk�r��
| � |�| tj|dfd
� �q6t� �D ]Z} �jj}| �v �rN�j�| ��r<|td�| � n|td�| � n|td�| � �q� �rvt�td���t��D ]>} �j�| ��r��j�td�| � n�j�td�| � �q~t
|� tjg��D ]X\} }}| |v �p| �v �pt�fdd�t � | �D ��}|\}|�| tj||f|� �q�dS )z�
Considers any actions that care about the presence of conflicting unknown
files. For some actions, the result is to abort; for others, it is to
choose a different action.
� merges checkunknowns checkignored� experimental� merge.checkpathconflictsc s* |dkr� � | � n|dkr&�� | � d S )Nr r )�update)� conflictsr! )�abortconflicts�
warnconflictsr r �collectconflicts� s z,_checkunknownfiles.<locals>.collectconflictsNr c s h | ]}� j �|�r|�qS r )r- �_ignore)r �c�r# r r � <setcomp>� r z%_checkunknownfiles.<locals>.<setcomp>F� remote createdr s# remote differs from untracked localr Ts, %s: untracked file conflicts with directory
s, %s: untracked directory conflicts with file
s %s: untracked file differs
sL untracked files in working directory differ from files in requested revisions %s: replacing untracked file
s+ %s: replacing untracked files in directory
c 3 s | ]}|� v V qd S r6 r )r rD )�
pathconflictsr r � <genexpr>� r z%_checkunknownfiles.<locals>.<genexpr>) r7 r' r �
configboolr5 rF �
mergestatemod�ACTION_CREATED�ACTION_DELETED_CHANGEDr4 rA �
getactions�ACTION_LOCAL_DIR_RENAME_GETr> �ACTION_CREATED_MERGEr- rU �addfile�
ACTION_GET� ACTION_MERGE�sorted�warnr) r, r r �
StateError�anyr r? )r# r0 r1 �force�mresult�
mergeforceZ
fileconflictsZ
unknownconfigZ
ignoredconfigZ
pathconfigrT Zcheckunknowndirsr2 �path�argsr& Z allconflictsZignoredconflictsZunknownconflicts�fl2�ancZ differentr! rg �backup�flagsr )rR rZ r# rS r �_checkunknownfiles~ s� ��� �
�� �
�
�� �
��rs c C sf t j}|rt j}| �� D ] }||vr|�||dd� q|sb| �� D ] }||vrB|�|t jdd� qBdS )a�
Forget removed files
If we're jumping between revisions (as opposed to merging), and if
neither the working directory nor the target rev has the file,
then we need to remove it from the dirstate, to prevent the
dirstate from listing the file when it is no longer in the
manifest.
If we're merging, and the other revision has removed a file
that is not present in the working directory, we need to mark it
as removed.
Ns forget deleteds forget removed)r] �
ACTION_FORGET�
ACTION_REMOVE�deletedrc �removed)r0 r1 � branchmergerk �mr2 r r r �_forgetremoved s �rz c C s� | � � }|�� sHt|�|��}|rPt|�� �D ]}||�s.|�|� q.nt|�}|�r>|�tjtj tj
tj tj tj
f�D ]}|�|� qx|�tjf�D ]}|�|� q�|�tjg�D ]&\}}}|\}} |�|� |�|� q�|�tjf�D ]}|�|� q�|�tjg�D ]4\}}}|\}
}} } }
| �r0|�|
� |�|� �qi }|D ]D}t�|�}||v �r�td�}|||| f; }t�|��|||< �qFd } }}t|�� �D ]T\}}|� |��r�|� |��s�td�}|||f; }t�|��|d }|d }|}�q�dS )z,
Check for case-folding collisions.
s( case-folding collision between %s and %sr s5 case-folding collision between %s and directory of %s� /N) � narrowmatch�alwaysr7 rC r> rF �
removefiler] �
ACTION_ADD�ACTION_ADD_MODIFIEDrt rd �ACTION_CHANGED_DELETEDr_ rA ru �discardr` � ACTION_DIR_RENAME_MOVE_LOCALra re r �normcaser r rh rf �items�
startswith)r# Zwmfrk r| Zpmmfr2 rn r& r3 rr �f1�fa�moverp ZfoldmapZfoldZ
foldprefixZ unfoldprefixZlastfullr r r �_checkcollision" sf ��
�
r� c c s4 |D ]*}t �|�D ]}||v r||fV qqqdS )z�
Generator that yields pairs of all the files in the manifest that are found
inside the directories listed in dirs, and which directory they are found
in.
N)r r? )r# �manifestrE r2 rD r r r � _filesindirsf s
r� c C s� |� � }t� }t� }t� }t� }t� } |�tjtjtjtjf�D ](}
|�t �
|
�� |� |
�r@|� |
� q@|�tj
f�D ]}
| � |
� qx|�tjf�D ]&\}
} } | \}
}}}}|r�| � |
� q�|�tjf�D ] \}
} } | \}}| � |� q�|D ]b}||v �r ||v �r|� |� n
|� |� |�|�}|r�|d tjtjtjtjfv r�|� |� q�|D ]t}|| v�rVt|��d�}t�|||t|�� ��}|| �� �p�|}|�|tj||fd� |�|tj|dfd� �qV|�r�t|��d�}t| ||�D ]�\}
}|
| v�r�|�|�\}} } t�|||t|�� ��}|tjtjfv �rJ|�||| | � n | d }|�|tj||fd� |�|tj|dfd� |�|� �q��q�|�r�|D ]}| j � t d�| � �q�t � t d ���d
S ) z�
Check if any actions introduce path conflicts in the repository, updating
actions to record or handle the path conflict accordingly.
r � +s local path conflict� ls
path conflicts remote path conflict� rs# %s: is both a file and a directory
s, destination manifest contains path conflictsN)!r� r7 rF r] r^ r_ re rb rP r r? ZhasdirrA ru r` r� �getfile�bytes�rstripr ZsafenameZ
copysourcerc � ACTION_PATH_CONFLICT_RESOLVE�ACTION_PATH_CONFLICTr� ra �remover rg r r rh )r# r0 r1 rk ZmfZlocalconflictsZremoteconflictsZinvalidconflictsZcreatedfiledirsZ deletedfilesr2 rn r& r� r3 r� r� rp rr rD �pdZctxnameZpnewZporigry �flr r r �checkpathconflictss s� ��
�
�
��
���
�r� c C s� |� � D ]�\}}| |�rq|s*|�|� q|d jr@|�|� q|d jr�|�d�st|�|� |�|d|d j� q�td�}td�}tj || |d��qtd�}t�
|| ��qdS ) z�
Filters out actions that can ignored because the repo is narrowed.
Raise an exception if the merge cannot be completed because the repo is
narrowed.
r r{ s outside-narrow-merge-actionsB merge affects file '%s' outside narrow, which is not yet supporteds' merging in the other direction may work��hints- conflict in file '%s' is outside narrow cloneN) �filemapr~ �no_opZ narrow_safe�endswith�
addcommitinfoZchangesr r �Abortrh )r| rx rk r2 �actionr& r� r r r �_filternarrowactions� s(
��r� c @ s� e Zd ZdZdd� Zdd� Zdd� Zd$d d
�Zd%d d �Zd
d� Z d&dd�Z
d'dd�Z d(dd�Z dd� Z
edd� �Zedd� �Zed d � �Zed d � �Zd d!� Zd"d#� ZdS ))� mergeresultz�An object representing result of merging manifests.
It has information about what actions need to be performed on dirstate
mapping of divergent renames and other such cases.c C s. i | _ i | _i | _t�t�| _t�t�| _dS )aY
filemapping: dict of filename as keys and action related info as values
diverge: mapping of source name -> list of dest name for
divergent renames
renamedelete: mapping of source name -> list of destinations for files
deleted on one side and renamed on other.
commitinfo: dict containing data which should be used on commit
contains a filename -> info mapping
actionmapping: dict of action names as keys and values are dict of
filename as key and related data as values
N)� _filemapping�_diverge�
_renamedelete� collections� defaultdict�dict� _commitinfo�_actionmappingr: r r r r< # s
zmergeresult.__init__c C s || _ || _d S r6 )r� r� )r; �diverge� renamedeleter r r � updatevalues5 s zmergeresult.updatevaluesc C sL || j v r&| j | \}}}| j| |= |||f| j |< ||f| j| |< dS )a adds a new file to the mergeresult object
filename: file which we are adding
action: one of mergestatemod.ACTION_*
data: a tuple of information like fctx and ctx related to this merge
message: a message about the merge
N�r� r� )r; �filenamer� �data�message�a�dry r r r rc 9 s
zmergeresult.addfileNc C s || j v r| j | S |S )zfreturns (action, args, msg) about this file
returns default_return if the file is not present)r� )r; r� Zdefault_returnr r r r� J s
zmergeresult.getfilec c s@ |du r | j D ]
}|V qn |D ]}| j| D ]
}|V q.q dS )zvreturns files on which provided action needs to perfromed
If actions is None, all files are returned
Nr� )r; �actionsr2 r� r r r rF R s
zmergeresult.filesc C s( | j | \}}}| j |= | j| |= dS )zXremoves a file from the mergeresult object as the file might
not merging anymoreNr� )r; r� r� r� r� r r r r~ b s zmergeresult.removefileFc c sp |D ]f}|r@t | j| �D ]"}| j| | \}}|||fV qqt�| j| �D ]\}\}}|||fV qPqdS )z�get list of files which are marked with these actions
if sort is true, files for each action is sorted and then added
Returns a list of tuple of form (filename, data, message)
N)rf r� r � iteritems)r; r� �sortr� r2 rn r& r r r r` i s �zmergeresult.getactionsc s( |du rt � j�S t� fdd�|D ��S )z�returns number of files which needs actions
if actions is passed, total of number of files in that action
only is returnedNc 3 s | ]}t � j| �V qd S r6 )�lenr� �r r� r: r r r[ � r z"mergeresult.len.<locals>.<genexpr>)r� r� �sum)r; r� r r: r r� z s
zmergeresult.lenc c sN t r*t t�| j��D ]\}}||fV qn t�| j�D ]\}}||fV q6d S r6 )rf r r� r� )r; r� �key�valr r r r� � s
zmergeresult.filemapc C s || j | |< dS )zdadds key-value information about filename which will be required
while committing this mergeN�r� )r; r� r� �valuer r r r� � s zmergeresult.addcommitinfoc C s | j S r6 )r� r: r r r r� � s zmergeresult.divergec C s | j S r6 )r� r: r r r r� � s zmergeresult.renamedeletec C s | j S r6 r� r: r r r �
commitinfo� s zmergeresult.commitinfoc C sP t �t�}t�| j�D ]4\}}t�|�D ] \}\}}|| �|||f� q(q|S )z}returns a dictionary of actions to be perfomed with action as key
and a list of files and related arguments as values)r� r� r> r r� r� �append)r; �resr� r� r2 rn r& r r r � actionsdict� s
zmergeresult.actionsdictc C sD || _ t�t�| _t�| j �D ] \}\}}}||f| j| |< q d S r6 )r� r� r� r� r� r r� )r; r� r2 Zactr� r& r r r �
setactions� s zmergeresult.setactionsc C sB | j �� D ]2}|tjtjtjtjfvr
| j | r
|js
dS q
dS )z^tells whether this merge resulted in some actions which can
result in conflicts or notTF)r� �keysr] rd � ACTION_EXECru r� r� )r; r� r r r � hasconflicts� s ���� � zmergeresult.hasconflicts)N)N)F)N)F)rI rJ rK rL r< r� rc r� rF r~ r` r� r� r� �propertyr� r� r� r� r� r� r r r r r� s*
r� Fc
, s� t � }
|dur|�� rd}dd� t� �� ||g tjd�D � t�� } t�� } i }
|rlt�| � ||�\} } }
t �
t |��}t �
t |��}t �
t |��}| j �
td�� | j �d|||f � | j �d|� |f � � �� |�� |�� }}}t| j�� �}|�| j�� � t| j�� �}|�| j�� � d|v �rh� �� du �rht� fd d
�� jD ���rh| jj|d< |� |g� �� v�r| �s| j �d d ��s| j d
k�st|� |�� � �}t � | j�D ] \}}||v �r�|� |� �q�| jD ]}|� |� �q�t�!| |�}t"�#||�}|j ||d�}t � |�D �] \} \\} } \} } | �rv| �rv| |v�r�| j�$| d��pn| j�$| d�}!d\}"}#|!du�r�| | |!d|�%� f}"d|! }#n| | dd|�%� f}"d}#|
�&| t'j(|"|#� �q2| | jv �r| j| }!|
�&| t'j(| |!|!d|�%� fd|! � �q2| | jv �rF| j| }!|
�&| t'j(|!| |!d|�%� fd|! � �q2|| }$|�)| �}%d| | |% v}&| |$k�r�| |%k�r�|
�&| t'j*dd� n�| |$k�r�| |%k�r�| | k�r�|
�&| t'j+| fd� n*|
�&| t'j,| dfd� |�rr|
�-| dd� n�|&�r| |$k�r|
�&| t'j+| fd� n\|&�rR| |$k�rR|
�&| t'j,| dfd� |�rr|
�-| dd� n |
�&| t'j(| | | d|�%� fd � �q&| �r�| |v �r��q2| | jv �r�| j| }'|'|v �r�|
�&|'t'j(| |'dd |�%� fd � n|
�&|'t'j.| | fd | � �q2| | jv �r&| j| }'|
�&| t'j(| |'|'d|�%� fd |' � n�| |v �r�| || k�r�|�rX|
�&| t'j/dd!� n4|
�&| t'j0| d| d|�%� fd"� |�r�|
�-| d#d$� nH| | jj1k�r�|
�&| t'j2dd%� n&|
�&| t'j/dd&� |�r�|
�-| d#d$� n|
�&| t'j3dd'� �q&| �r&| |v �r�q&| | jv �rb| j| }'|'|v �rD|
�&|'t'j(|'| dd|�%� fd(� n|
�&|'t'j4| | fd)| � �q&| | jv �r�| j| }'d\}#}"|'|v �r�|'| |'d|�%� f}"d*|' }#n|'| |'d |�%� f}"d+|' }#|
�&| t'j(|"|#� �q&| |v�r4|�s�|
�&| t'j5| fd,� n6|�s|
�&| t'j5| fd,� n|
�&| t'j6| |�%� fd-� n�| || k�r d}(| j7D ]2})| �8|)��rL| j7|) | t9|)�d� }( �q��qL|(du�r�|(|v �r�|
�&|(t'j(|(| | d|�%� fd.| � nP|�r�|
�&| t'j5| fd/� n4|
�&| t'j:d| | d|�%� fd0� |�r2|
�-| d#d$� n&|
�&| t'j;dd1� |�r&|
�-| d#d$� �q&| j �d d2��rTt<| � ||
� | �=� }*|*�� �srt>|*||
� | j?}+|+�| j?� |
�@|
|+� |
S )3a
Merge wctx and p2 with ancestor pa and generate merge action list
branchmerge and force are as passed in to update
matcher = matcher to filter file lists
acceptremote = accept the incoming changes without prompting
Returns an object of mergeresult class
Nc S s g | ] }|� � �qS r )r� )r �xr r r r � s �z!manifestmerge.<locals>.<listcomp>)r� s resolving manifests
s) branchmerge: %s, force: %s, partial: %s
s% ancestor: %s, local: %s, remote: %s
� .hgsubstatec 3 s | ]}� � |��� V qd S r6 )�sub�dirty)r �s�r0 r r r[ � r z manifestmerge.<locals>.<genexpr>rN s merge-track-salvageds changeset-sidedata)r
�NNFs both renamed from %ss both createds local replaced from %ss other replaced from %sr� r s remote unchangeds update permissionss remote is newers filenode-sources others versions differTs% remote directory rename, both createds& remote directory rename - move from %ss local copied/moved from %ss
remote deletes prompt changed/deleteds merge-removal-candidate� yess remote deleteds
other deleteds ancestor missing, remote missings$ local directory rename, both createds$ local directory rename - get from %ss remote copied from %ss remote moved from %srY s remote created, get or merges- local directory rename - respect move from %ss remote recreatings prompt deleted/changeds# local not present, remote unchangedrO )Ar� r} rf �parentsr Zintrevr Z
branch_copiesZ mergecopiesr �bytestr�boolr �noter �debugr� r7 �copy�valuesrP Z movewithdir�revri �substateZ
nodeconstantsZmodifiednodeidr\ Zfilecopiesmode�diffr� r� rA �
matchfiles�matchmodZintersectmatchers�get�noderc r] re rr � ACTION_KEEPr� rd r� r� ru r� Z addednodeidrt �ACTION_KEEP_NEWra r^ rb Zdirmover� r� r_ �ACTION_KEEP_ABSENTr� r| r� r� r� ),r# r0 �p2�parx rj �matcher� acceptremote� followcopies�
forcefulldiffrk Zbranch_copies1Zbranch_copies2r� ZboolbmZboolfZboolmZm1Zm2ZmaZcopied1Zcopied2Z
relevantfilesZcopykeyZ copyvalueZ
movedirkeyZ filesmatcherr� r2 Zn1Zfl1Zn2ro r� rn r& r� ZflaZnolr3 Zdfr� r| r� r r� r �
manifestmerge� sJ ��
� �� ��
� �
�
�
�
������
�
��
�
�������
��
��
�
������
r� c C s� t |�tjf��D ]0}||v r|| �|| �s|�|tjdd� qt |�tjf��D ](}||v rV|| �|| �sV|�|� qVdS )zXResolves false conflicts where the nodeid changed but the content
remained the same.Ns prompt same) r> rF r] r� r/ rc ru r_ r~ )r# r0 r1 �ancestorrk r2 r r r �_resolvetrivialC s
�r� c
sz ddl m}
d} t|�dkrNt| |||d |||||� } t| |||| | � �n�| j�td�||td��dd� |D ��f � i } t � } d \}
}|D �]}| j�td
�| � t| ||||||||d d �
}t| ||||| � |
du s�t|j
�t|
�k r�|j
}
|du �st|�t|j �k �r |j }| j �
|j � |jd d
�D ]t\}}|\}}}| j�d|||�� f � || v �r�| | }||v �r�|| �|� n
|g||< n||gi| |< �q8q�| j�td�t|� � t| �� �D �]@\}}| jj�r:| j�d| � t|�� �D ]4\}��D ]$\}}}| j�d||�� f � �q�qt|�dk�r�t|�� �d \}�t�fdd��dd� D ���r�| j�td�||�� f � | j|g�d �R � �q�tj|v �r�| j�td�| � | j|g|tj d �R � �q�tj|v �r2| j�td�| � | j|g|tj d �R � �q�tj|v �r~tj |v �r~| j�td�| � | j|g|tj d �R � �q�tj |v �r�| j�td�| � | j|g|tj d �R � �q�tj |v �r
tj |v �r
| j�td�| � | j|g|tj d �R � �q�tj |v �rt|tj d � t� fdd�|tj dd� D ���rt| j�td�| � | j|g� �R � �q�| j�td�| � t|�� �D ]4\}��D ]$\}}}| j�d ||�� f � �q��q�t|�� �d \}�| j� td �||�� f � | j|g�d �R � �qԐq�| j�td �� | � |
|� |�!� du �rPt"|||| � |
�#| |||| � t$| |||d | � | S ) a�
Calculate the actions needed to merge mctx into wctx using ancestors
Uses manifestmerge() to merge manifest and get list of actions required to
perform for merging two manifests. If there are multiple ancestors, uses bid
merge if enabled.
Also filters out actions which are unrequired if repository is sparse.
Returns mergeresult object same as manifestmerge().
r ��sparseNr s5 note: merging %s and %s using bids from ancestors %s
s and c s s | ]}t �|�V qd S r6 )r r� �r rp r r r r[ � r z#calculateupdates.<locals>.<genexpr>r� s"
calculating bids for ancestor %s
T)r� �r� � %s: %s -> %s
s/
auction for merging merge bids (%d ancestors)
s list of bids for %s:
s %s -> %s
c 3 s | ]}|� d kV qdS )r Nr r� )�lr r r[ � r s %s: consensus for %s
s %s: picking 'keep' action
s" %s: picking 'keep absent' action
s& %s: picking 'changed/deleted' action
s %s: picking 'keep new' action
s% %s: picking 'delete/changed' action
c 3 s | ]}|� kV qd S r6 r r� )�ga0r r r[ � r s %s: picking 'get' action
s% %s: multiple bids for merge action:
s %s -> %s
s( %s: ambiguous merge - picked %s action
s end of auction
)%� r� r� r� rs r r� r r" r� r� r� r� rP r� r� � __bytes__r� rf r� Z debugflagr> �allrc r] r� r� r� r� r_ rd rg r� r� rz Zfilterupdatesactionsr� )r# r0 r1 Z ancestorsrx rj r� r� r� rl r� rk Zfbidsr� r� r� Zmresult1r2 r� ry rn r& r� ZbidsZ_fr )r� r� r �calculateupdatesU s � ���
� �
��
� ��� � ��� � &
�� r� c
C sP z
t �� W S tyJ } z(| jtjkr4W Y d } ~ d S � W Y d } ~ n
d } ~ 0 0 d S r6 )r
�getcwd�OSError�errno�ENOENT)�errr r r �_getcwd s
r� c
c s | j j}t� }d}|D ]�\}}}| j �d||f � |rL| j �td�| � || �� z|| jdd� W nD ty� } z,| j � td�|t
� | j �f � W Y d} ~ n
d} ~ 0 0 |dkr�||fV d}|d 7 }q|dkr�||fV |�rt� �s| j � td
�| j
� dS ) zSapply removes to the working directory
yields tuples for progress updates
r s
%s: %s -> r
� removing %s
T)Z
ignoremissings update failed to remove %s: %s!
N�d r sC current directory was removed
(consider changing to repo root: %s)
)r �verboser� r� r� r r* r� r� rg r Z forcebytestr�strerror�root)
r# r0 r� r� �cwd�ir2 rn r& �instr r r � batchremove& s< ��
���r c c s� i }| j j}|j}| j }d} | jj|t|�d���< |D �]$\}
\} } }
| j �d|
|
f � |rt| j �td�|
� | r�|
}| j� |
�s�t
� |
�D ]}| j� |�r�|} q�q�| j� |�r�t
�|| |�}t�| �|�|� ||
}|�� |�dd�}|j||
��� | d|d�}|�r:|�� }|j}t�|�}|||f||
< | d k�rVd
| |
ffV d} | d 7 } q8W d � n1 �sv0 Y | dk�r�d
| |
ffV d|fV d S )
aj apply gets to the working directory
mctx is the context to get from
Yields arbitrarily many (False, tuple) for progress updates, followed by
exactly one (True, filedata). When wantfiledata is false, filedata is an
empty dict. When wantfiledata is true, filedata[f] is a triple (mode, size,
mtime) of the file f written for each action.
r )Z
expectedcounts
%s: %s -> g
s getting %s
rN s update.atomic-fileT)Zbackgroundclose�
atomictempr� Fr N)r r� �filectxr) Zbackgroundclosingr� r� r� r r@ r r? r, r Z
backuppathr �renameZwjoinZ clearunknownr\ �writer� �lstat�st_moder Zmtime_of)r# r1 r0 � wantfiledatar� Zfiledatar� Zfctxr r r2 rr rq r& Z conflictingrD ZorigZwfctxr �sizer� �mode�mtimer r r �batchgetM sR
�
*
r
c C sD |� tjtjtjtjg�}tj}tj}|| |� � || |�fg� dS )z�Invoke ``scmutil.prefetchfiles()`` for the files relevant to the dict
of merge actions. ``ctx`` is the context being merged in.N)
rF r] rd r_ ra re r Z
prefetchfilesr� r� )r# �ctxrk rF Zprefetchr� r r r �_prefetchfiles� s �� ���r T)�frozenc @ s4 e Zd Ze�� Ze�� Ze�� Ze�� Zdd� Z dS )� updateresultc C s | j p| jp| jp| j S r6 )� updatedcount� mergedcount� removedcount�unresolvedcountr: r r r �isempty� s ���zupdateresult.isemptyN)
rI rJ rK r Zibr r r r r r r r r r � s
r c 0 C s� t | ||� d\}}} |jdd�}
|
�|�� �� |�� |� t�|j�D ]\} } |
�| | � qH|� t
j j �}
|� � |
}| j
jtd�td�|d�}d|jt
j v r�t�| |||||� |jt
jgdd�D ]�\} }}|\}}| j
j}|td �| � |d
k�r|td �| � n|td �| � |td
�| � |
�| ||� |j| d� q�|�� �rXdnd}t�| j
|t| |ft |jt
jgdd���}|D ]\}}|j||d� �q�|� t
jf�} |jt
j gdd�D ]�\} }}| j
� d| |f � |\}}|| � � �rL| j
� td�|| f � || �!� || �"|�#|��$� |�#|��%� � || �&� |j| d� �q�| j
�'dd�}tj| j
|t(| |||ft |jt
j)gdd��|dd�}i } |D ],\} } | �r�| } n| \}}|j||d� �q�d|jt
j) v �r�t�| |||||� |jt
j*fdd�D ],\} }}| j
� d| |f � |j| d� �q |jt
j+fdd�D ],\} }}| j
� d| |f � |j| d� �qL|jt
j,fdd�D ],\} }}| j
� d| |f � |j| d� �q�t
j j D ]>} |j| fdd�D ]&\} }}| j
� d| || �-� f � �qq�|jt
j.fdd�D ]~\} }}| j
� d| |f � |j| d� |\}} | j
� td�|| f � || �!� || �"|�#|��$� | � || �&� �q|jt
j/fdd�D ]f\} }}| j
� d | |f � |j| d� |\}} | j
� td �|| f � || �"|�#|��$� | � �q�|jt
j0fdd�D ]V\} }}| j
� d | |f � |j| d� |\} || �!� || �1d
| v d | v � �q g }!t |jt
j2t
j3t
j4gdd��}"|"D ]�\} }}|\}}#}$}%}&| dk�rĐq�|d u �r�t5�6||$�}'n | j
� d!|| f � || }'|#d u �rt5�6||$�}(n||# }(| |& })|$|)v �r4|)|$ }*n| j#|t7d"�}*|
�8|'|(|*| � || k�r�|%�r�|!�9|� �q�|!D ]<} || � � �rt| j
� d#| � || �!� || �&� �qt|� t
j)t
j0t
j/t
j.f�}z�z�|"D ]|\} }}| j
� d$| |f � |
�| d%d&i� |j| d� | dk�r6t�| |||�:|�||� �q�|| �!� |
�;| |� �q�W n t<j=�yj Y n0 W |
�>� n
|
�>� 0 |
�?� }+|
�@� \},}-}.||,7 }||-7 }| |.7 } |
�A� }/|�B� tC||| |+�| |/fS )'a� apply the merge action list to the working directory
mresult is a mergeresult object representing result of the merge
wctx is the working copy context
mctx is the context to be merged into the working copy
Return a tuple of (counts, filedata), where counts is a tuple
(updated, merged, removed, unresolved) that describes how many
files were affected by the update, and filedata is as described in
batchget.
)r r r T)Zcleans updatings files)Zunit�totalr� r� sD %s: path conflict - a file or link has the same name as a directory
r� s& the local file has been renamed to %s
s' the remote file has been renamed to %s
s1 resolve manually then use 'hg resolve --mark %s'
)�itemr g����MbP?)�stepr s %s: %s -> pr
s moving %s to %s
rN s worker.wdir-get-thread-safe)�
threadsafeZ hasretvals
%s: %s -> f
s
%s: %s -> a
s %s: %s -> am
r� s %s: %s -> dm
s %s: %s -> dg
s getting %s to %s
s
%s: %s -> e
� xNs! preserving %s for resolve of %s
)Zfileidr� s
%s: %s -> m
s mergedr� )Dr r �start�p1r� r r� r� r� r� r] Z MergeActionZ
NO_OP_ACTIONSr Z makeprogressr r� ru r Zsubmerger` r� �statusZaddpathconflictZ incrementr( r r r> r� r� r@ r� r* r r r� rr r� r\ r
rd rt r r� r� r� ra r� Zsetflagsr� r_ re r Z
absentfilectxr rA r� r� �resolver ZInterventionRequiredZcommitr Zcountsr� Zcompleter )0r# rk r0 r1 � overwriter �labels�updatedZmergedrw �msr2 �opZ num_no_opZ
numupdatesZprogressrn r& r� �for� Zcost�progr r Zf0Zorigf0r � getfiledata�finalr� r� rr ZmovesZ mergeactionsr3 r� r� rp ZfclZfcoZactxZfcaZ
unresolvedZ msupdatedZmsmergedZ msremoved� extraactionsr r r � applyupdates� sn
�����
� � $ �
� ��� "� � � ���
��
� �r* c C s� | j �dd�}| j �dd�}t�d�}|d ur<| j �dd�}z,ddlm} |�d� | j �dd�d k}W n t y~ d
}Y n0 |r�|s�|| j
kr�||kr�t j �
d �r�| j �td �� d S )
Ns fsmonitors warn_when_unuseds warn_update_file_countr- s warn_update_file_count_rustr )�
extensionss modes offF)s linuxs darwins� (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor")
)r r\ Z configintr Z
importrustr� r+ �findr! �KeyError�nullidr Z sysplatformr� rg r )r# Znum_getsZp1nodeZfsmonitorwarningZfsmonitorthresholdZdirstate_rustmodr+ Zfsmonitorenabledr r r �_advertisefsmonitor� s> �
�
����
���r/ r s nones linears
noconflictc :
s` ddl m} |dusJ �|sV|sV|
du r,t}
tttf}
|
|
vrVd}||
|
f; }t|��| durp| �� rpt�� }n� � � }|��� | du r�� d } | �
� }|d }� | }|dur�� | g}n^� j � dd�dgk�r
� j
�|�� |�� �}� fd d
�t|��p� jgD �}n|j||d �g}|�� |�� t|�t|�f\}}}}|�oH| }|�s�t|�dk�rlt�td ���| �� }|�� �r�td
�}td�}tj||d��|�rhtd�} ||gk�r�t�| ��nB||gk�r|�s| �� |�� k�rtd�}td�}tj||d��|�s<| � � �s | � � �r<td�}td�}tj||d��| �� �s,t| j �D ]} | � | �� � �qPn�|�s,||k�r�� j!dd|dd� � j!d|ddd� t"dddd�W d � S |
tk�r,||g|gfv�r,| j#dd�} | �r,t$�%� |�� g�} � | �� | v �r n td�}td �}tj&||d��n |�r:| g}n |�sF|g}� j �'dd �} |�r`d } n|d �snd } |�s�| j#dd��s�d } t(� | |||||| ||d �
}!|
tk�r�|!�)� �r�td �}td �}tj||d��|!�*d!�}"|"�r�d!}#|"\}$}%}t+�,|�}&|#|&d"< |$t-j.k�rn� j �/td#�|& d��r<|!�0|#t-j1dd$� n0|#|v �rZ|!�0|#t-j2dd%� n|!�0|#t-j3dd%� nd|$t-j4k�r�|%\}'}(})}*}+||( �5� },� j �/td&�|& d�dk�r�|!�0|#t-j6|,d fd'� n
|!�7|#� t�8� j9��s |�s|�s�| j#dd d(��st:� |�;� d� nt:� | �;� |!� tt<�=|!j>��D ]>\}#}-� j �?td)�|# � t|-�D ]}.� j �?d*|. � �qR�q.tt<�=|!j@��D ]>\}#}-� j �?td+�|# � t|-�D ]}.� j �?d*|. � �q��q~|�s�|� j|df\}}}}|du �p�|�A� }/| �o |/�o | �� } | �r,� j!dd||d� � jB�Cd,|�D� � tE� |!�t-j6f�|�� � | �oP| }0tF� |!| |||0|d-�\}1}2}3| �r"|3�r�t<�=|3�D ]`\}4}5|5D ]&}6|!j0|6d |4g|6dd� �R � �q�|4t-j6k�r�|0�r�|5D ]}6d|2|6d < �qΐq�t|2�|0�r |!�t-j6f�ndk�s J �� jG�H� �� |2�r�i }7tI�J� jB�}8|8du �r>d}2nn|8d }9t<�=|2�D ]<\}#}$|$du�rP|$d. d |9k�rP|$d |$d df|7|#< �qPt<�=|7�D ]\}#}$|$|2|#< �q�� �K||� t-�L� |!jM||2� t�N� jB�Od,�� |�s� jG�P|�� � |�s| �Q� � W d � n1 �s0 Y W d � n1 �s80 Y | �r\� j!d|||1jd� |1S )/a�
Perform a merge between the working directory and the given node
node = the node to update to
branchmerge = whether to merge between branches
force = whether to force branch merging or file overwriting
matcher = a matcher to filter file lists (dirstate not updated)
mergeancestor = whether it is merging with an ancestor. If true,
we should accept the incoming changes for any prompts that occur.
If false, merging with an ancestor (fast-forward) is only allowed
between different named branches. This flag is used by rebase extension
as a temporary fix and should be avoided in general.
labels = labels to use for local, other, and base
mergeforce = whether the merge was run with 'merge --force' (deprecated): if
this is True, then 'force' should be True as well.
The table below shows all the behaviors of the update command given the
-c/--check and -C/--clean or no options, whether the working directory is
dirty, whether a revision is specified, and the relationship of the parent
rev to the target rev (linear or not). Match from top first. The -n
option doesn't exist on the command line, but represents the
experimental.updatecheck=noconflict option.
This logic is tested by test-update-branches.t.
-c -C -n -m dirty rev linear | result
y y * * * * * | (1)
y * y * * * * | (1)
y * * y * * * | (1)
* y y * * * * | (1)
* y * y * * * | (1)
* * y y * * * | (1)
* * * * * n n | x
* * * * n * * | ok
n n n n y * y | merge
n n n n y y n | (2)
n n n y y * * | merge
n n y n y * * | merge if no conflict
n y n n y * * | discard
y n n n y * * | (3)
x = can't happen
* = don't-care
1 = incompatible options (checked in commands.py)
2 = abort: uncommitted changes (commit or update --clean to discard changes)
3 = abort: uncommitted changes (checked in commands.py)
The merge is performed inside ``wc``, a workingctx-like objects. It defaults
to repo[None] if None is passed.
Return the same tuple as applyupdates().
r r� Nz&Invalid updatecheck %r (can accept %r)r rM s preferancestor� *c s g | ] }� | �qS r r r� rW r r r u r z_update.<locals>.<listcomp>)rg s outstanding uncommitted merges outstanding merge conflictss use 'hg resolve' to resolver� s7 merging with a working directory ancestor has no effects nothing to merges# use 'hg update' or check 'hg heads's uncommitted changess use 'hg status' to list changess preupdateTr )�throw�parent1�parent2s update)r2 r3 r )�missings+ commit or update --clean to discard changess followcopiesF)r� rl s conflicting changesr� � fsj local%(l)s changed %(f)s which other%(o)s deleted
use (c)hanged version or (d)elete?$$ &Changed $$ &Deletes
prompt deletes prompt keepsr other%(o)s changed %(f)s which local%(l)s deleted
use (c)hanged version or leave (d)eleted?$$ &Changed $$ &Deleteds prompt recreating)r4 �branchs< note: possible conflict - %s was renamed multiple times to:
s %s
s9 note: possible conflict - %s was deleted and renamed to:
s updatestate)r! � )Rr� r� �UPDATECHECK_LINEAR�UPDATECHECK_NONE�UPDATECHECK_NO_CONFLICT�
ValueErrorr( r ZnullcontextmanagerZwlockr� r Z
configlist� changelogZcommonancestorsheadsr� rf r. r� r� r� r rh r r r r� r6 rF rv r� r� Z
bailifchanged�hookr r� r �
foregroundZ UpdateAbortr\ r� r� r� r Z
partextrasr] r� � promptchoicerc ru r� r r_ rr rd r~ Zfscasesensitiverm r� r� r r� r� rg r� r} Zvfsr �hexr/ r* r- � parentchanger Z
get_fs_now�
setparentsZ
recordupdatesr� �unlinkr" Z setbranchZprunetemporaryincludes):r# r� rx rj r� �
mergeancestorr! r� rl �updatedirstate� updatecheck�wcr� Zokayr& Z maybe_wlock�plr r� ZpasZcahs�fp1�fp2Zxp1Zxp2r r# r� Zm_ar� r� r> r� rk Zvalsr2 ry rn Zpromptsr� r3 r� r� rp rr r� Znfr} r �statsr' r) �kZactsr� Zambiguous_mtimeZnowZnow_secr rW r �_update s� C
"$
�
�
��� �
�� ��� �� �
� ���� ��� � �
$�
2
�J
�rM c C s t | �� | �� |d|||d�S )z�Merge another topological branch into the working copy.
force = whether the merge was run with 'merge --force' (deprecated)
T)r! rx rj rl rG �rM r# r� )r r! rj rG r r r �merge� s �rO c C s" t | �� | �� ddg d�||d�S )a� Do a regular update to the given commit, aborting if there are conflicts.
The 'updatecheck' argument can be used to control what to do in case of
conflicts.
Note: This is a new, higher-level update() than the one that used to exist
in this module. That function is now called _update(). You can hopefully
replace your callers to use this new update(), or clean_update(), merge(),
revert_to(), or graft().
F)s working copys destinations working copy parent)rx rj r! rF rG rN )r rF rG r r r rP � s �rP c C s t | �� | �� dd|d�S )z�Do a clean update to the given commit.
This involves updating to the commit and discarding any changes in the
working copy.
FT)rx rj rG rN )r rG r r r � clean_update� s rP c C s t | �� | �� ddd||d�S )z�Revert the working copy to the given commit.
The working copy will keep its current parent(s) but its content will
be the same as in the given commit.
FT)rx rj rE r� rG rN )r r� rG r r r � revert_to� s �rQ c
C sN |p
| d }|� � }|p |� � }| j�|�� |�� �pD|�� |�� k}t| |�� dd|�� |||d�} |rz| jrz|�� }
n<| j}
|�� } |r�t | �dkr�|| v r�| �
|� | d �� }
|
|�� kr�| j}
|� � r�|� |�� |
� t
�|||� nZ| j�� �> | � |�� |
� | j�| �� � t
�|||� W d � n1 �s@0 Y | S )aI Do a graft-like merge.
This is a merge where the merge ancestor is chosen such that one
or more changesets are grafted onto the current changeset. In
addition to the merge, this fixes up the dirstate to include only
a single parent (if keepparent is False) and tries to duplicate any
renames/copies appropriately.
ctx - changeset to rebase
base - merge base, or ctx.p1() if not specified
labels - merge labels eg ['local', 'graft']
keepparent - keep second parent if any
keepconflictparent - if unresolved, keep parent used for the merge
NT)rD r! rG r7 r )r r< Z
isancestorr� r� rM r r. r� r� r� r( rB r Z graftcopiesr- rA r Zcurrenttransaction) r# r �baser! Z
keepparentZkeepconflictparentr0 ZpctxrD rK Zpotherr� r r r �graft� sB ��
.rS c C sF |d u r*| � � d ur"d}t�|��| �� }t| �� |dd| �� dd�S )Ns/ must specify parent of merge commit to back outTF)rx rj r� rD )r� r ZProgrammingErrorr rM r# r� )r �parentrG r& r r r �back_outA s
�rU c s� � �fdd�} |j }
g } �z�|r,g } | j|_ �j|||d�}
|�r&d}t|
j�}t|
j�}|rx|rxtd�}|||f; }nn|r�td�}||; }nX|r�td�}||; }nB|r�d}| D ] }||�r��j�|�s�|d 7 }q�|r�td
�}||; }|du r�| W |
|_ S |d 7 }�j j
|d d �d k�r&t � td
���|�rvt
|
j|
j �D ]8}|�sh�j �td�| � | �jj|� | �|� �q<|�r�t
| dd�D ]P}||��r��j�|��s�|�s̈j �td�| � | �jj|� | �|� �q�| W |
|_ S |
|_ 0 dS )a Purge the working directory of untracked files.
``matcher`` is a matcher configured to scan the working directory -
potentially a subset.
``unknown`` controls whether unknown files should be purged.
``ignored`` controls whether ignored files should be purged.
``removeemptydirs`` controls whether empty directories should be removed.
``removefiles`` controls whether files are removed.
``abortonerror`` causes an exception to be raised if an error occurs
deleting a file or directory.
``noop`` controls whether to actually remove files. If not defined, actions
will be taken.
``confirm`` ask confirmation before actually removing anything.
Returns an iterable of relative paths in the working directory that were
or would be removed.
c sT z | |� W nB t yN td�| }� r6t�|��n�j�td�| � Y n0 d S )Ns %s cannot be removeds warning: %s
)r� r r r� r rg )Zremovefnrm ry �� abortonerrorr# r r r� u s zpurge.<locals>.remove)r
�ignored�unknownNs3 permanently delete %d unknown and %d ignored files?s$ permanently delete %d unknown files?s$ permanently delete %d ignored files?r r s1 permanently delete at least %d empty directories?s (yN)$$ &Yes $$ &No)�defaults removal cancelleds removing file %s
T)�reverses removing directory %s
)Z traversedirr� r r� rX rY r r) �listdirr r? r Z
CanceledErrorrf r� rC �rmdir)r# r� rY rX ZremoveemptydirsZ removefilesrW ZnoopZconfirmr� Zoldtraversedirr� Z directoriesr r& Z
nb_ignoredZ
nb_unknownZ dir_countr2 r rV r �purgeQ sn $
���r^ )N)F)NF)N)NFNNFTNN)NFN)NN)N)NN)NNFFN)NN)TFTTFFF)FZ
__future__r r� r� �structZi18nr r� r Z
thirdpartyr Zutilsr Z
dirstateutilsr r� r r
r r r
r� r r] r r r r r r r r �packZ_pack�unpackZ_unpackr' r4 �objectr5 rs rz r� r� r� r� r� r� r� r� r� r r
r r� r r* r/ ZUPDATECHECK_ABORTr9 r8 r: rM rO rP rP rQ rS rU r^ r r r r �<module> s� @
8 !D
# 0 �
�
I 'V
�
5 �
#
�
L
�