_LhnddlZddlZddlZddlZddlmZddlmZmZddl m Z ddl m Z m Z mZmZm Z mZmZmZmZmZmZmZmZddlmZmZdZd Zd ZiZiZej@Z!e!jDZ"e!jFZ#e!jHZ$ed Z%ed Z&Gd dZ'dZ(dZ)dZ*dZ+dZ,dZ-e!de"dZ.e!de"dZ/e!de"dZ0e!de"dZ1dZ2dZ3dZ4d Z5d!Z6e!d"e$ed#e5$d%Z7e!d&e$ed#e5$d'Z8e!d(e$ed#e5$d)Z9e!d*e$ed#e5$d+Z:e!d,e$d-e5$d.Z;e!d/e$ed#e5$d0Z<e!d1e#e5$d2Z=e!d3e#e5$d4Z>e!d5e#ed6d7Z?e!d8e$d9d9:d;Z@e!dZBd?ZCd@ZDdAZEdNdBZFdCZGdDZHejdEZJdNdFZKdGZLdHZMdIZNdJZOdKZPdLZQdMZReRdde!ejZTy)ON)_)hexshort)getattr) encodingerror formattermatchpycompat registrarscmutil simplemergetagmerge templatekw templater templateutilutil)procutil stringutilc6|jd|dz|zg|SN merge-tools.)configuitoolpartargss 7usr/lib/python3.12/site-packages/mercurial/filemerge.py_toolstrr"-s# 299^TD[4%7 ?$ ??c6|jd|dz|zg|Sr) configboolrs r! _toolboolr&1s# 2==t); Cd CCr#c2|jd|dz|zSr) configlist)rrrs r! _toollistr)5s ==t); <rB _customcmprHrJrFrNrEr:r#r!r+r+WsFI ;'J  r#r+cp|tvr|St||d|}|jdr|St||S)N executablepython:) internalsr" startswithfindexternaltool)rrcmds r! _findtoolr\s= y 2t]D 1C ~~j! B %%r#cR|jdr|Stj|S)NrW)rYr shellquote)r[s r!_quotetoolpathr_s$ ~~j!   s ##r#c 6dD]_}t|||}|stj|t||d}|s7tj|t||dz}|s]|cSt||d|}tjtj |S)N)sregkeys regkeyaltsregnames regappendrV)r"r lookupregrfindexe expandpath)rrknkpexes r!rZrZs' Rr "  NN1hr4< =   Xb$ %E!EFA( 2t]D 1C   DOOC0 11r#cjdddfd dfd}jdd}|r*t|}|r |sy|r |t|fS||fStj j d } | r|r | sy| | fS|xr} jd D]\} } tj|jd | g} | |s1|| | || |s>|rP| d d sEjtdtj| tj|fzt| }| t|fcSi}t}jdD]U\}}|jdd}||vrt!t#|d||<t%|dsE|j'|W|j)}t+|j-D cgc]\} }| |vs | | fc}} }jdd}|r*||||||r||vr|s||fS|j/dd|f|j1d|D],\}}||d|||st|}|t|fcS|s|s|r+|s(t3|rjtd|zyycc}} w)Nmergesstrict-capability-checkcz|tvr&|xr"t|jj|St||Sr-)rX capabilitiesgetr&)r capabilitystrictrs r! hascapabilityz _picktool..hascapabilitys: 9 Jio::>>zJ JT:..r#cJ|tvxrt|jtk(Sr-)rX mergetypenomergers r! supportscdz_picktool..supportscds!y IYt_%>%>'%IIr#c|}|rtd||fz}t |s>|r jtd|zy jtd|zy |r(|ds jtd|zy |r(|ds jtd|zy |r |s y t j s+t |dr jtd|zy y ) Ns%s (for pattern %s)scouldn't find merge tool %s ssymlinkstool %s can't handle symlinks binarystool %s can't handle binary guistool %s requires a GUI TF)rr\warnnoterguir&) rpatsymlinkbinary changedeletetmsgro strictcheckrtrs r!checkz_picktool..checks  +,c{:DT":;dBC:;dBC]4[I GGA89D@ AM$ ;G GGA67$> ?*T"2   Ib$$? GGA12T9 :r#uis forcemerge)s:promptNsHGMERGEsmerge-patternsr#rvT)rnswarning: check merge-patterns configurations, if %r for binary file %r is unintentional (see 'hg help merge-tools' for binary files capability) rrrsprioritysdisabled)Nshgmergesno tool found to merge %s )s:mergeN)F)r%rr\r_renvironrl configitemsr rootrxrr bytestrsetsplitintr"r&addkeyssorteditemsinsertappendlen)r@rr8r}r|r~rforcetoolpathhgmerge binarycapr{rmftoolsdisabledrevtnamesrfuimergerorrts ` @@@r! _picktoolrs--*DEK/ J2 IIe] +E R'  8 4#~h788u~%"":.G  7 3#W% % &;I^^$56 T [[C# / d8dC)\JmD)DI;  ''-x/?/?/EF G!T*H.23 37" EuH~.1 GGDM!  E>8B;78E!H RK ( LLO / JJLE #(;;=I=aD4H1"d=I Eiix(G $ >e#L)) LLT7O , LL#$1 D'6< 8 Q'H~h/0 0 &LE GGA45< = - Js 6 K K c,d|vryd|vryd|vryd|vryy)zGuess the EOL type of a fileNs   r:r>s r!_eoltypers- }$ } } r#ct|j}|rRtj|}t|}|r/|j ||}||k7rtj ||yyyy)z/Convert EOL markers in a file to match origfileN)rr>rreadfilereplace writefile)filebackuptostyler>stylenewdatas r! _matcheolr&scv{{}%G}}T" ll5'2G$tW- r#promptc v|j}|jj}tj|}|jj j rtjdt|j|jg} ||| d< |jjr!|jt| zd} gd| } n`|jjr!|jt| zd} gd| } n%|jtd| zd} gd| } | dk(rt!||||||S| dk(rt#||||||S| d k(rt%||||||Sy #tj&$r$|j)d t%||||||cYSwxYw) 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 conflictssfd)localother unresolved)rrrsfile '%(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 $$ &UnresolvedrrrrN)rrGr8r getuipathfnrF isinmemoryr InMemoryMergeConflictsError partextraslabelrE promptchoice_localchangedotherdeletedmsg_otherchangedlocaldeletedmsgr_iother_ilocal_ifailResponseExpectedwrite) r@mynodelocalotherbasetoolconfrfduipathfnpromptsindexchoices r!_ipromptr2s B  B""4(H zz((*// >  %++u{{34Gb\GEN B ::   OO$@7$JANE8?F ZZ "OO$@7$JANE8?F OO: E9?F X 4tXF F x 4tXF F } $$udHE E%  ! !B dFE5$AABs&B/FF+F4F87F8rc:d|jjfS)z=Uses the local `p1()` version of files as the merged version.r)rGrEr@rrrrrs r!rrfs ejj!!# ##r#rc>|jjr)t|jjd}d|fSt|jj |jj |jj d}d|fS)z=Uses the other `p2()` version of files as the merged version.TFr)rGrE_underlyingfctxifabsentremoverr>rJ)r@rrrrrdeleteds r!rrls zz +224 g:  +11 JJOO uzz//1  g:r#sfailc|jjrUt|jj|jj |jj y)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.rF)rGrErrr>rJrs r!rr{sM zz +11 JJOO uzz//1  r#ch|jr!|j|jS|S)zSometimes 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. rD)filectxs r!rrs/   "7<<>22r#ctj|jrXtd|jj z}|j td|ztj|y)z verifies that text is non-binarys%s looks like a binary file.s warning: %s N) rr}textrrGr8rxr Abort)inputrmsgs r! _verifytextrs\&/05::??3DD "#c)*kk#'r#c|\}}}}} |s4|jjs|jjry|j} gd} t| |d| } | rd}| d k(rd }n| d k(rd }td |||fDrytj||||\}}|r| | vr4|jj||jj|s| jdyy#tj $rst | |ddj} | | vrOdj| D cgc] } d| zdz ncc} wc} }t j td|| |fzYwxYw)Nr)skeep keep-merge3keep-mergediffspremerger#, 's6%s.premerge not valid ('%s' is neither boolean nor %s)rir mergediffrmerge3c3bK|]'}tj|j)ywr-)rr}r).0rs r! z_premerge..s& 9MJ  ejjl +9Ms-/modes premerge successful r)rGrErr&r ConfigErrorr"lowerjoinranyrrrJdebug)r@rrrrrrr}r|scriptfnr validkeeppremerger_validr merged_text conflictss r! _premergers08-D(FGX%**%%'5::+>+>+@ B|jjt d|| |j fzy|j s|j r>|jjt d|| |j fzyy)Ns2warning: internal %s cannot merge symlinks for %s Fs@warning: internal %s cannot merge change/delete conflict for %s T)rrrrxrr8rE) r@rfcdfcofcarrrr}r|rrs r! _mergecheckrs08-D(FGX""4(H  D EXchhj)* +  ||~  % Xchhj)*  +  r#c@|j} t||t||t||tj||||\}}|jj ||jj d|dfS#t j$rYywxYw)aD 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' or 'union-other-first' which suppresses the markers.rTF)TTF)rrrrGrrJr r)r@rrrrrrrs r!_mergers B &E2D"E2"-!8!8 4T"  Y  ejj&6&6&89Y%% ;;! !s$BBBunionsJwarning: conflicts while merging %s! (edit, then use 'hg resolve --mark') )precheckc t||||dS)z Uses the internal non-interactive simple merge algorithm for merging files. It will use both local and other sides for conflict regions by adding local on top of other. No markers are inserted.rrr@rrrrrrs r!_iunionr $udH 55r#union-other-firstc t||||dS)z0 Like :union, but add other on top of local.rrrs r!_iunion_other_firstrs $ud,@ AAr#ric t||||dS)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.rirrs r!_imergerrr#rc t||||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. Marker will have three sections, one from each side of the merge and one for the base content.rrrs r!_imerge3r)s $udI 66r#smerge3-lie-about-conflictsr#c*t|i|\}}}|d|fSrM)r)r kwargsb1junkb2s r!_imerge3alwaysgoodr ;s'T,V,LBb ub=r#rc t||||dS)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)rrrs r! _imerge_diffrNs $udL 99r#s merge-localc t||||dS)zg Like :merge, but resolve all conflicts non-interactively in favor of the local `p1()` changes.rrrs r! _imergelocalra $udH 55r#s merge-otherc t||||dS)zg Like :merge, but resolve all conflicts non-interactively in favor of the other `p2()` changes.rrrs r! _imergeotherrirr#stagmergesjautomatic tag merging of %s failed! (use 'hg resolve --tool :merge' or another merge tool of your choice) c~tj||j|j|j\}}||dfS)z? Uses the internal tag merge algorithm (experimental). F)rmergerG) r@rrrrrrsuccessstatuss r! _itagmergerqs5nnT5::uzz499MOGV FE !!r#sdumpT)r}r|cTt||j}|jj}ddlm} t |j| j rtjdtj|dz|jj|j|dz|jj|jj|j|dz|jj|jjy)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. rcontexts0in-memory merge does not support the :dump tool.s.locals.others.base)FrF) _workingpathrGr8r isinstanceoverlayworkingfilectxr rrr decodeddatawwriter>rJ) r@rrrrrrarrs r!_idumpr$s T5::&A  B%**g;;<// ?   NN1y=%**"8"8":;KKY  15::3C3C3EFKKX tyy~~/1BC r#s forcedumpc $t|||||||S)zS Creates three versions of the files as same as :dump, but omits premerge. )r$rs r! _forcedumpr&s $udHf EEr#c,tjd)Ns5in-memory merge does not support external merge tools)r rrs r! _xmergeimmr(s  + +@ r#c |jdd} | sytj} |jt ||j | |j|t |t dd|jv|dd| |j|t dd|jv|dd | |j|t d d|jv|d d ||d } tj| } tj||} tj|| tj| } |j| j!| y)Ncommand-templatesspre-merge-tool-outputrl HG_MY_LABEL)ctxfctxnodenameislinklabelbase HG_BASE_LABEL)r-r.r0r1r2rHG_OTHER_LABEL)r-r/spathrr3rstoolpathstoolargsdefaults resources)rr mappingdictrFrr8rrJr unquotestringr templateresources maketemplaterrkeywordsr renderdefault)rr@rfclfcbrenvrr tmplr9propstresrs r!_describemergerEsZ 99)+C DD **K V V8399;.n-     7399;../    8399;./0   C" EJ  " "4 (D  & &r4 0D D:..$ AIIaooe$%r#c |j}|j}|j} |\} } } } }tj|}|js|jr>|jj t d| ||jfzyt||}t|j| d}d| j| jfd|j|jfg}d}d|vrg|}|j}|jdr"tjj|\}}|jd ||jft!|5}|dd \}}t#|d k(r|d }d }|jt%|t%|j'j)t%| j'j)d |j+vd |j+vd | j+v||||||d }|j}||||||||||d}t-j.d||d}t1|| dr=|jj3t d| ||jfz|Y| dz|z}|jj5d|zt7||||| ||| | |j9||j:|d}n|jj5d| |fzd} ddlm}|jA| d| z} tI| |d}!|!#tEjFt d| |fztKjL|}"ddlm'}#|#jQ||d | |!d|"id!\}$}%|%rd}|jj5d"|zd!|d#fcdddS#tB$r"tEjFt d| zwxYw#1swYyxYw)$Ns7warning: %s cannot merge change/delete conflict for %s )FrNsargsr3rr#s$outputs.origrrch|jrd|j|jfzS|jS)Ns%s: %s) label_detailr)rs r! format_labelz_xmerge..format_label s/!! EKK1C1C#DDD{{"r#r+) sHG_FILEs HG_MY_NODEs HG_OTHER_NODEs HG_BASE_NODEs HG_MY_ISLINKsHG_OTHER_ISLINKsHG_BASE_ISLINKr,r5r4)rr3rsoutputs labellocals labelothers labelbase\$cRtjtj|Sr-rr^r localpathss r!z_xmerge...sh))$..*;_maketempfilesrrrFnoderJr interpolater&rrrEsystemrrrUloadpath Exceptionr rrr shellsplitrV pythonhook)&r@rrrrrrrrrrrr}r|rrrNr filesoutpathlocaloutputpathext temppathsbasepath otherpathrJrArrr[rrUmodmergefnargslistrVretraiseds& r!_xmergeros **C **C ))C08-D(FGX""4(H ||~  I JXchhj)* + T3'I DGGT7 +D #((*coo/0 388:s01 EGT ++-  # #H -#%77#3#3O#D OS h?@  )'m) y>Q !! I #  =#CMMO$8$8$:;"3==?#7#7#9:!SYY[0 $ 3#syy{2(/+E2*40  WW '.'.&t,     <   Rv & GGNN89#((*-./   T/D(C GGMM7#= > 2tVS#sC4 P CLA GGMM9Xxr firstlinerI)rtemplater1rCtemplateresults r!_populate_label_detailru\sW **   C xxzffh SME++E2N#--n=Er#c*|j}|jdd}|t||d|}tj|}t j ||}t j||tj|}|D]}t||y)z?Populates the label details using the conflict marker template.r*s mergemarkerNsmergemarkertemplater6) rrr"rr:r r;r<rr=ru)r@inputsrrrsrDrBrs r!_populate_label_detailsrxgs Byy-~>H B&r backuppathr8rrcopyfilearbitraryfilectx)r@rrrrrr2r#s r! _makebackuprs ||~#w445%%&89 F YYr4 A GGCHHJ ! ##Bchhj9 s # a  # #F # 66! s  CC(c#Ktjdfd}g}|D]\}}}|j||||! |tjy#tjwxYww)zyCreates a temporary file for each (prefix, path, data) tuple in `files`, so an external merge tool may use them. shgmerge-)prefixctjj|\}}dtjj||fz}tjj |}|r||z }t j |||S)Ns%s~%s)rXr8rYbasenamerrr)rr8r>fullbasereprenametmproots r!maketempfrompathz(_maketempfiles..maketempfrompathsl((. #"''**84f==ww||GS)  CKD tT" r#N)r mkdtemprshutilrmtree)rbr temp_filesrr8r>rs @r!rZrZsq k2GJ#d*64>?$ g gsAA:A A: A77A:c  |j}|j} tj|} | | } |j xs"|j xs|j } d|j |j zv} |j xs|j }t||| | | |\}}d}|tvr|jdr|tdd}|ru|jdrdd}|jddk\r'|d djdd \}}|sd }d |vsd |vrd }nd }|r!tjtd|z}|j!d|| t#j$| t#j$| t#j$|fz|tvr0t|}|j&}|j(}|j*}d}n2|j-rt.}nt0}t2}td}d}d }||| | |f}|sddg}t|dkr|j5dt7j8||d}t7j8||d }t7j8||d}|t:k(r |||||||S||jk7r;|j=td| || |j| fzn|j=td| z|j!d|||fz|rI|||||||s<|r9|j-rtj>d|jA|| zytC|||}d } |jEdd}|rtG||d} n|} |t2k(rrtI||||d}!| dk7r|}!|dk7s| dk7rtK||||g|!tM|||||}|s|df|s||jOSSSd|_(d|_(d|_(| dk7rtK||||g|||||||||\}"}}#|"rtS||||||}|rF|r9|j-rtj>d|jA|| ztU|||#f|s||jOSSS#|s||jOwwwxYw)aperform 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:sinternalrWF:rrT\/sinvalid 'python:' syntax: %ss?picked tool '%s' for %s (binary %s symlink %s changedelete %s) smerging %s failed! rrrGr3rsmerging %s and %s to %s s merging %s smy %s other %s ancestor %s s0in-memory merge does not support merge conflictsrrs mergemarkerssbasicrs)+rr8rrrNrJrErrXrYrcountrsplitr rrrr rrq onfailurerrr(ro fullmergerr MergeInputrrrrrxrrr"_run_partial_resolution_toolsrxrrrI_check_onfilemergefailure)$r@wctxrorigrrrr{rrrfduipathr}r|r~rrr invalidsyntaxscriptfuncrqrr isexternalrrrrrriinternalmarkerstyle markerstyle labeltool needcheckrs$ r! filemergers B B""4(H|H \\^ ?s||~ ?FciikCIIK//G<<>3S\\^LtRVWlKND(H yT__\:C $&'H'' 3 >>$ 1 $'|224; FH $  DH$4 $  M ++a ?@8KL LHHK     V $   W %   \ *     yNN NN == ?? DD -.  Xvw8H H% 6{Q g  " "3q 2E  " "3q 2E  ! !#vay 1DG          sxxz * +~x 3X> ? !O$x/0HH ,S# >?vsChG  77G GGI( ) r3 'F AF ii? "2t_=K-K  ! )$ud C Ih&! "h.+2I'5%.Y A%xHV' MMO(qC"&E !%E  $D  ( " #D5%*>T J $       !  1g tQD#v6A ??$;;+  H,-  #'zV' MMO(qqV' MMO(qs A3SBSSc|j}|jddryg}t}d}|j|D]\}} |j dd} | |vr |j |d| zg} d} | r[t j |jd | |jj } | |jj} | s|j|d | zr|j|d | zd}|j|d | z| }|j|d| z}|j|| ||f|sy|jd|jj|jfd|jj|jfd|jj|jfg}t!|5}|\}}}|D]\}} }}t#j$|}|||d}t'j(d||d}d||fz}|j+||jd}|rt-j.d| |fzt'j0|}t'j0|}||k(sn|j3|j3t'j0||j3dddy#1swYyxYw)zCRuns partial-resolution tools on the three inputs and updates them.risdisable-partial-toolsNspartial-merge-toolsrrs %s.patternsTr#)r1s %s.disables%s.orders %s.executables%s.argsrr3r)rr3rrKcRtjtj|Sr-rMrOs r!rQz/_run_partial_resolution_tools..s(--dnnQ.?@r#s%s %sspartial-mergetool)rSrTs)partial merge tool %s exited with code %d)rr%rrrr(r rrGrFr8 configintrrsortrrZrr^rr\r]r StateErrorrset_text)r@rrrrrseensectionrerrpatternsis_matchmorder executabler rbrfrNrgrhr[rri local_text other_texts r!rrps B }}X78 E 5D$Gw'1wwt}Q 4< ==.4*?D   3ejj.B.B.DA*+H }}Wmd&:;LL+*=+|-])\1{6}( .*)$)boolresearch MULTILINErs r!hasconflictmarkersrs*  &  LL  r#c0|j}tj|}|s7t||dsdt ||dvrt |j rd}d}dt ||dvr(d}|jtd||zdrd}|sW|sUt||d sd t ||dvr9|7|j|s&|jtd ||zdrd}|#t||d rtt||||S) Nscheckconflictss conflictsscheckrFrTs0was merge of '%s' successful (yn)?$$ &Yes $$ &Nos checkchangedschangedsJ output file %s appears unchanged was merge successful (yn)?$$ &Yes $$ &Nosfixeol) r8rrr&r)rr>rrrHrr) r@rirrrrrrcheckeds r!rrs( B""4(H "d-. 9Rx8 8 chhj )AGIb$11 ?? A Brl   A  b$ 0Yr4::  cggfo& 2,   iD)<,tS)62 Hr#c@|j|jSr-)wjoinr8)r@r1s r!rrs ::chhj !!r#c |jjD]\}}d|z}|t|<|td|z<|t|<t |j jDcgc] \}}|s | c}}}|seddj |z} |jtjd| zz|_tdtdtdy cc}}w) z4Load internal merge tool from specified registrarobjrrs (actual capabilities: %s)rs %ss* (actual capabilities: binary, symlink)s! (actual capabilities: binary)s" (actual capabilities: symlink)N) _tablerrX internalsdocrrkrrSr sysstrr) rextname registrarobjrrfullnamererrkcapdescs r!loadinternalmerger s"))//1 d$;" ()- ,%&!% XT->->-D-D-FL-FTQ!q-FLM 6:G <<(//)g:M*NNDL2"34*++,#Ms & C" 1C" r-)U contextlibrXrri18nrr[rrr rrrr r r r rrrrrrrutilsrrr"r&r)rXr internalmerge internaltoolrr mergeonlyrrrr+r\r_rZrrrrrrrrrrrrrrrrr rrrrr$r&r(rErorurxrrcontextmanagerrZrrrrrrrrvalues i18nfunctionsr:r#r!rs   @D=   &y&&(      " "  " " !-  !. 11h&$ 2nb  .i!0B"0Bfh $!$ h  ! gw   ) X*&2   266  2BB    266   277!        2::ni+>6?6ni+>6?6  """gyt<=8lIdDAFBF 3&lnb> , "7< 0nbF#R*  , ^"-:$l+  " r#