�
�c@s�dd
kl
Z

ddklZ
ddkZddkZddkZddkZddkZddk	Z	ddk
Z
dd�Zed�Z
gZdi�D]Zedeq�[Zd	�Zd
�Zd�Zd�Zd
�ZdS(i�(
tshort(
t
_NtcCs|id
|
d||�S(Nsmerge-toolst
.(
tconfig(tuittooltparttdefault((s&/sys/lib/python/mercurial/filemerge.pyt_toolstr
s
cCs|id
|
d||�S(Nsmerge-toolsR(
t
configbool(RRRR((s&/sys/lib/python/mercurial/filemerge.pyt	_toolbools
s"fail local other merge prompt dumps	internal:cCs�|
tjo
|
Sn

t
||
d
�}|o[
ti|t
||
d��}|o2
ti|t
||
d��}|o
|Sq�
q�
n

tit
||
d|
��S(Ntregkeytregnamet	regappendt
executable(t	_internalR	tutilt
lookup_regtfind_exe(RRt
kt
p((s&/sys/lib/python/mercurial/filemerge.pyt	_findtools










c
s5�f
d
�}ti
id�}|o
||fSn

x��id�D]o\}}ti|id|g
�}	|	|�o;
||||t�o%
t�|�}
|d|
dfSqF
qFWh}x`�id�D]O\}}
|id�d}||jo#
t	t
�|d	d
��||<q�
q�W|i�}tg}|i
�D]\}}|||fqB
~�}�idd�}|o5
||jo
||fSn

|idd|f�
n

|id�
xO|D]G\}}||d||�o%
t�|�}
|d|
dfSq�
q�W|p
|o
dp
ddfS(Ncs
|}|
o
|d
|
7}n

t�|�p=
|
o
�i
td�|�
q

�itd�|�
n�
|o/
t�|d�o
�i
td�|�
nw
|o/
t�|d�o
�i
td�|�
nA
ti�o.
t�|d�o
�i
td�|�
n
tStS(	Ns specified for scouldn't find merge tool %s
tsymlinkstool %s can't handle symlinks
tbinarystool %s can't handle binary
tguistool %s requires a GUI
(	RtwarnR
tnoteRRRtTruetFalse(RtpatRRttmsg(
R(s&/sys/lib/python/mercurial/filemerge.pytcheck#s










!

tHGMERGEsmerge-patternsRt
"smerge-toolsRitpriorityt
0Rtmergethgmergesinternal:merge(Nshgmerge(tostenvirontgettconfigitemstmatchtrootRRtsplittintR	tkeystsortedtitemsRtinserttNonetappend(trepoRtpathRRR R&RRtmfttoolpathttoolsRt
vt
ttnamest_[1]Rtuimerge((
Rs&/sys/lib/python/mercurial/filemerge.pyt	_picktool"s<




#






'

:











c

CsXd
|jo
dSn

d|jo
dSn

d|jo
dSn

d|jo
dSn

dS(sGuess the EOL type of a filet
s
s

s

N(
R3(
tdata((s&/sys/lib/python/mercurial/filemerge.pyt_eoltypeWs











cCs�tt
|
d
�i��}|oi
t
|d
�i�}t|�}|o=
|i||�}||jo
t
|d�i|�
q�
q�
n

dS(s/Convert EOL markers in a file to match origfiletrbtwbN(RBtopentreadtreplacetwrite(tfiletorigfilettostyleRAtstyletnewdata((s&/sys/lib/python/mercurial/filemerge.pyt	_matcheolcs







cs��f
d
�}d�}|i|i
��p
d6Sn

�i}|i�}	||�p
||�p

||�}
d|i�|i�j}t�||	|
|�\}}
|itd�||	|
|f�
|p

|djoF
d}|i	td�|	td�td	�fd
�o

d}q)

n

|djo
d
Sn

|djo'
�i
|	|i
�|i��
d
Sn

|djo
d
Sn

�i|	�}|d|�}|d|�}d}|d}ti
||�
||i�jo*
|itd�||i�|	f�
n
|itd�|	�
|itd�|||f�
t||d|
p
|�o{
ti||||dt�
}|pB
|itd��
ti|�
ti|�
ti|�
d
Sn

ti
||�
n

td|	dt|
�dt|i��dd|i�jdd|i�jdd|i�j�}|djo(
ti||||dd dg�
}n

|d!joq
�i|	�}ti
||d"�
�i
|	d#|i
�|i��
�i
|	d$|i
�|i��
d
Sn�
t||d%d&�}d'|jo
||}}n

td |d|d|d(|��tid)�f
d*�|�}ti|
d+|d,�id-|�}|o:
t||d.�o'
tid/|i
��o

d
}q�
n

|os
t||d0�o`
ti�i|	�|�o@
|i	td1�|	td2�td3�fd
�o

d
}qH
qL
n

t||d4�o
t�i|	�|�
n

|o
|i td5�|	�
n
ti|�
ti|�
ti|�
|S(7s

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
    cs�d
ti
i|
i
��|f}tid|�
\}}�i|
i
�|
i��}ti|d�}|i|�
|i	�
|S(Ns%s~%s.tprefixRD(
R'R6tbasenamettempfiletmkstempt
wwritedataRAtfdopenRHtclose(ROtctxtpretfdtnameRAt
f(
R5(s&/sys/lib/python/mercurial/filemerge.pyttempxs
"







c

Ss5yti
|i��SWntj
o



tSn
XdS(
N(RRRAtIOErrorR(
RV((s&/sys/lib/python/mercurial/filemerge.pytisbin�s



t
ls/picked tool '%s' for %s (binary %s symlink %s)
sinternal:promptsinternal:locals8 no tool found to merge %s
keep (l)ocal or take (o)ther?s&Locals&Otherisinternal:others
internal:faili
tbasetotherRs.origsmerging %s and %s to %s
smerging %s
smy %s other %s ancestor %s
tpremergetquiets premerge successful
tHG_FILEt
HG_MY_NODEt
HG_OTHER_NODEtHG_MY_ISLINKtHG_OTHER_ISLINKtHG_BASE_ISLINKsinternal:mergetlabeltlocals
internal:dumps.locals.others.basetargss$local $base $others$outputtoutputs\$(local|base|other|output)c

sd�|i�d
S(s"%s"i
(
tgroup(
t
x(
RG(s&/sys/lib/python/mercurial/filemerge.pyt<lambda>�st
 tcwdR(tcheckconflictss!^(<<<<<<< .*|=======|>>>>>>> .*)$tcheckchangeds< output file %s appears unchanged
was merge successful (yn)?s&Yess&Notfixeolsmerging %s failed!
N(!tcmpRAR3RR6tflagsR?tdebugR
tpromptchoicetwwritetwjoinRtcopyfiletstatusRtsimplemergeRR'tunlinktdictRtstrt	changectxR	tretsubtsystemR,R+tfilecmpRNR(R5tmynodetorigtfcdtfcotfcaR[R]RRXRRRR8t
at
bt
ctouttbackt
rtenvRk((RGR5s&/sys/lib/python/mercurial/filemerge.pyt	filemergens�
		
	

&

























* 

















(




#
#




!
	

&













(tnodeRti18nR
RR}R+R'RQR�R�R	RRR=R-t
sRRR?RBRNR�(((s&/sys/lib/python/mercurial/filemerge.pys<module>s

$
0
$		5