|
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
�]Lb}} � @ s d dl mZ d dlZd dlZd dlZd dlZd dlZddlmZ ddl m
Z
m Z m Z ddl
mZmZmZmZ ddlmZ ejZejZdd � Zd
d � Zd Zd
ZdZ dZ dZ dZ dZ dZ!dZ"dZ#dZ$dZ%dZ&dZ'dZ(dZ)d Z*d Z+d Z,d Z-G d d!� d!e.�Z/e/dd"e,d#�Z0e/dd"e,d#�Z1e/d$d"e+d#�Z2e/d%d"e-d#�Z3e/d&�Z4e/d'�Z5e/d(d"e+d#�Z6e/d)d"e+d#�Z7e/d*�Z8e/d+�Z9e/d�Z:e/d,�Z;e/d-�Z<e/d.d"d/�Z=e/d0d"d/�Z>e/d1d"d/�Z?e/d2d"e-d#�Z@e/d3d"e+d#�ZAe:e<e9e8fZBG d4d5� d5e.�ZCG d6d7� d7eC�ZDG d8d9� d9eC�ZEd:d;� ZFdS )<� )�absolute_importN� )�_)�bin�hex�nullrev)�error� filemerge�pycompat�util)�hashutilc C s, | � d�}|d d� |dd � }d�|�S )N� ������)�split�join)�data�bits� r �6/usr/lib/python3/dist-packages/mercurial/mergestate.py�
_droponode s
r c C s$ | |� � jjkrt�||�S || S �N)�repo�
nodeconstants�nullhexr �
absentfilectx)�hexnode�ctx�fr r r �_filectxorabsent" s r � L� O� l� f� F� C� P� u� rs pus pr� o� t� R� d� m� Ds addeds removeds modifiedc @ sR e Zd ZdZe�� Ze�� Zddd�Zdd� Z dd � Z
d
d � Z d d
� Z dd� Z
dS )� MergeActiona# represent an "action" merge need to take for a given file
Attributes:
_short: internal representation used to identify each action
no_op: True if the action does affect the file content or tracking status
narrow_safe:
True if the action can be safely used for a file outside of the narrow
set
changes:
The types of changes that this actions involves. This is a work in
progress and not all actions have one yet. In addition, some requires
user changes and cannot be fully decided. The value currently available
are:
- ADDED: the files is new in both parents
- REMOVED: the files existed in one parent and is getting removed
- MODIFIED: the files existed in at least one parent and is getting changed
FNc C s: || _ | j�| � || _| jr| j�| � || _|| _d S r )�_short� ALL_ACTIONS�add�no_op�
NO_OP_ACTIONS� narrow_safe�changes)�self�shortr3 r5 r6 r r r �__init__� s
zMergeAction.__init__c C s
t | j�S r )�hashr0 �r7 r r r �__hash__� �
zMergeAction.__hash__c C s d| j �d� S )NzMergeAction<%s>�ascii)r0 �decoder; r r r �__repr__� s zMergeAction.__repr__c C � | j S r �r0 r; r r r � __bytes__� � zMergeAction.__bytes__c C s& |d u rdS t |t�s
J �| j|jkS �NF)�
isinstancer/ r0 �r7 �otherr r r �__eq__� s zMergeAction.__eq__c C s | j |j k S r rB rG r r r �__lt__� s zMergeAction.__lt__)FFN)�__name__�
__module__� __qualname__�__doc__�weakref�WeakSetr1 r4 r9 r< r@ rC rI rJ r r r r r/ j s
r/ T)r5 r6 � a� g� p�prs am� cs dcs cds dgs dm� k)r3 s kas kn� es cmc @ s e Zd ZdZdd� Zdd� Zd9dd�Zejd d
� �Z ejd d � �Z
ejd
d� �Z ejdd� �Z dd� Z
dd� Zedd� �Zdd� Zdd� Zdd � Zd d � Zd d � Zd!d"� Zd#d$� Zd%d&� Zd'd(� Zd)d*� Zd+d,� Zd-d.� Z d/d0� Z d1d2� Z d3d4� Z d5d6� Z d7d8� Z!dS ):�_mergestate_basea� track 3-way merge state of individual files
The merge state is stored on disk when needed. Two files are used: one with
an old format (version 1), and one with a new format (version 2). Version 2
stores a superset of the data in version 1, including new kinds of records
in the future. For more about the new format, see the documentation for
`_readrecordsv2`.
Each record can contain arbitrary content, and has an associated type. This
`type` should be a letter. If `type` is uppercase, the record is mandatory:
versions of Mercurial that don't support it should abort. If `type` is
lowercase, the record can be safely ignored.
Currently known records:
L: the node of the "local" part of the merge (hexified version)
O: the node of the "other" part of the merge (hexified version)
F: a file to be merged entry
C: a change/delete or delete/change conflict
P: a path conflict (file vs directory)
f: a (filename, dictionary) tuple of optional values for a given file
l: the labels for the parts of the merge.
Merge record states (stored in self._state, indexed by filename):
u: unresolved conflict
r: resolved conflict
pu: unresolved path conflict (file conflicts with directory)
pr: resolved path conflict
o: file was merged in favor of other parent of merge (DEPRECATED)
The resolve command transitions between 'u' and 'r' for conflicts and
'pu' and 'pr' for path conflicts.
c C s: || _ i | _t�t�| _d| _d| _d| _i | _ d| _
dS )z^Initialize the merge state.
Do not use this directly! Instead call read() or clean().NF) �_repo�_state� collections� defaultdict�dict� _stateextras�_local�_other�_labels�_results�_dirty�r7 r r r r r9 � s
z_mergestate_base.__init__c C s d S r r r; r r r �reset� s z_mergestate_base.resetNc C s || _ || _|| _d S r )r_ r` ra )r7 �noderH �labelsr r r �start s
z_mergestate_base.startc C � | j d u r d}t�|��| j S )Ns( local accessed but self._local isn't set)r_ r �ProgrammingError�r7 �msgr r r �local �
z_mergestate_base.localc C � | j | j S r )rY rm r; r r r �localctx � z_mergestate_base.localctxc C ri )Ns( other accessed but self._other isn't set)r` r rj rk r r r rH rn z_mergestate_base.otherc C ro r )rY rH r; r r r �otherctx rq z_mergestate_base.otherctxc C s t | j�p t | j�S )z�Whether mergestate is active.
Returns True if there appears to be mergestate. This is a rough proxy
for "is a merge in progress."
)�boolr_ rZ r; r r r �active s z_mergestate_base.activec C s dS )z*Write current state on disk (if necessary)Nr r; r r r �commit# s z_mergestate_base.commitc C s t t�| ��� �S )zUhash the path of a local file context for storage in the .hg/merge
directory.)r r �sha1�digest)�pathr r r � getlocalkey& s z _mergestate_base.getlocalkeyc C � t � �r ��NotImplementedError�r7 �fctx�localkeyr r r � _make_backup- rD z _mergestate_base._make_backupc C rz r r{ �r7 r~ r �flagsr r r �_restore_backup0 rD z _mergestate_base._restore_backupc C s� |� � r
| jjj}n
t�|�� �}| �||� t||�� |�� t |�
� �|�� t |�
� �|� � g| j |< t |�
� �| j| d< d| _dS )a/ add a new (potentially?) conflicting file the merge state
fcl: file context for local,
fco: file context for remote,
fca: file context for ancestors,
fd: file path of the resulting merge.
note: also write the local version to the `.hg/merge` directory.
� ancestorlinknodeTN)�isabsentrY r r �
mergestatery rx r� �MERGE_RECORD_UNRESOLVEDr �filenoder� rZ rf r^ rc )r7 �fcl�fco�fca�fdr r r r r2 3 s
�
z_mergestate_base.addc C s t ||g| j|< d| _dS )z�add a new conflicting path to the merge state
path: the path that conflicts
frename: the filename the conflicting file was renamed to
forigin: origin of the file ('l' or 'r' for local/remote)
TN)� MERGE_RECORD_UNRESOLVED_PATHrZ rc )r7 rx �frename�foriginr r r �addpathconflictN s
z _mergestate_base.addpathconflictc C s | j | �|� d| _dS )zHstores information which is required at commit
into _stateextrasTN)r^ �updaterc )r7 rx r r r r �
addcommitinfoW s
z _mergestate_base.addcommitinfoc C s
|| j v S r �rZ �r7 �dfiler r r � __contains__] r= z _mergestate_base.__contains__c C s | j | d S )Nr r� r� r r r � __getitem__` � z _mergestate_base.__getitem__c C s t t| j��S r )�iter�sortedrZ r; r r r �__iter__c r� z_mergestate_base.__iter__c C s
| j �� S r )rZ �keysr; r r r �filesf r= z_mergestate_base.filesc C s || j | d< d| _d S )Nr T)rZ rc )r7 r� �stater r r �marki s
z_mergestate_base.markc c s2 � t �| j�D ]\}}|d ttfv r|V qdS )z%Obtain the paths of unresolved files.r N)r
� iteritemsrZ r� r� )r7 r �entryr r r �
unresolvedm s ����z_mergestate_base.unresolvedc C rA )z8return all extras information stored with the mergestate�r^ r; r r r � allextrasw s z_mergestate_base.allextrasc C s
| j | S )z?return extras stored with the mergestate for the given filenamer� )r7 �filenamer r r �extras{ s
z_mergestate_base.extrasc
C s� | | t tfv r
dS | j| }|\}}}}}} }
} | j| j } | �|�}
|
�d�}|r1| j| }nd}t|||�}t|
| | �}| jj|||d�}|� � }|� � }d| | | v r|d| | | vr||�
� t krv| |krv| jj �
td�| � n| |kr||} || jjjkr�| �|| || � n|| jdd � |�|�s�| j|= d
| j|< d| _dS tj| j|| j||||| jd �\}}|s�| �|t � d}|r�|�� r�t}nt }n|�� r�t }n|�� r�|| j v r�t }nt }||f| j|< |S ) zHrun merge process for dfile
Returns the exit code of the merge.r r� N)�fileid� changectx� xr" sQ warning: cannot merge flags for %s without common ancestor - keeping local flags
T)�
ignoremissing)NN)rg )!�MERGE_RECORD_RESOLVED� LEGACY_RECORD_DRIVER_RESOLVEDrZ rY r` r� �getr �filectxr� �revr �ui�warnr r r r� �remove�cmprb rc r r_ ra r� r� �
ACTION_FORGET�
ACTION_REMOVE�
ACTION_GETrp �ACTION_ADD_MODIFIED�
ACTION_ADD)r7 r� �wctx�
stateentryr� r �lfile�afile�anode�ofile�onoder� �octxr� �
anccommitnode�actx�fcdr� r� �flo�fla� merge_ret�deleted�actionr r r �resolve s| �
���
�
z_mergestate_base.resolvec C s^ d\}}}t �| j�D ] \}}|du r|d7 }q |dkr)|tkr%|d7 }q |d7 }q |||fS )zKreturn counts for updated, merged and removed files in this
session)r r r Nr r )r
�
itervaluesrb r� )r7 �updated�merged�removed�rr� r r r �counts� s
�
z_mergestate_base.countsc C s t t| �� ��S )z0get unresolved count for this merge (persistent))�len�listr� r; r r r �unresolvedcount� s z _mergestate_base.unresolvedcountc
C sR t g tg tg tg tg i}t�| j�D ]\}\}}|dur&|| �|ddf� q|S )z2return lists of actions to perform on the dirstateNs merge result) r� r� r� r� r� r
r� rb �append)r7 �actionsr r� r� r r r r� � s ��z_mergestate_base.actionsr )"rK rL rM rN r9 re rh r �
propertycacherm rp rH rr rt ru � staticmethodry r� r� r2 r� r� r� r� r� r� r� r� r� r� r� r� r� r� r r r r rX � sD "
U rX c @ s� e Zd ZdZdZedd� �Zedd� �Zdd� Zd d
� Z d d � Z
d
d� Z dd� Z dd� Z
dd� Zdd� Zdd� Zdd� Zdd � Zd d � Zd d � Zd!S )"r� s merge/states merge/state2c C � t | �}|�� |S )zPInitialize a brand new merge state, removing any existing state on
disk.)r� re �r �msr r r �clean� s zmergestate.cleanc C r� )z1Initialize the merge state, reading it from disk.)r� �_readr� r r r �read s zmergestate.readc C sV t � }| �� }|D ]�\}}|tkrt|�| _q |tkr!t|�| _q |tkr&q |tt t
t t fv rP|�
d�}|d tkrDd| j|d d< q |dd� | j|d < q |tkr�|�
dd�\}}|�
d�}i } d}
|
t|�k r||
d | ||
< |
d7 }
|
t|�k sk| | j|< q |tkr�|�
dd�} dd � | D �| _q |�� s�|�|� q |r�t�|��dS )
z�Analyse each record content to restore a serialized state from disk
This function process "record" entry produced by the de-serialization
of on disk file.
r
r s otherr s filenode-sourceN� c S s g | ]
}t |�d kr|�qS )r )r� )�.0�lr r r �
<listcomp>3 s z$mergestate._read.<locals>.<listcomp>)�set� _readrecords� RECORD_LOCALr r_ � RECORD_OTHERr` �LEGACY_MERGE_DRIVER_STATE�
RECORD_MERGED� RECORD_CHANGEDELETE_CONFLICT�RECORD_PATH_CONFLICT�LEGACY_MERGE_DRIVER_MERGE� LEGACY_RECORD_RESOLVED_OTHERr �MERGE_RECORD_MERGED_OTHERr^ rZ �RECORD_FILE_VALUESr� �
RECORD_LABELSra �islowerr2 r �UnsupportedMergeRecords) r7 � unsupported�records�rtype�recordr r� � rawextras�
extrapartsr� �irg r r r r� sN �
�
�
�zmergestate._readc C s� | � � }| �� }| �||�r|S | jd �� d }|�t|�� f� t|�D ]"\}}|d t krH|d �
d�}|� dd� |d d� |�f||< q&|S )a� Read merge state from disk and return a list of record (TYPE, data)
We read data from both v1 and v2 files and decide which one to use.
V1 has been used by version prior to 2.9.1 and contains less data than
v2. We read both versions and check if no data in v2 contradicts
v1. If there is not contradiction we can safely assume that both v1
and v2 were written at the same time and use the extract data in v2. If
there is contradiction we ignore v2 content as we assume an old version
of Mercurial has overwritten the mergestate file and left an old v2
file around.
returns list of record [(TYPE, data), ...]Nr r r r
r � )
�_readrecordsv1�_readrecordsv2�
_v1v2matchrY �parentsr� r� r � enumerater� r �insertr )r7 � v1records� v2records�mctx�idxr� r r r r r� : s �zmergestate._readrecordsc C sf t � }|D ] }|d tkr|�|� q|d tkr$|�tt|d �f� q|D ] }||vr0 dS q'dS )Nr r FT)r� r� r2 r� r )r7 r� r� �oldv2�recr r r r� \ s ��zmergestate._v1v2matchc
C s� g }z2| j �| j�}t|�D ] \}}|dkr"|�t|dd� f� q|�t|dd� f� q|�� W |S tyN } z|j t j
krC� W Y d}~|S d}~ww )z�read on disk merge state for version 1 file
returns list of record [(TYPE, data), ...]
Note: the "F" data from this file are one entry short
(no "other file node" entry)
r Nr ) rY �vfs� statepathv1r� r� r� r� �close�IOError�errno�ENOENT)r7 r� r r� r� �errr r r r� j s
�
���zmergestate._readrecordsv1c
C s� g }za| j �| j�}|�� }d}t|�}||k r]|||d � }|d7 }td|||d � �d }|d7 }|||| � }||7 }|tkrR|dd� |dd� }}|�||f� ||k s|�� W |S t y} } z| j
t
j krr� W Y d} ~ |S d} ~ ww )a read on disk merge state for version 2 file
This format is a list of arbitrary records of the form:
[type][length][content]
`type` is a single character, `length` is a 4 byte integer, and
`content` is an arbitrary byte sequence of length `length`.
Mercurial versions prior to 3.7 have a bug where if there are
unsupported mandatory merge records, attempting to clear out the merge
state with hg update --clean or similar aborts. The 't' record type
works around that by writing out what those versions treat as an
advisory record, but later versions interpret as special: the first
character is the 'real' record type and everything onwards is the data.
Returns list of records [(TYPE, data), ...].r r s >I� N) rY r � statepathv2r� r� �_unpack�RECORD_OVERRIDEr� r r r r )
r7 r� r r �off�endr� �lengthr� r
r r r r� � s4 �
�
���zmergestate._readrecordsv2c C s& | j r| �� }| �|� d| _ d S d S rE )rc � _makerecords�
_writerecords�r7 r� r r r ru � s
�zmergestate.commitc C s: g }|� tt| j�f� |� tt| j�f� t�| j�D ]G\}}|d t t
fv r6|� t d� |g| �f� q |d | j
jjksH|d | j
jjkrV|� td� |g| �f� q |� td� |g| �f� q tt�| j��D ] \}}d� dd� t�|�D ��}|� td||f f� ql| jd ur�d� | j�}|� t|f� |S )Nr r
r � c s s � | ] \}}d ||f V qdS )� %s %sNr )r� �k�vr r r � <genexpr>� s �
�z*mergestate._makerecords.<locals>.<genexpr>r )r� r� r r_ r� r` r
r� rZ r� �MERGE_RECORD_RESOLVED_PATHr� r rY r r r� r� r� r^ r� ra r� )r7 r� r� r r� r� rg r r r r � s8 ���
��
zmergestate._makerecordsc C s | � |� | �|� dS )z,Write current state on disk (both v1 and v2)N)�_writerecordsv1�_writerecordsv2r r r r r � s
zmergestate._writerecordsc C sx | j �| jd�}t|�}t|�}|d tksJ �|�t| j�d � |D ]\}}|t kr5|�dt
|� � q$|� � dS )z/Write current state on disk in a version 1 file� wbr �
s %s
N) rY r r r� �nextr� �writer r_ r� r r )r7 r� r �irecords�lrecordsr� r r r r r � s � zmergestate._writerecordsv1c C s� t ttf}| j�| jd�}|D ]+\}}t|�dksJ �||vr(td||f }}dt|� }|�t ||t|�|�� q|�
� dS )zqWrite current state on disk in a version 2 file
See the docstring for _readrecordsv2 for why we use 't'.r r s %s%ss >sI%isN) r� r� r� rY r r r� r r �_packr )r7 r� � allowlistr �keyr �formatr r r r � s
zmergestate._writerecordsv2c C s | j j�d| |�� � d S �Ns merge/)rY r r r r} r r r r� � s zmergestate._make_backupc C sF | j �d| ��}|�|�� |� W d � d S 1 s w Y d S r' )rY r r r� )r7 r~ r r� r r r r r� � s "�zmergestate._restore_backupc C s t �| jj�d�d� d S )Ns mergeT)�shutil�rmtreerY r r r; r r r re s zmergestate.resetN)rK rL rM r r r� r� r� r� r� r� r� r� ru r r r r r� r� re r r r r r� � s(
1"(- r� c s, e Zd Z� fdd�Zdd� Zdd� Z� ZS )�
memmergestatec s t t| ��|� i | _d S r )�superr* r9 �_backupsrd �� __class__r r r9 s
zmemmergestate.__init__c C s |� � | j|< d S r )r r, r} r r r r� s zmemmergestate._make_backupc C s |� | j| |� d S r )r r, r� r r r r� s z memmergestate._restore_backup)rK rL rM r9 r� r� �
__classcell__r r r- r r* s r* c C s� |� tg �D ]\}}}|r| jj|ddd� q| jj|ddd� q|� tg �D ]\}}}| jj|ddd� q'|� tg �D ]0\}}}|\}}| jj|ddd� | j�||� ||krc| jj|ddd� q<| jj|ddd� q<|� tg �D ]\}}}| jj|ddd� qs|� tg �D ]\}}}|r�| jj|dddd� q�| jj|ddd� q�|� t g �D ]\}}}| jj|dddd� q�|� t
g �D ]\}}}q�|� t g �D ]\}}}q�|� t g �D ]\}}}q�|� t
g �D ]3\}}}|�r| j�|�} | jo�| j }
| jj||
ddd� q�|�r || nd} | jj|dd| d� q�|� tg �D ]a\}}}|\} }
}}}|�rc| |k}
| jj||
ddd� | |
k�ra|�rL| jj| ddd� | |k�rZ| j�| |� �q | j�|
|� �q |
|k�rr| jj|dddd� |�r~| jj| ddd� �q |� tg �D ]:\}}}|\}}|�r�| jj|ddd� | jj|ddd� | j�||� �q�| jj|ddd� | jj|ddd� �q�|� tg �D ](\}}}|\}}|�r�| jj|ddd� | j�||� �q�| jj|ddd� �q�dS )z$record merge actions to the dirstateTF)�
p1_tracked�
wc_tracked)r0 r1 �possibly_dirty)r0 r1 �p2_infoN)r0 r1 �parentfiledata)r� r� �dirstate� update_filer� � ACTION_PATH_CONFLICT_RESOLVE�copyr� r� � ACTION_EXEC� ACTION_KEEP�ACTION_KEEP_ABSENT�ACTION_KEEP_NEWr� � get_entry� any_tracked�added� ACTION_MERGE� ACTION_DIR_RENAME_MOVE_LOCAL�ACTION_LOCAL_DIR_RENAME_GET)r r� � branchmerge� getfiledatar �argsrl �f0�origf0� old_entryr0 r4 �f1�f2�fa�move�anc�flagr r r �
recordupdates s� �� ���
�
�
����rO )G�
__future__r r[ r r( �structrO �i18nr rf r r r � r r r
r �utilsr �packr# �unpackr
r r r� r� r� r� r� r� r� r� r� r� r r� r r� r� r� r� � CHANGE_ADDED�CHANGE_REMOVED�CHANGE_MODIFIED�objectr/ r� r� r� r� �ACTION_PATH_CONFLICTr7 r� �ACTION_CREATED�ACTION_DELETED_CHANGED�ACTION_CHANGED_DELETEDr@ rB rA r: r; r< r9 �ACTION_CREATED_MERGE�CONVERT_MERGE_ACTIONSrX r� r* rO r r r r �<module> s�
7� �� /