/
lib64
/
python3.9
/
site-packages
/
mercurial
/
__pycache__
/
Upload File
HOME
a �+�b�� � @ s0 d dl mZ d dlZd dlZd dlZd dlZddlmZ ddlm Z m Z ddl m Z ddl mZmZmZmZm Z mZmZmZmZmZmZmZmZ ddlmZm Z d d � Z d d � Z d d� Z i Z i Z!e�"� Z#e#j$Z$e#j%Z%e#j&Z&ed�Z'ed�Z(G dd� de)�Z*dd� Z+dd� Z,dd� Z-dd� Z.dd � Z/d d � Z0e#d e$�d d!� �Z1e#d"e$�d#d$� �Z2e#d%e$�d&d'� �Z3e#d(e$�d)d*� �Z4d+d,� Z5d-d.� Z6d/d0� Z7d1d2� Z8d3d4� Z9e#d5e&ed6�e8d7�d8d9� �Z:e#d:e&ed6�e8d7�d;d<� �Z;e#d=e&ed6�e8d7�d>d?� �Z<e#d@e&dAe8d7�dBdC� �Z=e#dDe&ed6�e8d7�dEdF� �Z>e#dGe%e8d7�dHdI� �Z?e#dJe%e8d7�dKdL� �Z@e#dMe%edN��dOdP� �ZAe#dQe&dRdRdS�dTdU� �ZBe#dVe%dRdRdS�dWdX� �ZCdYdZ� ZDd[d\� ZEd]d^� ZFd_d`� ZGdwdadb�ZHdcdd� ZIdedf� ZJejKdgdh� �ZLdxdidj�ZMdkdl� ZNdmdn� ZOdodp� ZPdqdr� ZQdsdt� ZRdudv� ZSeSdde#� e �T� ZUdS )y� )�absolute_importN� )�_)�hex�short)�getattr) �encoding�error� formatter�match�pycompat� registrar�scmutil� simplemerge�tagmerge� templatekw� templater� templateutil�util)�procutil� stringutilc G s | j d|d | g|�R � S �N� merge-tools� .)�config��ui�tool�part�args� r �9/usr/lib64/python3.9/site-packages/mercurial/filemerge.py�_toolstr. s r" c G s | j d|d | g|�R � S r )� configboolr r r r! � _toolbool2 s r$ c C s | � d|d | �S r )Z configlist)r r r r r r! � _toollist6 s r% s� file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s. You can use (c)hanged version, (d)elete, or leave (u)nresolved. What do you want to do?$$ &Changed $$ &Delete $$ &Unresolveds� file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. What do you want to do?$$ &Changed $$ &Deleted $$ &Unresolvedc @ sl e Zd ZdZdd� Zdd� Zdd� Zdd � Zd d � Zd d � Z dZ dd� Z dd� Z dd� Z dd� Zdd� ZdS )� absentfilectxz�Represents a file that's ostensibly in a context but is actually not present in it. This is here because it's very specific to the filemerge code for now -- other code is likely going to break with the values this returns.c C s || _ || _d S �N)�_ctx�_f)�self�ctx�fr r r! �__init___ s zabsentfilectx.__init__c C s d| j | jf S )Ns absent file %s@%s)r) r( �r* r r r! � __bytes__c s zabsentfilectx.__bytes__c C s | j S r' )r) r. r r r! �pathf s zabsentfilectx.pathc C s d S r' r r. r r r! �sizei s zabsentfilectx.sizec C s d S r' r r. r r r! �datal s zabsentfilectx.datac C s | j �� jS r' )r( �repoZnullidr. r r r! �filenodeo s zabsentfilectx.filenodeTc C s* |� � o&|�� | �� ko&|�� | �� k S )zVcompare with other file context returns True if different from fctx. ��isabsent� changectxr0 )r* �fctxr r r! �cmpt s ��zabsentfilectx.cmpc C s dS )N� r r. r r r! �flags s zabsentfilectx.flagsc C s | j S r' )r( r. r r r! r7 � s zabsentfilectx.changectxc C s dS �NFr r. r r r! �isbinary� s zabsentfilectx.isbinaryc C s dS )NTr r. r r r! r6 � s zabsentfilectx.isabsentN)�__name__� __module__� __qualname__�__doc__r- r/ r0 r1 r2 r4 Z _customcmpr9 r; r7 r= r6 r r r r! r& X s r& c C s2 |t v r |S t| |d|�}|�d�r(|S t| |�S )N� executable� python:)� internalsr" � startswith�findexternaltool)r r �cmdr r r! � _findtool� s rH c C s | � d�r| S t�| �S )NrC )rE r � shellquote)rG r r r! �_quotetoolpath� s rJ c C sv dD ]R}t | ||�}|sqt�|t | |d��}|rt�|t | |dd� �}|r| S qt | |d|�}t�t�|��S )N)s regkeys regkeyalts regnames regappendr: rB )r" r Z lookupregr ZfindexeZ expandpath)r r �kn�k�pZexer r r! rF � s rF c s� �� dd��d �fdd� �dd� �����fdd �}��d d �}|rvt�|�}|r^�|�s^d S |rn|t|�fS ||fS tj�d �} | r�|r��| �s�d S | | fS |o��} ��d�D ]�\} } t�| j d| g�} | |�r�|| | || |�r�|�r�| ddd��s�� t d�t � | �t � |�f � t�| �}| t|�f S q�i }t� � ��d�D ]N\}}|�d�d }||v�r~tt�|d��||< t�|d��rJ� �|� �qJ|�� }t� fdd�|�� D ��}��d d�}|�r||||||��r||v�r�|�s�||fS |�dd |f� |�d� |D ]6\}}||d |||��rt�|�}|t|�f S �q|�s`|�s`|�r�|�s�t|��r��� t d �| � d S d S ) N� merges strict-capability-checkFc s( | t v r |ot | j�|�S t� | |�S r' )rD � capabilities�getr$ )r Z capability�strict)r r r! � hascapability� s z _picktool.<locals>.hascapabilityc S s | t v ot | jtkS r' )rD � mergetype�nomerge�r r r r! � supportscd� s z _picktool.<locals>.supportscdc s� | }|rt d�| |f }t�| �sN|r:��t d�| � qЈ�t d�| � n�|rr� | d��sr��t d�| � n^|r�� | d��s���t d�| � n:|r��| �s�n,t�� s�t�| d�r̈�t d�| � nd S d S ) Ns %s (for pattern %s)s couldn't find merge tool %s s symlinks tool %s can't handle symlinks � binarys tool %s can't handle binary � guis tool %s requires a GUI TF)r rH �warnZnoter Zguir$ )r �pat�symlink�binary� changedelete�tmsg)rR � strictcheckrV r r r! �check� s" z_picktool.<locals>.check� uis forcemerge)s :promptNs HGMERGEs merge-patternsr: rW T)rQ s� warning: check merge-patterns configurations, if %r for binary file %r is unintentional (see 'hg help merge-tools' for binary files capability) r r r s prioritys disabledc s" g | ]\}}|� vr| |f�qS r r )�.0r rM )�disabledr r! � <listcomp> r: z _picktool.<locals>.<listcomp>)Ns hgmerges no tool found to merge %s )s :mergeN)F)r# r rH rJ r �environrP Z configitemsr �rootrY r r �bytestr�set�split�intr" r$ �add�keys�sorted�items�insert�append�len)r3 r r0 r\ r[ r] r` �force�toolpathZhgmergeZ binarycaprZ r ZmfZtoolsrL �v�t�namesZuimergerM r )rc rR r_ rV r r! � _picktool� sv ��� � rw c C s4 d| v r dS d| v rdS d| v r$dS d| v r0dS dS )z Guess the EOL type of a file� Ns � � r �r2 r r r! �_eoltype s r| c C sJ t |�� �}|rFt�| �}t |�}|rF|�||�}||krFt�| |� dS )z/Convert EOL markers in a file to match origfileN)r| r2 r Zreadfile�replace� writefile)�file�backupZtostyler2 Zstyle�newdatar r r! � _matcheol' s r� � promptc C sP | j }|j�� }t�| �}|j�� �� r2t�d��t |j |j g�} ||�| d< z�|j� � rx|� t | d�} g d�| } nH|j� � r�|� t| d�} g d�| } n |� td�| d�} g d�| } | dkr�t| |||||�W S | dkr�t| |||||�W S | d k�rt| |||||�W S W n2 tj�yJ |�d � t| |||||� Y S 0 d S ) zfAsks the user which of the local `p1()` or the other `p2()` version to keep as the merged version.s/ in-memory merge does not support file conflictss fd� )� local� other� unresolved)r� r� r� s� file '%(fd)s' needs to be resolved. You can keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved. What do you want to do?$$ &Local $$ &Other $$ &Unresolvedr� r� r� rz N)r r8 r0 r � getuipathfnr7 � isinmemoryr �InMemoryMergeConflictsError� partextras�labelr6 � promptchoice� _localchangedotherdeletedmsg� _otherchangedlocaldeletedmsgr �_iother�_ilocal�_ifailZResponseExpected�write) r3 �mynode�local�other�base�toolconfr �fd�uipathfnZprompts�index�choicer r r! �_iprompt3 sD � ��� r� r� c C s d|j �� fS )z=Uses the local `p1()` version of files as the merged version.r )r8 r6 �r3 r� r� r� r� r� r r r! r� g s r� r� c C sH |j �� r t|j ��� d}n"t|j ��|j �� |j �� � d}d|fS )z=Uses the other `p2()` version of files as the merged version.TFr )r8 r6 �_underlyingfctxifabsent�remover� r2 r; )r3 r� r� r� r� r� �deletedr r r! r� m s �r� s failc C s, |j �� r(t|j ��|j �� |j �� � dS )z� Rather than attempting to merge files that were modified on both branches, it marks them as unresolved. The resolve command must be used to resolve these conflicts.�r F)r8 r6 r� r� r2 r; r� r r r! r� | s �r� c C s | � � r| �� | �� S | S dS )z�Sometimes when resolving, our fcd is actually an absentfilectx, but we want to write to it (to do the resolve). This helper returns the underyling workingfilectx in that case. Nr5 )Zfilectxr r r! r� � s r� c C s@ t �| �� �r<td�| j�� }|�td�| � t�|��dS )z verifies that text is non-binarys %s looks like a binary file.s warning: %s N) r r\ �textr r8 r0 rY r �Abort)�inputr �msgr r r! � _verifytext� s r� c C s: |\}}}}} |s&|j �� s&|j �� r*dS | j} g d�} zt| |d| �} W nZ tjy� t| |dd��� } | | vr�d�dd� | D ��} t�t d�|| | f ��Y n0 | �r6d }| d kr�d }n | d kr�d }t dd� |||fD ��r�dS t j ||||d�\}}|�r| | v �r"|j � ||j � � � |�s6| �d� dS dS )Nr )s keep� keep-merge3� keep-mergediffs premerger: � , c S s g | ]}d | d �qS )� 'r )rb rt r r r! rd � r: z _premerge.<locals>.<listcomp>s6 %s.premerge not valid ('%s' is neither boolean nor %s)rN r� � mergediffr� � merge3c s s | ]}t �|�� �V qd S r' )r r\ r� )rb r� r r r! � <genexpr>� s z _premerge.<locals>.<genexpr>��modes premerge successful r )r8 r6 r r$ r Z ConfigErrorr" �lower�joinr �anyr r� r; �debug)r3 r� r� r� r� r rs r\ r[ �scriptfnr Z validkeepZpremergeZ_validr� � merged_text� conflictsr r r! � _premerge� sF �� �� r� c C sx |\}}}} } t �| �} | r@| j�td�|| |�� �f � dS |�� sP|�� rt| j�td�|| |�� �f � dS dS )Ns2 warning: internal %s cannot merge symlinks for %s Fs@ warning: internal %s cannot merge change/delete conflict for %s T)r r� r rY r r0 r6 ) r3 r� �fcd�fco�fcar� r rs r\ r[ r� r� r r r! � _mergecheck� s& �����r� c C sx | j }z"t||� t||� t||� W n tjy> Y dS 0 tj||||d�\}}|j�||j�� � d|dfS dS )a) Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file. Markers will have two sections, one for each side of merge, unless mode equals 'union' which suppresses the markers.)TTFr� TFN)r r� r r� r r8 r� r; )r3 r� r� r� r� r r� r� r r r! �_merge� s � r� � unionsJ warning: conflicts while merging %s! (edit, then use 'hg resolve --mark') )�precheckc C s t | |||d�S )z� Uses the internal non-interactive simple merge algorithm for merging files. It will use both left and right sides for conflict regions. No markers are inserted.r� �r� �r3 r� r� r� r� r� r� r r r! �_iunion� s r� rN c C s t | |||d�S )z� Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file. Markers will have two sections, one for each side of merge.rN r� r� r r r! �_imerge s r� r� c C s t | |||d�S )a Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file. Marker will have three sections, one from each side of the merge and one for the base content.r� r� r� r r r! �_imerge3 s r� s merge3-lie-about-conflictsr: c O s t | i |��\}}}|d|fS r< )r� )r �kwargs�b1Zjunk�b2r r r! �_imerge3alwaysgood+ s r� r� c C s t | |||d�S )ag Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file. The marker will have two sections, one with the content from one side of the merge, and one with a diff from the base content to the content on the other side. (experimental)r� r� r� r r r! � _imerge_diff> s r� s merge-localc C s t | |||d�S )zg Like :merge, but resolve all conflicts non-interactively in favor of the local `p1()` changes.r� r� r� r r r! � _imergelocalQ s r� s merge-otherc C s t | |||d�S )zg Like :merge, but resolve all conflicts non-interactively in favor of the other `p2()` changes.r� r� r� r r r! � _imergeotherY s r� s tagmergesj automatic tag merging of %s failed! (use 'hg resolve --tool :merge' or another merge tool of your choice) c C s$ t �| |j|j|j�\}}||dfS )z? Uses the internal tag merge algorithm (experimental). F)r �merger8 ) r3 r� r� r� r� r� r� �success�statusr r r! � _itagmergea s r� s dumpT)r\ r[ c C s� t | |j�}|j�� }ddlm} t|j| j�r:t�d��t � |d |j� � � | � |d |j� � |j�� � | � |d |j� � |j�� � dS )a Creates three versions of the files to merge, containing the contents of local, other and base. These files can then be used to perform a merge manually. If the file to be merged is named ``a.txt``, these files will accordingly be named ``a.txt.local``, ``a.txt.other`` and ``a.txt.base`` and they will be placed in the same directory as ``a.txt``. This implies premerge. Therefore, files aren't dumped, if premerge runs successfully. Use :forcedump to forcibly write files out. r ��contexts0 in-memory merge does not support the :dump tool.s .locals .others .base)Fr F)� _workingpathr8 r0 � r� � isinstance�overlayworkingfilectxr r� r r~ � decodeddataZwwriter2 r; ) r3 r� r� r� r� r� r� �ar� r� r r r! �_idumpr s � r� s forcedumpc C s t | ||||||�S )zS Creates three versions of the files as same as :dump, but omits premerge. )r� r� r r r! � _forcedump� s r� c C s t �d��d S )Ns5 in-memory merge does not support external merge tools)r r� r� r r r! � _xmergeimm� s �r� c C s� | � dd�} | sd S tj} |�� t|�|�� | |�� |t|�td�d|�� v |d d��| |�� |td�d|�� v |d d ��| |�� |td �d|�� v |d d ��||d �} t� | �} t � | |�} t j | | t j| d �} | �| �| �� d S )N� command-templatess pre-merge-tool-outputr� � l� HG_MY_LABEL)� ctx� fctx� node� name� islink� label� base� HG_BASE_LABEL)r� r� r� r� r� r� � HG_OTHER_LABEL)r� r� s pathr� r� r� s toolpaths toolargs��defaultsZ resources)r r � mappingdictr7 r r0 r r; r � unquotestringr �templateresources� maketemplaterr �keywordsr� � renderdefault)r r3 r� ZfclZfcbr� �envrs r �tmplr� �props�tresru r r r! �_describemerge� sR �� �� �� �% �r� c & C s< |j }|j }|j } |\} } } } }t�| �}|�� s:|�� r^| j�td�| ||�� �f � dS t| |�}t | j| d�}d| �� | � � fd|�� |� � fg}d}d|v r�|}|�� }|� d�r�t j� |�\}}|�d ||�� f� t|���<}|d d � \}}t|�d k�r|d }d d � }|�� t|�t|�� �� �t| �� �� �d|�� v d|�� v d| �� v ||�||�||�d� }| j}||||||�||�||�d�} t�d| |dd� �}t|| d��r�| j�td�| ||�� �f � |d u �r4| d | } | j�d| � t|| ||| ||| |� |j | | j |dd�} n�| j�d| |f � d} z d d l m } | � | d | �} W n& t!�y� t"�#td �| ��Y n0 t$| |d �}!|!d u �r�t"�#td �| |f ��t%�&|�}"d d!l m'}# |#�(|| d"| |!d|"id#�\}$}%|%�r�d } | j�d$| � d#| d%fW d � S 1 �s.0 Y d S )&Ns7 warning: %s cannot merge change/delete conflict for %s )Fr Ns argsr� r� r: s $outputs .origr� r� � c S s | j rd| j| j f S | jS d S )Ns %s: %s)� label_detailr� )r� r r r! � format_label� s z _xmerge.<locals>.format_labelr� ) s HG_FILEs HG_MY_NODEs HG_OTHER_NODEs HG_BASE_NODEs HG_MY_ISLINKs HG_OTHER_ISLINKs HG_BASE_ISLINKr� r� r� )r� r� r� s outputs labellocals labelothers labelbases \$c S s t �t�| ��S r' )r rI r � localpath)�sr r r! �<lambda> r: z_xmerge.<locals>.<lambda>rX s" running merge tool %s for file %s � s launching merge tool: %s s mergetool)�cwdre Z blockedtags% launching python merge script: %s:%s r r )� extensionss hgmerge.%ss& loading python merge script failed: %ss %s does not have function: %s)�hookrN Ts merge tool returned: %d F))r8 r r� r6 r rY r r0 r� r" r� �endswith�os�splitextrp r2 �_maketempfilesrq r r7 �noder; r Z interpolater$ r� r� r� �systemrf r� r� Zloadpath� Exceptionr r� r r Z shellsplitr� Z pythonhook)&r3 r� r� r� r� r� r� r� r� r� r rs r\ r[ r� r� r� r �filesZoutpathZlocaloutputpath�extZ temppathsZbasepathZ otherpathr� r� r r} rG �rr� �modZmergefnZargslistr� �retZraisedr r r! �_xmerge� s� �� � � � ��� � � � � �r c C sB | j �� }|�� du r |�� }d|i}|�|�}|�� d | _dS )zAApplies the given template to the ctx and stores it in the input.Nr� r )r8 r7 r Zp1r� � splitlinesr� )r� �templater+ r� Ztemplateresultr r r! �_populate_label_detailL s r c C sj | j }|�dd�}|dur(t||d|�}t�|�}t�|| �}tj||tj |d�}|D ]}t ||� qVdS )z?Populates the label details using the conflict marker template.r� s mergemarkerNs mergemarkertemplater� ) r r r" r r� r r� r� r r� r )r3 Zinputsr r r r� r� r� r r r! �_populate_label_detailsW s �r c C s, | du rddd�S d| d d| d d�S )z�Return a dictionary of extra labels for use in prompts to the user Intended use is in strings of the form "(l)ocal%(l)s". Nr: )r� � os [%s]r r r )�labelsr r r! r� g s � �r� c C s� |� � r dS ddlm} t||j�rnt�d�\}}t�|d�� }|� |� � � W d � q�1 sb0 Y n(t � || |� � �}t| |�}t�||� |j|| d�S )a� Makes and returns a filectx-like object for ``fcd``'s backup file. In addition to preserving the user's pre-existing modifications to `fcd` (if any), the backup is used to undo certain premerges, confirm whether a merge changed anything, and determine what line endings the new file should have. Backups only need to be written once since their content doesn't change afterwards. Nr r� s hg-merge-backup�wb)r3 )r6 r� r� r� r� r Zmkstempr� �fdopenr� r2 r Z backuppathr0 r� r �copyfileZarbitraryfilectx)r3 r r� r� r� r� r, r� r r r! � _makebackupx s . r c # sd t jdd�� � fdd�}g }| D ] \}}}|�||||�� q z|V W t�� � n t�� � 0 dS )zyCreates a temporary file for each (prefix, path, data) tuple in `files`, so an external merge tool may use them. s hgmerge-)�prefixc sN t j�|�\}}dt j�|�| f }t j�� |�}|r>||7 }t�||� |S )Ns %s~%s)r� r0 r �basenamer� r r~ )r r0 r2 Zfullbaser Zpre�name�Ztmprootr r! �maketempfrompath� s z(_maketempfiles.<locals>.maketempfrompathN)r Zmkdtemprp �shutil�rmtree)r r Z temp_filesr r0 r2 r r r! r � s r c $ C s< | j }|�� } t�| �} | | �} |�� p6|�� p6|�� } d|�� |�� v } |�� pZ|�� }t| || | | |�\}}d}|tv r�|� d�r�|t d�d� }|�r|� d��rd}|� d�dkr�|d d� � dd �\}}|s�d }d |v s�d |v r�d }nd }|�rt �td�| ��|}|�d|| t�| �t�| �t�|�f � |tv �rft| }|j}|j}|j}d}n(|�� �rvt}nt}t}td�}d}d }||| | |f}|�s�ddg}t |�dk �r�|�d� t� ||d �}t� ||d �}t� ||d �} |t k�r|| |||| |�S ||�� k�rB|� td�| |�| |�� �| f � n|� td�| � |�d|||f � |�r�|| |||||��s�|�r�|�� �r�t � d��|� || � dS t!| ||�} d } �z\|�"dd �} |�r�t#||d �} n| } |tk�rtd}!| d k�r|}!| d k�s| d k�r*t$| ||| g|!d � t%| ||| |�} | �sb| dfW | �s`| du�r`| �&� S d|_'d|_'d| _'| d k�r�t$| ||| g|d � || |||| || �\}"} }#|"�r�t(| | |||| �} | �r�|�r�|�� �r�t � d��|� || � t)|� | |#fW | �s| du�r| �&� S n| �s6| du�r6| �&� 0 dS ) a� perform a 3-way merge in the working directory mynode = parent node before merge orig = original local filename before merge fco = other file context fca = ancestor file context fcd = local file context for current/destination file Returns whether the merge is complete, the return value of the merge, and a boolean indicating whether the file was deleted from disk.r� N� internal:s internalrC F� :r� � r T� \� /s invalid 'python:' syntax: %ss? picked tool '%s' for %s (binary %s symlink %s changedelete %s) s merging %s failed! r� r� r� r� r s merging %s and %s to %s s merging %s s my %s other %s ancestor %s s0 in-memory merge does not support merge conflictsr� ra s mergemarkerss basicrU )*r r0 r r� r= r; r6 rw rD rE rq �count�rsplitr r� r r� r rg rS � onfailurer� r� r� r � fullmergerp r Z MergeInputrT r� r� rY r r r" r r� r� r� �_check�_onfilemergefailure)$r3 Zwctxr� Zorigr� r� r� r r r� r� Zfduipathr\ r[ r] r rs r� Z invalidsyntaxZscript�funcrS r# r� Z isexternalr� r� r� r� r� r ZinternalmarkerstyleZ markerstyleZ labeltoolZ needcheckr� r r r! � filemerge� s ��� � �� � ��$� � �� �r( c C s t d�} t�| ��d S )Ns0 merge halted after failed merge (see hg resolve))r r ZInterventionRequired)r� r r r! � _haltmerge_ s r) c C sD | � dd�}|dkr2td�}| �|d�dkr2t� |dkr@t� d S )NrN s on-failurer� s, continue merge operation (yn)?$$ &Yes $$ &Nor r s halt)r r r� r) )r �actionr� r r r! r& d s r& c C s t t�d| tj��S )Ns ^([<>=+|-])\1{6}( .*)$)�bool�re�search� MULTILINEr{ r r r! �hasconflictmarkerso s ��r/ c C s� |� � }t�| �}|sBt||d�s2dt||d�v rBt|�� �rBd}d}dt||d�v rvd}|�td�||� d�rvd}|s�|s�t||d �s�d t||d�v r�|d ur�|� |�s�|�td �||� d�r�d}|d ur�t||d �r�t t | |�|� |S ) Ns checkconflictss conflictss checkr Fr� Ts0 was merge of '%s' successful (yn)?$$ &Yes $$ &Nos checkchangeds changedsJ output file %s appears unchanged was merge successful (yn)?$$ &Yes $$ &Nos fixeol) r0 r r� r$ r% r/ r2 r� r r9 r� r� ) r3 r r r r� r� r� r� �checkedr r r! r% } sP �� ���� ����� r% c C s | � |�� �S r' )Zwjoinr0 )r3 r+ r r r! r� � s r� c C s� t �|j�D ]l\}}d| }|t|< |td| < |t|< tdd� |j�� D ��}|r dd�|� }|j t � d| � |_ q t d� t d � t d � d S ) z4Load internal merge tool from specified registrarobjr r c S s g | ]\}}|r|�qS r r )rb rL rt r r r! rd � r: z%loadinternalmerge.<locals>.<listcomp>s (actual capabilities: %s)r� s %ss* (actual capabilities: binary, symlink)s! (actual capabilities: binary)s" (actual capabilities: symlink)N) r Z iteritemsZ_tablerD � internalsdocrm rO rn r� rA Zsysstrr )r ZextnameZ registrarobjr r' �fullnamerO Zcapdescr r r! �loadinternalmerge� s �r3 )N)N)VZ __future__r � contextlibr� r, r Zi18nr r r r r r r� r r r r r r r r r r r r Zutilsr r r" r$ r% rD r1 Z internalmergeZ internaltoolrT Z mergeonlyr$ r� r� �objectr& rH rJ rF rw r| r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r r r r� r �contextmanagerr r( r) r& r/ r% r� r3 �valuesZ i18nfunctionsr r r r! �<module> s� <��4 q 3 ,�� �� �� � �� �� 6q 1 /