/
lib64
/
python3.9
/
site-packages
/
mercurial
/
__pycache__
/
New Directory
Upload File
HOME
a �+�bpC � @ s� d dl mZ ddlmZ ddlmZmZmZ ddlm Z dd� Z dd � Z G d d � d e �Z d d � Zdd� Zdd� Zdd� Zd&dd�Zdd� Zd d � Zd d � ZG d d!� d!e �Zd'd$d%�ZdS )(� )�absolute_import� )�_)�error�mdiff�pycompat)� stringutilc C s< t | d |d �}t| d |d �}||k r4||fS dS dS )a Given two ranges return the range where they intersect or None. >>> intersect((0, 10), (0, 6)) (0, 6) >>> intersect((0, 10), (5, 15)) (5, 10) >>> intersect((0, 10), (10, 15)) >>> intersect((0, 9), (10, 15)) >>> intersect((0, 9), (7, 15)) (7, 9) r r N)�max�min)Zra�rbZsaZsb� r �;/usr/lib64/python3.9/site-packages/mercurial/simplemerge.py� intersect s r c C sR || || krdS t t�||�t�||��D ] \}}| | || kr. dS q.dS )z:Compare a[astart:aend] == b[bstart:bend], without slicing.FTN)�zipr Zxrange)�aZastart�aend�bZbstart�bend�ia�ibr r r � compare_range5 s � r c @ s2 e Zd ZdZd dd�Zdd� Zdd� Zd d � ZdS ) � Merge3Textz�3-way merge of texts. Given strings BASE, OTHER, THIS, tries to produce a combined text incorporating the changes from both BASE->OTHER and BASE->THIS.Nc C s^ || _ || _|| _|d u r$t�|�}|d u r6t�|�}|d u rHt�|�}|| _|| _|| _d S �N)�basetext�atext�btextr Z splitnewlines�baser r )�selfr r r r r r r r r �__init__H s zMerge3Text.__init__c c s� | � � D ]�}|d }|dkr:|| j|d |d � fV q|dksJ|dkrh|| j|d |d � fV q|dkr�|| j|d |d � fV q|dkr�|| j|d |d � | j|d |d � | j|d |d � ffV qt|��qd S )a� Yield sequence of line groups. Each one is a tuple: 'unchanged', lines Lines unchanged from base 'a', lines Lines taken from a 'same', lines Lines taken from a (and equal to b) 'b', lines Lines taken from b 'conflict', (base_lines, a_lines, b_lines) Lines from base were changed to either a or b and conflict. r � unchangedr � � a� same� b� conflict� � � � N)� merge_regionsr r r � ValueError)r �t�whatr r r � merge_groupsV s �� zMerge3Text.merge_groupsc c s, d } }}| � � D �]}|\}}}}} } || } || } | | } || }| sT| �rt| j||| j||�}t| j|| | j||�}t| j||| j|| �}|r�d||fV nR|r�|s�d|| fV n<|r�|s�d||fV n&|s�|s�d|||||| fV ntd��|}| }|}| dkrd||fV |}|}| }qdS ) a� Return sequences of matching and conflicting regions. This returns tuples, where the first value says what kind we have: 'unchanged', start, end Take a region of base[start:end] 'same', astart, aend b and a are different from base but give the same result 'a', start, end Non-clashing insertion from a[start:end] 'conflict', zstart, zend, astart, aend, bstart, bend Conflict between a and b, with z as common ancestor Method is as follows: The two sequences align only on regions which match the base and both descendants. These are found by doing a two-way diff of each one against the base, and then finding the intersections between those regions. These "sync regions" are by definition unchanged in both and easily dealt with. The regions in between can be in any of three cases: conflicted, or changed on only one side. r r" r# r! r$ s# can't handle a=b=base but unmatchedr N)�find_sync_regionsr r r r �AssertionError)r Zizr r ZregionZzmatchZzend�amatchr �bmatchr Zmatchlen�len_a�len_bZlen_baseZequal_aZequal_bZsamer r r r) | s@ �� zMerge3Text.merge_regionsc C s< d }}t �| j| j�}t �| j| j�}t|�}t|�}g }||k �r||k �r|| \}} } || \} } } t||| f| | | f�}|r�|d }|d }|| }| || }| || }|| }|| }|�||||||f� || | | k r�|d7 }q<|d7 }q<t| j�}t| j �}t| j �} |�||||| | f� |S )z�Return a list of sync regions, where both descendants match the base. Generates a list of (base1, base2, a1, a2, b1, b2). There is always a zero-length sync region at the end of all the files. r r ) r Zget_matching_blocksr r r �lenr �appendr r r )r r r ZamatchesZbmatchesr2 r3 �slZabaser0 �alenZbbaser1 �blen�iZintbaseZintendZintlenZasubZbsubr r r r r r. � s6 z Merge3Text.find_sync_regions)NNN)�__name__� __module__� __qualname__�__doc__r r- r) r. r r r r r B s &Yr c C s. t �| �� �r*td�| j�� }t�|��dS )zUverifies that text is non-binary (unless opts[text] is passed, then we just warn)s %s looks like a binary file.N)r Zbinary�textr �fctx�pathr ZAbort)�input�msgr r r � _verifytext s rC c G st t dd� | D ��}g }| D ]T}|jrd|jrJ|jd �|d �d |j }n|j}|�t�|d�� q|�d � q|S )Nc s s" | ]}|j rt|j �nd V qdS )r N)�labelr4 )�.0rA r r r � <genexpr> � z!_format_labels.<locals>.<genexpr>� :r � �H )r rD � label_detail�ljustr5 r Zellipsis)ZinputsZpad�labelsrA rD r r r �_format_labels s ��� rN c C s: t | j�dkr6| jd �d�r"dS | jd �d�r6dS dS )Nr s � � )r4 r �endswith)�m3r r r �_detect_newline/ s rS c C s� t | �}t |�}d}||k r>||k r>| | || kr>|d7 }q|}d}||k r|||k r|| | d || d kr||d7 }qF|}| d|� }| ||| � }|||| � } | || d� } ||| | fS )z�Trim conflict regions of lines where A and B sides match. Lines where both A and B have made the same changes at the beginning or the end of each merge region are eliminated from the conflict region and are instead considered the same. r r N)r4 ) �a_lines�b_linesr7 r8 �iiZ startmatchesZ endmatches� lines_beforeZ new_a_linesZ new_b_lines� lines_afterr r r � _minimize8 s , rY N� <<<<<<<� =======� >>>>>>>c C s� t | �}d}|r |d | }|r,|d | }| �� }g } |D ]�\} } | dkr�d}| \} } }t| |�}|\}} }}| �|� | �|| � | �| � | �|| � | �|� | �|| � | �|� q<| �| � q<| |fS )z Return merge in cvs-like form.FrI r$ T)rS r- rY �extendr5 )rR �name_a�name_bZ start_markerZ mid_markerZ end_marker�newline� conflictsr- �linesr, � group_lines� base_linesrT rU Z minimizedrW rX r r r �render_minimizedU s. re c C s� t | �}d}g }| �� D ]�\}}|dkr�|\} } } d}|�d| | � |�| � |�d| | � |�| � |�d| � |�| � |�d| | � q|�|� q||fS )z+Render conflicts as 3-way conflict markers.Fr$ Ts <<<<<<< s ||||||| r[ s >>>>>>> )rS r- r5 r] ) rR r^ r_ � name_baser` ra rb r, rc rd rT rU r r r � render_merge3x s rg c C st t | �}g }d}| �� D �]P\}}|dk�r`|\} } } d�| �} ttj| d�| �| | d��} ttj| d�| �| | d��}dd� }dd� }|�d | � ||�|| �k r�|�d | | � |�| � |�d | | � |�d | | � |�|| | | �� nR|�d | | � |�d | | � |�||| | �� |�d | | � |�| � |�d | � d}q|�|� q||fS )zDRender conflicts as conflict markers with one snapshot and one diff.Fr$ rG )�lines1�lines2c S s t dd� | D ��S )Nc s s* | ]"\}}|d kr|d |d V qdS )� =r r Nr )rE �block�kindr r r rF � s �z;render_mergediff.<locals>.matching_lines.<locals>.<genexpr>)�sum)�blocksr r r �matching_lines� s �z(render_mergediff.<locals>.matching_linesc s s� | D ]~\}}|dkr:||d |d � D ]}d| V q(q||d |d � D ]}d| V qN||d |d � D ]}d| V qrqd S ) Nrj r r rI � -r r% � +r )rn rh ri rk rl �liner r r � diff_lines� s z$render_mergediff.<locals>.diff_linesrZ s ======= s ------- s +++++++ r\ T)rS r- �join�listr Z allblocksr5 r] )rR r^ r_ rf r` rb ra r, rc rd rT rU Z base_textZb_blocksZa_blocksro rs r r r �render_mergediff� sR ���� rv c C sF g }| � � D ]4\}}|dkr6|D ]}|�|| � q q |�|� q |S )Nr$ )r- r] )rR Zsidesrb r, rc Zsider r r �_resolve� s rw c @ s e Zd Zddd�Zdd� ZdS )� MergeInputNc C s || _ || _|| _d | _d S r )r? rD rK �_text)r r? rD rK r r r r � s zMergeInput.__init__c C s | j d u r| j�� | _ | j S r )ry r? Z decodeddata)r r r r r> � s zMergeInput.text)NN)r: r; r< r r> r r r r rx � s rx � mergeFc C s� |s t | � t |� t |� t|�� | �� |�� �}d}|dkrLt|d�}n�|dkr`t|d�}n�|dkrtt|d�}nr|dkr�t| ||�}t|g|�R � \}}nH|d kr�t| ||�}t|g|�R � \}}n t| |�}t|g|�R � \}}d �|�} | |fS ) z[Performs the simplemerge algorithm. The merged result is written into `localctx`. Fs union)r r s local)r s other)r s mergediffs merge3rG ) rC r r> rw rN rv rg re rt ) �localr �other�modeZ allow_binaryrR ra rb rM Z mergedtextr r r � simplemerge� s, r~ )NNrZ r[ r\ )rz F)Z __future__r Zi18nr � r r r Zutilsr r r �objectr rC rN rS rY re rg rv rw rx r~ r r r r �<module> s0 R � #@ �