|
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�� � @ 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� �ZLdwdidj�ZMdkdl� ZNdmdn� ZOdodp� ZPdqdr� ZQdsdt� ZRdudv� ZSeSdde#� e �T� ZUdS )x� )�absolute_importN� )�_)�hex�short)�getattr)
�encoding�error� formatter�match�pycompat� registrar�scmutil� simplemerge�tagmerge�
templatekw� templater� templateutil�util)�procutil�
stringutilc G � | j d|d | g|�R � S �N� merge-tools� .)�config��ui�tool�part�args� r! �5/usr/lib/python3/dist-packages/mercurial/filemerge.py�_toolstr. � r# c G r r )�
configboolr r! r! r" � _toolbool2 r$ r& c C s | � d|d | �S r )�
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 � | j S r* )r, r1 r! r! r" �pathf � zabsentfilectx.pathc C � d S r* r! r1 r! r! r" �sizei � zabsentfilectx.sizec C r6 r* r! r1 r! r! r" �datal r8 zabsentfilectx.datac C s | j �� jS r* )r+ �repo�nullidr1 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� changectxr4 )r- �fctxr! r! r" �cmpt s
��zabsentfilectx.cmpc C � dS )N� r! r1 r! r! r" �flags r8 zabsentfilectx.flagsc C r3 r* )r+ r1 r! r! r" r? � r5 zabsentfilectx.changectxc C rB �NFr! r1 r! r! r" �isbinary� r8 zabsentfilectx.isbinaryc C rB )NTr! r1 r! r! r" r> � r8 zabsentfilectx.isabsentN)�__name__�
__module__� __qualname__�__doc__r0 r2 r4 r7 r9 r< �
_customcmprA rD r? rF r> 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
rR c C s | � d�r| S t�| �S )NrM )rO r �
shellquote)rQ r! r! r" �_quotetoolpath� s
rT c C sv dD ])}t | ||�}|s
qt�|t | |d��}|r+t�|t | |dd� �}|r+| S qt | |d|�}t�t�|��S )N)s regkeys regkeyalts regnames regappendrC rL )r# r � lookupregr �findexe�
expandpath)r r �kn�k�p�exer! r! r" rP � s �rP c sx �� dd��d �fdd� �dd� �����fdd �}��d
d �}|r;t�|�}|r/�|�s/d S |r7|t|�fS ||fS tj�d
�} | rO|rK�| �sKd S | | fS |oR�}
��d�D ]@\} } t�| j d| g�}
|
|�r�|| | ||
|�r�|r��| ddd�s���
t d�t �
| �t �
|�f � t�| �}| t|�f S qXi }t� � ��d�D ]$\}}|�d�d }||vr�tt�|d��||< t�|d�rLj �|� q�|�� }t� fdd�|�� D ��}��d
d�}|r�||||||�r�||vr�|s�||fS |�dd |f� |�d� |D ]\}}||d |||��r t�|�}|t|�f S �q|�s'|�s'|�r:|�s8t|��r8��
t d �| � d S d S ) N� merges strict-capability-checkFc s( | t v r|o
t | j�|�S t� | |�S r* )rN � capabilities�getr& )r �
capability�strict)r r! r" �
hascapability� s z _picktool.<locals>.hascapabilityc S s | t v o
t | jtkS r* )rN � mergetype�nomerge�r r! r! r" �
supportscd� s z _picktool.<locals>.supportscdc s� | }|r t d�| |f }t�| �s)|r ��t d�| � d
S ��t d�| � d
S |r<� | d��s<��t d�| � d
S |rO� | d��sO��t d�| � d
S |rX�| �sX d
S t�� smt�| d�rm��t d�| � d
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 rR �warn�noter �guir& )r �pat�symlink�binary� changedelete�tmsg)ra � strictcheckre r r! r" �check� s,
�
� � ���z_picktool.<locals>.check� uis
forcemerge)s :promptNs HGMERGEs merge-patternsrC rf T)r` 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 rZ )�disabledr! r" �
<listcomp> s " z _picktool.<locals>.<listcomp>)Ns hgmerges no tool found to merge %s
)s :mergeN)F)r% r rR rT r �environr^ � configitemsr �rootrh r r �bytestr�set�split�intr# r& �add�keys�sorted�items�insert�append�len)r: r r4 rm rl rn rq �force�toolpath�hgmerge� binarycaprk r �mf�toolsrY �v�t�names�uimergerZ r! )rt ra rp re r r" � _picktool� s|
���
�
��
�r� c C s4 d| v rdS d| v r dS d| v rdS d| v rdS dS )z Guess the EOL type of a file� Ns
�
�
r! �r9 r! r! r" �_eoltype s r� c C sV t |�� �}|r%t�| �}t |�}|r'|�||�}||kr)t�| |� dS dS dS dS )z/Convert EOL markers in a file to match origfileN)r� r9 r �readfile�replace� writefile)�file�backup�tostyler9 �style�newdatar! r! r" � _matcheol' s
�r� � promptc
C sJ | j }|j�� }t�| �}|j�� �� rt�d��t |j
|j
g�} ||�| d< ze|j� � r<|� t
| d�}
g d�|
} n$|j� � rP|� t| d�}
g d�|
} n|� td�| d�}
g d�|
} | dkrnt| |||||�W S | dkr|t| |||||�W S | d kr�t| |||||�W S W d S tjy� |�d
� t| |||||� Y S w ) 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� r� N)r r@ r4 r � getuipathfnr? �
isinmemoryr �InMemoryMergeConflictsError�
partextras�labelr> � promptchoice� _localchangedotherdeletedmsg� _otherchangedlocaldeletedmsgr �_iother�_ilocal�_ifail�ResponseExpected�write) r: �mynode�local�other�base�toolconfr �fd�uipathfn�prompts�index�choicer! r! r" �_iprompt3 sH
�
��� �
�r� r� c C s d|j �� fS )z=Uses the local `p1()` version of files as the merged version.r )r@ r> �r: r� r� r� r� r� r! r! r" r� g s r� r� c C sN |j �� rt|j ��� d}d|fS t|j ��|j �� |j �� � d}d|fS )z=Uses the other `p2()` version of files as the merged version.TFr )r@ r> �_underlyingfctxifabsent�remover� r9 rD )r: r� r� r� r� r� �deletedr! r! r" r� m s
��r� s failc C s, |j �� rt|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)r@ r> r� r� r9 rD r� r! r! r" r� | s
�r� c C s | � � r | �� | �� S | S )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.
r= )�filectxr! 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 rm �textr r@ r4 rh r �Abort)�inputr �msgr! r! r" � _verifytext� s
�r� c C s2 |\}}}}} |s|j �� s|j �� rdS | j}
g d�} z
t|
|d| �} W n- tjyS t|
|dd��� } | | vrQd�dd� | D ��}
t�t d�|| |
f ��Y nw | r�d }| d
kr_d }n| d kred
}t
dd� |||fD ��rsdS t j ||||d�\}}|r�| | v r�|j � ||j �
� � |s�|
�d� dS dS )Nr )s keep� keep-merge3� keep-mergediffs premergerC � , c S s g | ]}d | d �qS )� 'r! )rs r� r! r! r" ru � � z _premerge.<locals>.<listcomp>s6 %s.premerge not valid ('%s' is neither boolean nor %s)r\ r� � mergediffr� � merge3c s s � | ]
}t �|�� �V qd S r* )r rm r� )rs r� r! r! r" � <genexpr>� s �
�z _premerge.<locals>.<genexpr>��modes premerge successful
r )r@ r> r r& r � ConfigErrorr# �lower�joinr �anyr r� rD �debug)r: r� r� r� r� r r� rm rl �scriptfnr � validkeep�premerge�_validr� � merged_text� conflictsr! r! r" � _premerge� sJ ���� �
�
r� c C sx |\}}}} }
t �| �} | r | j�td�|| |�� �f � dS |�� s(|�� r:| 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 rh r r4 r> ) r: r� �fcd�fco�fcar� r r� rm rl r� r� r! r! r" � _mergecheck� s&
�����r� c C st | j }zt||� t||� t||� W n tjy Y dS w tj||||d�\}}|j�||j�� � d|dfS )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� TF)r r� r r� r r@ r� rD )r: 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 � 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� �r: r� r� r� r� r� r� r! r! r" �_iunion� s r� r\ c C r� )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.r\ r� r� r! r! r" �_imerge � r� r� c C r� )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 r� r� s merge3-lie-about-conflictsrC c O s t | i |��\}}}|d|fS rE )r� )r �kwargs�b1�junk�b2r! r! r" �_imerge3alwaysgood+ s
r� r� c C r� )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 r� )zg
Like :merge, but resolve all conflicts non-interactively in favor
of the local `p1()` changes.r� r� r� r! r! r" � _imergelocalQ � r� s merge-otherc C r� )zg
Like :merge, but resolve all conflicts non-interactively in favor
of the other `p2()` changes.r� r� r� r! r! r" � _imergeotherY r� 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 �merger@ ) r: r� r� r� r� r� r� �success�statusr! r! r" �
_itagmergea s
r� s dumpT)rm rl 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)� _workingpathr@ r4 � r� �
isinstance�overlayworkingfilectxr r� r r� � decodeddata�wwriter9 rD )
r: 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��)Ns5 in-memory merge does not support external merge tools)r r� r� r! r! r" �
_xmergeimm� s �r c C s� | � dd�} | s
d 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��defaults� resources)r r � mappingdictr? r r4 r rD r �
unquotestringr
�templateresources�
maketemplaterr �keywordsr� �
renderdefault)r r: r� �fcl�fcbr� �envr� r �tmplr �props�tresr� r! r! r" �_describemerge� sR
��
��
�� �
%
�r c & C s4 |j }|j }|j } |\}
} } }
}t�| �}|�� s |�� r/| j�td�|
||�� �f � dS t| |�}t | j|
d�}d| �� | �
� fd|�� |�
� fg}d}d|v rp|}|�� }|� d�rft j�
|�\}}|�d ||�� f� t|���}|d d
� \}}t|�d kr�|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 �r| d | } | j�d| � t|| ||| ||| |� |j | | j |dd�} nc| j�d| |f � d} zd d l m } | � | d |
�} W n t!�yE t"�#td �| ��w 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�w Y d S )&Ns7 warning: %s cannot merge change/delete conflict for %s
)Fr Ns argsr r� rC s $outputs .origr� r� � c S s | j r d| j| j f S | jS )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 rS r � localpath)�sr! r! r" �<lambda> s z_xmerge.<locals>.<lambda>rg s" running merge tool %s for file %s
� s launching merge tool: %s
s mergetool)�cwdrv �
blockedtags% launching python merge script: %s:%s
r r )�
extensionss
hgmerge.%ss& loading python merge script failed: %ss %s does not have function: %s)�hookr\ Ts merge tool returned: %d
F))r@ r r� r> r rh r r4 r� r# r� �endswith�os�splitextr� r9 �_maketempfilesr� r r? �noderD r � interpolater& r� r� r �systemrx r� r' �loadpath� Exceptionr r� r r �
shellsplitr( �
pythonhook)&r: r� r� r� r� r� r� r� r� r� r r� rm rl r� r� r! r �files�outpath�localoutputpath�ext� temppaths�basepath� otherpathr r r r� rQ �rr' �mod�mergefn�argslistr( �ret�raisedr! r! r" �_xmerge� s�
��
�
� � � ��
�
�
��
�
�&�rA 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 )r@ r? r- �p1r �
splitlinesr )r� �templater. r �templateresultr! r! r" �_populate_label_detailL s
rF c C sj | j }|�dd�}|durt||d|�}t�|�}t�|| �}tj||tj |d�}|D ]}t
||� q+dS )z?Populates the label details using the conflict marker template.r s mergemarkerNs mergemarkertemplater ) r r r# r r r
r r r r rF )r: �inputsr r rD r r r� r! r! r" �_populate_label_detailsW s
� �rH c C s, | du r ddd�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".
NrC )r � os [%s]r r r! )�labelsr! r! r" r� g s �
�r� c C s� |� � rdS ddlm} t||j�r7t�d�\}}t�|d��}|� |�
� � W d � n1 s1w Y nt � || |�
� �}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)r: )r> r� r� r� r� r �mkstempr* �fdopenr� r9 r �
backuppathr4 r� r �copyfile�arbitraryfilectx)r: r r� r� r� r� r/ r� r! r! r" � _makebackupx s ��
rQ c # sd � t jdd�� � fdd�}g }| D ]\}}}|�||||�� qz |V W t�� � dS t�� � w )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* r4 r+ �basenamer� r r� )rR r4 r9 �fullbaser7 �pre�name��tmprootr! r" �maketempfrompath� s z(_maketempfiles.<locals>.maketempfrompathN)r �mkdtempr� �shutil�rmtree)r4 rY �
temp_filesrR r4 r9 r! rW r" r, � s � r, c $
C s0 | j }|�� } t�| �}
|
| �} |�� p|�� p|�� } d|�� |�� v }
|�� p-|�� }t| || | |
|�\}}d}|tv rL|� d�rL|t
d�d� }|r�|� d�r�d}|� d�dkrw|d d� � dd
�\}}|sld }d |v std
|v rvd }nd }|r�t
�td�| ��|}|�d|| t�| �t�|
�t�|�f � |tv r�t| }|j}|j}|j}d}n|�� r�t}nt}t}td�}d}d }||| |
|f}|s�ddg}t
|�dk r�|�d� t� ||d �}t� ||d
�}t� ||d �} |t kr�|| |||| |�S ||�� k�r|� td�|
|�|
|�� �| f � n |� td�| � |�d|||f � |�rO|| |||||��sO|�rM|�� �rFt
� d��|� || � dS t!| ||�} d
} z�|�"dd �} |�rht#||d �} n| } |tk�r�d}!| d k�rx|}!| d k�s�| d k�r�t$| ||| g|!d � t%| ||| |�} | �s�| dfW | �s�| du�r�| �&� S S S d|_'d|_'d| _'| d k�r�t$| ||| g|d � || |||| || �\}"} }#|"�r�t(| | |||| �} | �r�|�r�|�� �r�t
� d��|� || � t)|� | |#fW | �s| du�r| �&� S S S | �s| du�r| �&� w w w ) 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 internalrM 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� rr s mergemarkerss basicrd )*r r4 r r� rF rD r> r� rN rO r� �count�rsplitr r� r r� r ry rb � onfailurer� r� r rA � fullmerger� r �
MergeInputrc r� r� rh rQ r r# rH r� r� r �_check�_onfilemergefailure)$r: �wctxr� �origr� r� r� rJ r r� r� �fduipathrm rl rn r r� r� �
invalidsyntax�script�funcrb re r� �
isexternalr� r� r� r� r� r; �internalmarkerstyle� markerstyle� labeltool� needcheckr� r! r! r" � filemerge� s
����
� ��
�
��$
��
�
�
�
�ru c C s t d�} t�| ��)Ns0 merge halted after failed merge (see hg resolve))r r �InterventionRequired)r� r! r! r" �
_haltmerge_ s
rw c C sH | � dd�}|dkrtd�}| �|d�dkrt� |dkr"t� d S d S )Nr\ s
on-failurer� s, continue merge operation (yn)?$$ &Yes $$ &Nor r s halt)r r r� rw )r �actionr� r! r! r" ri d s
�ri 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�| �}|s!t||d�sdt||d�v r!t|�� �r!d}d}dt||d�v r;d}|�td�||� d�r;d}|sd|sdt||d �sMd
t||d�v rd|d urd|� |�sd|�td �||� d�rdd}|d urvt||d �rvt
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) r4 r r� r& r( r} r9 r� r rA r� r� ) r: r; r r r� r� r� r� �checkedr! r! r" rh } sL
� ����
���� rh c C s | � |�� �S r* )�wjoinr4 )r: r. r! r! r" r� � s r� c C s� t �|j�D ]6\}}d| }|t|< |td| < |t|< tdd� |j�� D ��}|r<dd�|� }|j t �
d| � |_ qt d� t d � t d
� d S ) z4Load internal merge tool from specified registrarobjr_ r^ c S s g | ]\}}|r|�qS r! r! )rs rY r� r! r! r" ru � 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 � iteritems�_tablerN � internalsdocr r] r� r� rJ �sysstrr )r �extname� registrarobjrV ro �fullnamer] �capdescr! r! r" �loadinternalmerge� s �� r� r* )V�
__future__r �
contextlibr* rz r[ �i18nr r- r r r r r� r r r
r r
r r r r r r r �utilsr r r# r& r( rN r� �
internalmerge� internaltoolrc � mergeonlyrf r� r� �objectr) rR rT rP r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r r r rA rF rH r� rQ �contextmanagerr, ru rw ri r} rh r� r� �values�
i18nfunctionsr! r! r! r" �<module> s� <��4 q
3
,��
��
��
�
��
��
6q
1 /