6hVTSSKJr SSKrSSKrSSKrSSKrSSKJr SSKJ r J r SSK J r J r JrJrJrJrJrJrJrJrJrJrJr SSKJrJr SrS rS r0r0r \RB"5r"\"RFr#\"RHr$\"RJr%\"S 5r&\"S 5r'"S S5r(Sr)Sr*Sr+Sr,Sr-Sr.\""S\#5S5r/\""S\#5S5r0\""S\#5S5r1\""S\#5S5r2Sr3Sr4Sr5S r6S!r7\""S"\%\"S#5\6S$9S%5r8\""S&\%\"S#5\6S$9S'5r9\""S(\%\"S#5\6S$9S)5r:\""S*\%\"S#5\6S$9S+5r;\""S,\%S-\6S$9S.5r<\""S/\%\"S#5\6S$9S05r=\""S1\$\6S$9S25r>\""S3\$\6S$9S45r?\""S5\$\"S655S75r@\""S8\%S9S9S:9S;5rA\""S<\$S9S9S:9S=5rBS>rCS?rDS@rESArFSNSBjrGSCrHSDrI\RSE5rKSNSFjrLSGrMSHrNSIrOSJrPSKrQSLrRSMrS\S"SS\"5 \R5rUg)O) annotationsN)_)hexshort) encodingerror formattermatchpycompat registrarscmutil simplemergetagmerge templatekw templater templateutilutil)procutil stringutilc6UR"SUS-U-/UQ76$N merge-tools.)configuitoolpartargss 5/usr/lib/python3/dist-packages/mercurial/filemerge.py_toolstrr"+s! 99^TD[4%7 ?$ ??c6UR"SUS-U-/UQ76$r) configboolrs r! _toolboolr&/s! ==t); Cd CCr#c2URSUS-U-5$r) configlist)rrrs r! _toollistr)3s ==t); <U[;a+U=(a" [URRU5$[TX5$r.)rg capabilitiesgetr&)r capabilitystrictrs r! hascapability _picktool..hascapabilitys8 9 Jio::>>zJ JT..r#cVU[;=(a [UR[:H$r.)rg mergetypenomergers r! supportscd_picktool..supportscds!y IYt_%>%>'%IIr#cp>UnU(a[S5X4-n[T U5(dDU(aT R[S5U-5 g T R[S5U-5 g U(a-T"UST5(dT R[S5U-5 g U(a-T"UST5(dT R[S5U-5 g U(aT"U5(dg [R "5(d0[ T US5(aT R[S5U-5 g g ) 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)rrkwarnnoterguir&) rpatsymlinkbinary changedeletetmsgr~ strictcheckrrs r!check_picktool..checks +,{:DT"":;dBC:;dBC]4[II GGA89D@ AM$ ;GG GGA67$> ?*T"2"2   Ib$$?$? GGA12T9 :r#uis forcemerge)s:promptNsHGMERGEsmerge-patternsr#rT)r}swarning: 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%rrkrnrenvironr{ configitemsr rootrrr bytestrsetsplitintr"r&addkeyssorteditemsinsertappendlen)rGrr<rrrrforcetoolpathhgmerge binarycaprrmftoolsdisabledrtvtnamesruuimerger~rrs ` @@@r! _picktoolrs--*DEK/ J2 IIe] +E R'  8 4 4#~h788~%"":.G  7 3 3#% % &;I^^$56  [[C# / d88d\JJmD)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'< 8 8 Q'H~h/0 0 &LE GGA45< = - Js = L> L> c<SU;agSU;agSU;agSU;agg)zGuess the EOL type of a fileNs   r?rDs r!_eoltypers- }$ } } r#c[UR55nU(aW[R"U5n[U5nU(a.UR XB5nXS:wa[R "X5 gggg)z/Convert EOL markers in a file to match origfileN)rrDrreadfilereplace writefile)filebackuptostylerDstylenewdatas r! _matcheolr$s]v{{}%G}}T" ll52Gt- r#promptc URnURR5n[R"U5nURR 5R 5(a[R"S5e[URUR/5n U"U5U S'URR5(a!UR[U -S5n /SQU n OeURR5(a!UR[U -S5n /SQU n O%UR[S5U -S5n /SQU n U S:Xa [!XX#XE5$U S:Xa [#XX#XE5$U S :Xa [%XX#XE5$g ![R&a! UR)S 5 [%XX#XE5s$f=f) zbAsks 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)rrOr<r getuipathfnrN isinmemoryr InMemoryMergeConflictsError partextraslabelrM promptchoice_localchangedotherdeletedmsg_otherchangedlocaldeletedmsgr_iother_ilocal_ifailResponseExpectedwrite) rGmynodelocalotherbasetoolconfrfduipathfnpromptsindexchoices r!_ipromptr0s B  B""4(H zz((**// >  %++u{{34Gb\GEN B ::   OO$@7$JANE8?F ZZ " "OO$@7$JANE8?F OO: E9?F X 4tF F x 4tF F } $$dE E%  ! !B dE$AABs-B7F %F 8F 2GGrc:SURR54$)z=Uses the local `p1()` version of files as the merged version.r)rOrMrGrrrrrs r!rrds ejj!!# ##r#rcHURR5(a)[UR5R5 SnSU4$[UR5R URR 5URR 55 SnSU4$)z=Uses the other `p2()` version of files as the merged version.TFr)rOrM_underlyingfctxifabsentremoverrDrS)rGrrrrrdeleteds r!rrjs zz +224 g:  +11 JJOO uzz//1  g:r#sfailcURR5(aU[UR5RURR 5URR 55 g)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)rOrMrrrDrSrs r!rrysP zz +11 JJOO uzz//1  r#crUR5(a!UR5UR5$U$)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. rL)filectxs r!rrs2   "7<<>22r#c[R"UR55(aY[S5URR 5-nUR [S5U-5 [R"U5eg)z verifies that text is non-binarys%s looks like a binary file.s warning: %s N) rrtextrrOr<rr Abort)inputrmsgs r! _verifytextrs_&&/05::??3DD "#c)*kk#'r#cFUupVpxn U(d>URR5(dURR5(agURn /SQn [XSU(+5n U (aSnU S :XaS nOU S :XaS n[S XU455(ag[R"XX/S9unnU(aX;a4URRUURR55 U(dU RS5 gg![R av [ XSS5R5n X;aRSRU V s/sH n SU -S-PM Os sn fsn 5n[R "[S5X\U4-5eGN/f=f)Nr)skeep keep-merge3keep-mergediffspremerger#, 's6%s.premerge not valid ('%s' is neither boolean nor %s)rxr mergediffrmerge3c3j# UH)n[R"UR55v M+ g7fr.)rrr).0rs r! _premerge..s( 9MJ  ejjl + +9Ms13)modes premerge successful r)rOrMrr&r ConfigErrorr"lowerjoinranyrrrSdebug)rGrrrrrrrrscriptfnr validkeeppremerger_validr merged_text conflictss r! _premergers08-DFX%**%%''5::+>+>+@+@ B.format_labels/!! EKK1C1C#DDD{{"r#r>) sHG_FILEs HG_MY_NODEs HG_OTHER_NODEs HG_BASE_NODEs HG_MY_ISLINKsHG_OTHER_ISLINKsHG_BASE_ISLINKr?rHrG)rrFrsoutputs labellocals labelothers labelbase\$cV[R"[R"U55$r.rrmr localpathss r!_xmerge..2sh))$..*;Q !! I #  =#CMMO$8$8$:;"3==?#7#7#9:!SYY[0 $ 3#syy{2(/+E2*40  WW '.'.&t,     <   Rv & & GGNN89#((*-./   T/D(C GGMM7#= > 2tSsC4 P CLA GGMM9XH B&os [%s]rrr?)labelss r!rr|s= ~  "" r#cUR5(agSSKJn [X#R5(aX[ R "S5upE[R"US5nURUR55 SSS5 OF[R"XUR55n[X5n[R "Xu5 UR#XPS9$!,(df  N=f)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. Nrr.shg-merge-backupwb)rG)rMr1r/r2r3r mkstemprmfdopenrrDr backuppathr<r0rcopyfilearbitraryfilectx)rGrrr/rrr4r6s r! _makebackuprs ||~~#4455%%&89  YYr4 A GGCHHJ ! ##Bchhj9  # a  # #F # 66! s & C$$ C2c#^# [R"SS9mU4Sjn/nUHup4nURU"X4U55 M Uv [R"T5 g![R"T5 f=f7f)zqCreates a temporary file for each (prefix, path, data) tuple in `files`, so an external merge tool may use them. shgmerge-)prefixc>[RRU5up4S[RRU5U4-n[RR TU5nU(aXd- n[ R "Xb5 U$)Ns%s~%s)rmr<rnbasenamerrr)rr<rDfullbaser|prenametmproots r!maketempfrompath(_maketempfiles..maketempfrompathsf((. "''**84f==ww||GS)  KD t" r#N)r mkdtemprshutilrmtree)ryr temp_filesrr<rDrs @r!rorosl k2GJ#d*6>?$ g gsAA;A A; A88A;c  URnUR5n [R"U5n U "U 5n UR 5=(d' UR 5=(d UR 5n SUR 5UR 5-;n UR 5=(d UR 5n[XXX5unnSnU[;a$URS5(aU[S5SnU(aURS5(atSnURS5S:a0US SRSS 5unnU(dS nS U;dS U;aS nOS nU(a"[R"[S5U-5eWnUR!SUU ["R$"U 5["R$"U 5["R$"U54-5 U[;a0[UnUR&nUR(nUR*nSnO7UR-5(a[.nO[0n[2n[S5nSnS nUUXU4nU(dSS/n[U5S:aUR5S5 [6R8"XGS5n[6R8"XWS 5n8"XgS5nU[::Xa U"UUUUUU5$X5R5:wa;UR=[S5U "U5U "UR55U 4-5 OUR=[S5U -5 UR!SXEU4-5 U(aWU"XXEUU5(dGU(a?UR-5(a[R>"S5eURAUU -5 g[CXU5nS nURESS5nU(a [GXS5n OUn U[2:Xa}[IUUUU5 Sn!U S:waUn!US:wdU S:wa[KUUUU/U!S9 [MUUUUU5nU(d US4U(dUbURO5 $$$SUl(SUl(SUl(U S:wa[KUUUU/US9 U"UUUUUUU5un"nn#U"(a[SUUXUU5nU(aQU(a?UR-5(a[R>"S5eURAUU -5 [UU5 UU#4U(dUbURO5 $$$!U(dUbURO5 fff=f)apperform 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:sinternalrfF:rrT\/sinvalid 'python:' syntax: %ss?picked tool '%s' for %s (binary %s symlink %s changedelete %s) smerging %s failed! rrrZrFrsmerging %s and %s to %s s merging %s smy %s other %s ancestor %s s0in-memory merge does not support merge conflictsrrs mergemarkerssbasicr)+rr<rrrYrSrMrrgrhrcountrsplitr rrrr rr onfailurerrr;r fullmergerr MergeInputrr+rrrrr"_run_partial_resolution_toolsrrrr\_check_onfilemergefailure)$rGwctxrorigrrrrrrrfduipathrrrrrr invalidsyntaxscriptfuncrrr isexternalrrrrrrinternalmarkerstyle markerstyle labeltool needcheckrs$ r! filemergers  B B""4(H|H \\^ ?s||~ ?FciikCIIK//G<<>3S\\^LtWKND(H yT__\::C $&'H'' 33 >>$ 1 $'|224; FH $  DH$4 $  M ++a ?@8KL LHHK     V $   W %   \ *     yNN NN == ??  DD -.  Xv8H H% 6{Q g  " "3q 2E  " "3q 2E  ! !#ay 1DG          xxz * +~x 3X> ? !O$x/0HH ,# >?shGG   77G GGI( ) 3 'F AF ii? "2_=K-K  ! )$ud C Ih&! "h.+2I'5%.Y A%xHV' MMO(qC"&E !%E  $D  ( " #D5%*>T J $       !  1g tQ#v6A ??$$;;+  H,-  #'zV' MMO(qqV' MMO(qsA=T?6B,T??UcBURnURSS5(ag/n[5nSnURU5GHupUR S5Sn X;aM!UR USU -/5n Sn U (aX[ R "URS XRR5S 9n U "URR55n U (dMURUS U -5(aMURUS U -S5nURUS U -U 5nURUSU -5nURXUU45 GM U(dgUR5 SURR5UR54SURR5UR54SURR5UR54/n[!U5nUunnnUHupnn["R$"U5nUUUS.n[&R("SUUS5nSUU4-nUR+UURSS9nU(a[,R."SU U4-5e[&R0"U5n[&R0"U5nUU:XdM O UR3W5 UR3[&R0"U55 UR3W5 SSS5 g!,(df  g=f)zCRuns partial-resolution tools on the three inputs and updates them.rxsdisable-partial-toolsNspartial-merge-toolsrrs %s.patternsTr#)r3s %s.disables%s.orders %s.executables%s.argsrrFr)rrFrr_cV[R"[R"U55$r.rarcs r!re/_run_partial_resolution_tools..s(--dnnQ.?@r#s%s %sspartial-mergetool)rhris)partial merge tool %s exited with code %d)rr%rrrr(r rrOrNr< configintrrsortrrorrmrrqrrr StateErrorrset_text)rGrrrrrseensectionrtrrpatternsis_matchmorder executabler ryr}rbr~rrjrr local_text other_texts r!rrus B }}X788 E 5D$Gw'wwt}Q < ==.4*?D   3jj.B.B.DA*+H 8}}Wmd&:;;LL+*B:L=+|-])\1{6}( .*)$)boolresearch MULTILINErs r!hasconflictmarkersrs*  &  LL  r#cUR5n[R"U5nU(dA[X#S5(dS[ X#S5;a [ UR 55(aSnSnS[ X#S5;a-SnUR[S5U"U5-S5(aSnU(dlU(de[X#S 5(dS [ X#S5;aDUbAURU5(d+UR[S 5U"U5-S5(aSnUb&[X#S 5(a[[X5U5 U$) Nscheckconflictss conflictsscheckrFrTs0was merge of '%s' successful (yn)?$$ &Yes $$ &Nos checkchangedschangedsJ output file %s appears unchanged was merge successful (yn)?$$ &Yes $$ &Nosfixeol) r<rrr&r)rrDrrrPrr0) rGrrrrrrrcheckeds r!rrs2 B""4(H "-.. 9Rx8 8 chhj ) )AGIb11 ?? A Brl    A  b 0 0Yr::  cggfoo& 2,   i)<<,t)62 Hr#c@URUR55$r.)wjoinr<)rGr3s r!r0r0 s ::chhj !!r#c URR5Hup4SU-nU[U'U[SU-'U[U'[ UR R5VVs/sHupgU(dMUPM snn5nU(dMrSSR U5-n UR[R"SU -5-UlM [S5 [S5 [S5 g s snnf) 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) _tablerrg internalsdocrrzrrar rsr) rextname registrarobjrrfullnamertrrzcapdescs r!loadinternalmergers"))//1 $;" ()- ,%&!% XT->->-D-D-FL-FTQ!q-FLM <6:G <<(//)g:M*NNDL2"34*++,#Ms % C2 6C2 r.)V __future__r contextlibrmrri18nrrprrr1rr r r r r rrrrrrrutilsrrr"r&r)rgr internalmerge internaltoolr mergeonlyrrrr+rkrnrirrrrrrrrrrr r rrrrr r"r$r'r,r7r9r;rXrrrrrcontextmanagerrorrrrrrr0rvalues i18nfunctionsr?r#r!rs#    @D=   &&(      " "  " " !-  !. 11h&$ 2nb  .i!0B"0Bfh $!$ h  ! gw   ) X*&>   266  2BB    266   277!        2::ni+>6?6ni+>6?6  """gyt<=8lIdDAFBF 3&lod> , "7< 0nbF#R*  , ^"-:$l+  " r#