6hXSSKJr SSKrSSKrSSKrSSKrSSKJrJrJrJ r J r SSK J r SSK Jr SSKJr \R"(aSSKrSSKJr SS KJr SS KJrJrJrJrJrJrJrJ r J!r!J"r"J#r#J$r$J%r%J&r& \R"(a$\'r(\'\)\ \(\)4r*\'\RV\ \(\)4r,\!RZ"S S S 9r.\R^r0\Rbr2Sr3S3Sjr4"SS5r5S4Sjr6S5Sjr7S6Sjr8S7Sjr9S5Sjr:S5Sjr;"SS5r<S8S9Sjjr=S5Sjr>S:S9Sjjr?Sr@SrASrBS5S jrC\R"S S!9"S"S#55rES3S4S$jjrFS%rGS&rHS'rIS(rJS)rKS rLS;S*jrM\\)\ \ \N\N\ \R*44rOSS-jrRS3S.jrSS>S/jrTS?S0jrUS>S1jrVS@S2jrWg)A) annotationsN)DictIterableIteratorOptionalTuple)_)nullrev)attr) stringutil) timestamp)copiesencodingerror filemergematch mergestateobsutilpathutilpolicypycompatscmutil subrepoutilutilworkerupdateTpyo3cURRX5n/SQnX4;aPSRUVs/sH nSU-S-PM sn5n[S5nXqX#U4-n[R "U5eU$s snf)N)abortsignorewarns, 's$%s.%s not valid ('%s' is none of %s))uiconfigjoinr r ConfigError)reposectionnamer%validvvalidstrmsgs 1/usr/lib/python3/dist-packages/mercurial/merge.py_getcheckunknownconfigr0>sy WW^^G *F *E ::>1tax$>?78 x00$$ M ?sA7cUR5(agUcUnURX%5=(a0 URU5U;=(a XFRX55$NF) isinmemoryisfileorlink_checkdir normalizecmp)dirstatewvfsdircachewctxmctxff2s r/_checkunknownfiler>Is^   z  ""8/ "   q ! 1 " HLL !c$\rSrSrSrSrSrSrg)_unknowndirschecker[a] Look for any unknown files or directories that may have a path conflict with a file. If any path prefix of the file exists as a file or link, then it conflicts. If the file itself is a directory that contains any file that is not tracked, then it conflicts. Returns the shortest path at which a conflict occurs, or None if there is no conflict. c@[5Ul[5UlgN)set_unknowndircache_missingdircacheselfs r/__init___unknowndirschecker.__init__fs!$ !$r?c UR5(ag[[[R"U555HnX@R ;a gX@R ;aM%URRRU5(dMQURRU5(a-URRU5UR;aUs $URRU5(dUR RU5 gUR RU5 M URRRU5(aURRU5(aURR!U5HmupEnUHan["R$"URR'XG55nURRUSS9nXR;dM]Us s $ Mo g)NFT)isknown)r3reversedlistrfinddirsrGrFr8auditcheck isfileorlinkr7r5lexistsaddisdirwalkrpconvertreljoin) rIr(r:r<pdirsfilesfnrelfs r/__call___unknowndirschecker.__call__qs{ ??  $x00345A))))))yy$$Q''II**1-- //2$--GHyy((++))--a0%%))!,6" 99??  # # (:(:"&)).."3B==):):1)ABD==2242FD==0   #4 r?)rGrFN)__name__ __module__ __qualname____firstlineno____doc__rJr___static_attributes__r?r/rArA[s &r?rA mergeresultc ^^^^[5m[5m[5m[5m[USS5n[USS5nURRSS5n[ 5n UR n UR n U(GdAUU4Sjn [5n UR[R[R45HWn[XXX.5(aTRU5 M(U(dM1X;dM8U "XU5nUcMFTRU5 MY UR[R/5H0unnn[XXX.US5(dMTRU5 M2 TT-nUVs1sH'nUR R!U5(dM%UiM) nnUU- nU "UU5 U "UU5 GO![#UR[R$/55HunnnUunn[XXX.5nUR R!U5(aUnOUnU(d&UR'U[R(US 4S 5 MkU(dUS :Xa(UR'U[R*XSS U4S 5 MUS :XaTRU5 MUS :XaTRU5 UR'U[R(US4S 5 M [-T5HnURR.nUT;aLUR R1U5(aU"[3S5U-5 MUU"[3S5U-5 MkU"[3S5U-5 M T(a[4R6"[3S55e[-T5HsnUR R1U5(a)URR/[3S5U-5 MLURR/[3S5U-5 Mu UU4SjnUR9[R[R(U5 gs snf)z Considers any actions that care about the presence of conflicting unknown files. For some actions, the result is to abort; for others, it is to choose a different action. merges checkunknowns checkignored experimentalmerge.checkpathconflictscf>US:XaTRU5 gUS:XaTRU5 gg)Nr!r")r) conflictsr%abortconflicts warnconflictss r/collectconflicts,_checkunknownfiles..collectconflictss4!%%i07"$$Y/#r?NrFremote createdr!s#remote differs from untracked localr"Ts,%s: untracked file conflicts with directory s,%s: untracked directory conflicts with file s%s: untracked file differs sLuntracked files in working directory differ from files in requested revisions%s: replacing untracked file s+%s: replacing untracked files in directory c>UT;=(d> T=(a5 UT;=(d) [U4Sj[R"U555nUunX24$)Nc3,># UH oT;v M g7frDrg).0rZ pathconflictss r/ <_checkunknownfiles..transformargs..sH3GaM)3G)anyrrP)r<argsbackupflags fileconflictsrws r/ transformargs)_checkunknownfiles..transformargssU   ]"IH83D3DQ3GHH r?)rEr0r$ configbooldictr7r8rAr\ mergestatemodACTION_CREATEDACTION_DELETED_CHANGEDr>rU getactionsACTION_LOCAL_DIR_RENAME_GET_ignorerOACTION_CREATED_MERGEaddfile ACTION_GET ACTION_MERGEsortedwarnrSr r StateError mapaction) r(r:r;forcemresult mergeforce unknownconfig ignoredconfig pathconfigr9r7r8rqcheckunknowndirsr<pathr|r. allconflictscignoredconflictsunknownconflictsfl2anc differentr%rrrorrwrps @@@@r/_checkunknownfilesrsEMEMEMUN*4?KM*4?KM##4JvH}}H 99D  0 /0,,44  A !II!!!$ 'A6#!%%d+ $..  6 6 7 LAtS!a!!!$  %}4 '3P|!t}}7L7LQ7OA|P'*::)=9)=9    B BC D LAtSHC)I}}$$Q''&&!,,%L%  v1!..4,:  8#""1%W$!%%a(!,,$K% W dN #ww|| yy%%a((QGH1LMQGH1LM 23a7 8$ ;   M " 99 ! !! $ $ GGLL<=A B GGLLJKaO P #  $$m&>&> uQs $Q-QcD[RnU(a[RnUR5HnXQ;dM UR XTSS5 M U(dAUR 5H,nXQ;dM UR U[RSS5 M. gg)a Forget removed files If we're jumping between revisions (as opposed to merging), and if neither the working directory nor the target rev has the file, then we need to remove it from the dirstate, to prevent the dirstate from listing the file when it is no longer in the manifest. If we're merging, and the other revision has removed a file that is not present in the working directory, we need to mark it as removed. Nsforget deletedsforget removed)r ACTION_FORGET ACTION_REMOVEdeletedrremoved)r:r; branchmergermr<s r/_forgetremovedr&s ##A  ' ' \\^ = OOA$(9 : A}!//%   r?c&UR5nUR5(db[URU55nU(a@[ UR 55H#nU"U5(aMUR U5 M% O [U5nU(GaUR [R[R[R[R[R[R45HnURU5 M UR [R45HnUR!U5 M UR#[R$/5H,upVnUupUR!U5 URU5 M. UR [R&45HnURU5 M UR#[R(/5H5upVnUuppn U (aUR!U 5 URU5 M7 0nUHKn[*R,"U5nX;a)[/S5nXuX4-n[0R2"U5eX^U'MM S=n=nn[5UR755HeupUR9U5(a>UR9U5(d([/S5nUUU4-n[0R2"U5eUS-nUS-nUnMg g)z$ Check for case-folding collisions. s(case-folding collision between %s and %sr?s5case-folding collision between %s and directory of %s/N) narrowmatchalwaysrErWrOr\ removefiler ACTION_ADDACTION_ADD_MODIFIEDrrACTION_CHANGED_DELETEDrrUrdiscardrACTION_DIR_RENAME_MOVE_LOCALrrrnormcaser rrritems startswith)r(wmfrrpmmfr<r|r.r=r~f1famoverfoldmapfold foldprefix unfoldprefixlastfulls r/_checkcollisionrGs ""$K     388K() '--/*"1~~&&q)+ 3x((11++((4444    A HHQK   ; ;=>A LLO?#..  7 7 8 LASIB LL  HHQK   I IKLA HHQKM#.. 0J0J/KLLAS$( !BBc R HHQK MG }}Q ??@C w}% %C""3' ' ,/.J.'--/* ??: & &q||L/I/ILMC Ha= C""3' 'D[ 4x +r?c#r# UH-n[R"U5HnXB;dM X44v M+ M/ g7f)z Generator that yields pairs of all the files in the manifest that are found inside the directories listed in dirs, and which directory they are found in. N)rrP)r(manifestr[r<rZs r/ _filesindirsrs5 ""1%Ayd &s"77c  UR5n[5n[5n[5n[5n[5n UR[R[R [R [R45HQn UR[R"U 55 URU 5(dM@URU 5 MS UR[R45Hn U RU 5 M UR[R 45H'upn U upnnnU(dMU RU 5 M) UR[R45Hupn U unnU RU5 M UHnUU;a)UU;aURU5 OURU5 UR!U5nU(dMLUS[R[R [R [R4;dMURU5 M UHnUU ;dM [#U5R%S5n[&R("UUU[UR555nUUR+5=(d UnUR-U[R.UU4S5 UR-U[R0US4S5 M U(Ga[#U5R%S5n[3XU5Hun nX;dM UR!U5nUceUunp[&R("UUU[UR555nU[R [R 4;aUR-UUX5 O)U SnUR-U[R4UU4S5 UR-U[R0US4S5 UR7U5 O U(aOUH*nUR8R;[=S 5U-5 M, [>R@"[=S 55eg) z Check if any actions introduce path conflicts in the repository, updating actions to record or handle the path conflict accordingly. r+slocal path conflictls path conflictNsremote path conflictrs#%s: is both a file and a directory s,destination manifest contains path conflicts)!rrEr\rrrrrrrrPhasdirrUrrrgetfilebytesrstriprsafename copysourcerACTION_PATH_CONFLICT_RESOLVEACTION_PATH_CONFLICTrrremover$rr rr)r(r:r;rmflocalconflictsremoteconflictsinvalidconflictscreatedfiledirs deletedfilesr<r|r.rr=rrrr~rZpdctxnamepnewporig mapping_valuerfls r/checkpathconflictsrs BUNeO ueO5L ]]  ( (  0 0  & &  . .   x0034 99Q<<    " ]]M779 :;**M,F,F+HI  $D# 4   R J **  3 35  E  7Dy!$$Q'""1% __Q  2"Q%  ( (  0 0  & &  . .      #+0 L Dk((.G==GT3w}}3GHDG&&(-AE OO::E &   OO22t   $+$$T* ?;DAq$ ' 2 %000, 4}}Qs7==?7KL!88!.. OOD!T7aBOO%AAB/  !664L$   &&q)A  r?c@[UR55GHup4U"U5(aMU(dURU5 M/USR(aURU5 MVUSR(avUR S5(d3URU5 UR USUSR5 M[S5n[S5n[R"XS-US9e[S5n[R"XS-5e g) z Filters out actions that can ignored because the repo is narrowed. Raise an exception if the merge cannot be completed because the repo is narrowed. rrsoutside-narrow-merge-actionsBmerge affects file '%s' outside narrow, which is not yet supporteds'merging in the other direction may workhints-conflict in file '%s' is outside narrow cloneN) rOfilemaprno_op narrow_safeendswith addcommitinfochangesr rAbortr)rrrr<actionr.rs r/_filternarrowactionsr%s'//+,  q>>    q ! AY__   q ! AY " "::d##""1%%%5vay7H7H2CDkk#'55FGC""37+ +/-r?cP\rSrSr%SrS\S'S\S'SSjrSrSS jrSS jr SSS jjr SSS jjr S Sjr S!S"Sjjr SS#SjjrS!S$SjjrS Sjr\S5r\S5r\S5r\S%Sj5rSSjrS&SjrSrg )'rhiJzAn object representing result of merging manifests. It has information about what actions need to be performed on dirstate mapping of divergent renames and other such cases.zdict[bytes, FileMappingValue] _filemappingzKdict[mergestatemod.MergeAction, dict[bytes, tuple[MergeResultData, bytes]]]_actionmappingc0Ul0Ul0Ul[R"[ 5Ul[R"[ 5Ulg)a  filemapping: dict of filename as keys and action related info as values diverge: mapping of source name -> list of dest name for divergent renames renamedelete: mapping of source name -> list of destinations for files deleted on one side and renamed on other. commitinfo: dict containing data which should be used on commit contains a filename -> info mapping actionmapping: dict of action names as keys and values are dict of filename as key and related data as values N)r_diverge _renamedelete collections defaultdictr _commitinforrHs r/rJmergeresult.__init__UsA &2248)55d;r?cXlX lgrD)rr)rIdiverge renamedeletes r/ updatevaluesmergeresult.updatevaluesgs  )r?cXR;a"URUupVnURUU X#U4URU'X44URUU'g)zadds a new file to the mergeresult object filename: file which we are adding action: one of mergestatemod.ACTION_* data: a tuple of information like fctx and ctx related to this merge message: a message about the merge Nrr)rIfilenamerdatamessageadrs r/rmergeresult.addfileksc (( (''1GA!##A&x0'-W&=(#15F#H-r?cURUnURU URUnUR5H&unupxU"Xg5nX'U4URU'Xx4XV'M( g)zuchanges all occurrences of action `actionfrom` into `actionto`, transforming its args with the function `transform`. N)rrr) rI actionfromactionto transformorigdestr<rr.s r/rmergeresult.mapactionsp"":.    +""8,"jjlNA{Q%D$,C#8D  a kDG+r?NcBXR;aURU$U$)z^returns (action, args, msg) about this file returns default_return if the file is not present)r)rIrdefault_returns r/rmergeresult.getfiles' (( ($$X. .r?c## UcURShvN gUHnURUShvN M gN&N 7f)zfreturns files on which provided action needs to perfromed If actions is None, all files are returned Nr)rIactionsrs r/r\mergeresult.filessE ?(( ( (..q111 )2sA<A> AAcbURUup#nURU URUU g)zPremoves a file from the mergeresult object as the file might not merging anymoreNr)rIrrrrs r/rmergeresult.removefiles:!% 1 1( ;g   h '    ' 1r?c## UHtnU(a;[URU5HnURUUupVXEU4v M MEURUR5HunupVXEU4v M Mv g7f)zget list of files which are marked with these actions if sort is true, files for each action is sorted and then added Returns a list of tuple of form (filename, data, message) N)rrr)rIr sortrr<r|r.s r/rmergeresult.getactionssA 3 3A 67A $ 3 3A 6q 9ID3,&8'+&9&9!&<&B&B&DNA{3,&'E sAc^^Uc[TR5$[U4SjU55$)z{returns number of files which needs actions if actions is passed, total of number of files in that action only is returnedc3T># UHn[TRU5v M g7frD)lenr)rvrrIs r/rx"mergeresult.len..s$@13t**1-..s%()rrsum)rIr s` r/rmergeresult.lens, ?t(() )@@@@r?c## U(a,[URR55ShvN gURR5ShvN gN(N7frD)rrr)rIrs r/rmergeresult.filemapsG d//5578 8 8((..0 0 0 9 0s!.AA"AAAAc&X0RUU'g)z\adds key-value information about filename which will be required while committing this mergeNr)rIrkeyvalues r/rmergeresult.addcommitinfos+0"3'r?cUR$rD)rrHs r/rmergeresult.diverges }}r?cUR$rD)rrHs r/rmergeresult.renamedeletes!!!r?cUR$rDrrHs r/ commitinfomergeresult.commitinfosr?c[R"[5nURR 5H6up#UR 5HunupVXR XEU45 M M8 U$)zureturns a dictionary of actions to be perfomed with action as key and a list of files and related arguments as values)rrrOrrappend)rIresrrr<r|r.s r/ actionsdictmergeresult.actionsdicts^ %%d+''--/DA"#'');D qn-#,0 r?cXl[R"[5UlURR 5Hunup4nXE4URUU'M grD)rrrrrr)rIr r<actrr.s r/ setactionsmergeresult.setactionssU#)55d;#'#4#4#:#:#< A3*.)D   $Q '$=r?c URR5HpnU[R[R[R [R 4;dMGURU(dM]UR(aMp g g)zVtells whether this merge resulted in some actions which can result in conflicts or notTF)rkeysrr ACTION_EXECrrr)rIrs r/ hasconflictsmergeresult.hasconflictssr$$))+A!,,!--!//!>> ''**,r?)rrrrr)returnNone)rrrmergestatemod.MergeActionrzMergeResultData | Noner6r7)rr8rr8rD)rrr FileMappingValue | Noner6r9)r *Iterable[mergestatemod.MergeAction] | Noner6zIterator[bytes])rrr6r7F)r z#Iterable[mergestatemod.MergeAction]rboolr6zIterator[MergeResultAction])r r:r6int)rr<r6z'Iterator[tuple[bytes, MergeResultData]])r6z8dict[mergestatemod.MergeAction, list[MergeResultAction]])r6r<)rarbrcrdre__annotations__rJrrrrr\rrrrrpropertyrrr&r+r/r4rfrgr?r/rhrhJss: 0/<$*@@*@% @  @."-","$JN/F EI2A2 2 2JO':'BF' $'$EI AA A  A!11 010 ""    A  4 r?c <^[5n UbUR5(aSn[TR5X#/-[R S9V s/sHn U R 5PM n [R"5n [R"5n 0nU(a[R"UTX#5upn[R"[U55n[R"[U55n[R"[U55nURR[S55 URR!SUUU4-5 URR!SUTU4-5 TR 5UR 5UR 5nnn[#U R$R'55nUR)U R*R'55 [#U R$R'55nUR)U R*R'55 SU;aNTR-5c=[/U4SjTR055(aUR2R4US'UTU/TR5-;aU (dURR7SS 5(dUR8S :Xd[#UR;U5R=55nU R$R?5HunnUU;dMURAU5 M! U R*HnURAU5 M [RB"UU5nRF"UU5nUR;UUS 9nUR?5GH7unuunnun n!U(GaU (GaUU;aU R$RIUS5=(d U R$RIUS5n"S un#n$U"bUUU"S URK54n#SU"-n$OUUSS URK54n#Sn$U RMU[NRPU#U$5 MUU R$;aJU R$Un"U RMU[NRPUU"U"S URK54SU"-5 GMUU R$;aJU R$Un"U RMU[NRPU"UU"S URK54SU"-5 GMwUUn%URSU5n&SUU!-U&-;n'U U%:Xa+U!U&:Xa%U RMU[NRTSS5 GMUU%:XavUU&:XapUU :Xa&U RMU[NRVU!4S5 GMU RMU[NRXU!S 4S5 U(aU R[USS5 GMBGMEU'(a,U U%:Xa&U RMU[NRVU!4S5 GMxU'(aJUU%:XaDU RMU[NRXUS 4S5 U(aU R[USS5 GMGMU RMU[NRPUUUS URK54S5 GMU(Ga!UU;aGMUU R*;awU R*Un(U(U;a8U RMU([NRPUU(SSURK54S5 GMoU RMU([NR\UU4SU-5 GMUU R$;aJU R$Un(U RMU[NRPUU(U(S URK54SU(-5 GMUU;Ga UUU:waU(a%U RMU[NR^SS5 GM/U RMU[NR`USUS URK54S5 U(aU R[US S!5 GMGMUUR2Rb:Xa%U RMU[NRdSS"5 GMU RMU[NR^SS#5 U(aU R[US S!5 GMGMU RMU[NRfSS$5 GM*U (dGM4UU;aGM=UU R*;awU R*Un(U(U;a8U RMU([NRPU(USS URK54S%5 GMU RMU([NRhUU!4S&U-5 GMUU R$;atU R$Un(S un$n#U(U;aU(UU(S URK54n#S'U(-n$OU(UU(SURK54n#S(U(-n$U RMU[NRPU#U$5 GMHUU;aU(d&U RMU[NRjU!4S)5 GM{U(d&U RMU[NRjU!4S)5 GMU RMU[NRlU!URK54S*5 GMU UU:wGaSn)U RnH9n*URqU*5(dMU RnU*U[sU*5S-n) O U)bAU)U;a;U RMU)[NRPU)UUS URK54S+U-5 GMvU(a&U RMU[NRjU!4S,5 GMU RMU[NRtSUUS URK54S-5 U(aU R[US S!5 GMGMU RMU[NRvSS.5 U(dGM$U R[US S!5 GM: URR7SS/5(a [yUTX*5 UR{5n+U+R5(d [}U+XJ5 U R~n,U,R)U R~5 U RUU,5 U $s sn f)0a Merge wctx and p2 with ancestor pa and generate merge action list branchmerge and force are as passed in to update matcher = matcher to filter file lists acceptremote = accept the incoming changes without prompting Returns an object of mergeresult class N)rsresolving manifests s) branchmerge: %s, force: %s, partial: %s s% ancestor: %s, local: %s, remote: %s .hgsubstatec3b># UH$nTRU5R5v M& g7frD)subdirty)rvsr:s r/rx manifestmerge..Ns%:Mqtxx{  ""Ms,/rksmerge-track-salvagedschangeset-sidedata)rNNFsboth renamed from %ss both createdslocal replaced from %ssother replaced from %srrgsremote unchangedsupdate permissionssremote is newersfilenode-sourcesothersversions differTs%remote directory rename, both createds&remote directory rename - move from %sslocal copied/moved from %ss remote deletesprompt changed/deletedsmerge-removal-candidateyessremote deleteds other deleteds ancestor missing, remote missings$local directory rename, both createds$local directory rename - get from %ssremote copied from %ssremote moved from %srssremote created, get or merges-local directory rename - respect move from %ssremote recreatingsprompt deleted/changeds#local not present, remote unchangedrl)Arhrrparentsrintrevrr branch_copies mergecopiesrbytestrr<r$noter debugrEcopyvaluesr movewithdirrevr{substate nodeconstantsmodifiednodeidrfilecopiesmodediffr2rrU matchfilesmatchmodintersectmatchersgetnoderrrr~ ACTION_KEEPr3rrrrr addednodeidrACTION_KEEP_NEWrrrdirmoverrrACTION_KEEP_ABSENTrrrrr)-r(r:p2parrmatcher acceptremote followcopies forcefulldiffrxbranch_copies1branch_copies2rboolbmboolfboolmm1m2macopied1copied2 relevantfilescopykey copyvalue movedirkey filesmatcherrXr<n1fl1n2rrr|r.rflanolr=dfrrrs- ` r/ manifestmergers. *mGw~~//  "1w~~FFA F ))+N))+NG282D2D $3 /  d;/ 0F   T%[ )E   T'] +EGGLL+,-GGMM58NN GGMM;r4nLM"++-BB.%%,,./G NN>--4467.%%,,./G NN>--4467 2 :DMM: : :!%!3!3!B!BB~  D": ./ GG  0G H H""&;; BGGBK,,./ #1"5"5";";"= GYM)!!'*#>)44J   j )5))$ > ,,WlC 772W7 %D%)ZZ\! !IRyC "{#((,,t6#((,,Q5' c>q"eRWWY7D1B6Cq$rwwy9D)C=#=#=tSIn)))#((+!..Brwwy1-2  n)))#((+!..Brwwy1-2 qEhhqk#)c/17sczOO%11+  1WRx)55 F1  )44 %L.  '#11 !#5x'R1WOO%11-  R1WOO%00e *  #--a1CXN#OO%22Aq%3*  G|^///#//28OO%22BdBGGI6@ OO%BBCAAE  n)))#((+!..Brwwy11B6  bA;#)77 ,  )@@a :5  '#11 !#=v'4--999OO%33) OO%33(  #  --96 #!117 RG|n000#//28OO%22QeRWWY7? OO%AAC?!C  n)))#((+& T82ubggi8D2R7C2tRWWY7D1B6C=#=#=tSI"OO%44)  %OO%44) OO%::bggi(7  r!u'//A||A+33A63q68D 0 >bBhOO%22Q5"'')4#%&' "OO%44, OO%<<q!UBGGI61  #--96# !44:  ; ))!-GPc&2f ww/+FGG4r3""$K     [+?!..L334 ,/ NI src[UR[R455HHnXS;dM XR X55(aM&UR U[R SS5 MJ [UR[R455H7nXS;dM X%R X55(aM&URU5 M9 g)zTResolves false conflicts where the nodeid changed but the content remained the same.Ns prompt same) rOr\rrr6rrrr)r(r:r;ancestorrr<s r/_resolvetrivialrs '--!E!E GH I =X[!9!9 OO=..n J'--!E!E GH I =X[!9!9   q !Jr?c ^^SSKJn Sn [U5S:XaQ[UUUUSUUUUU5 n [ XX%X5 UR R SS5(a [S5 GOUR R[S5UU[S5RS U554-5 0n [5n S upUGHWnUR R[S 5U-5 [UUUUUUUUUS S 9 n[ XX%UU 5 U b"[UR5[U 5:a URn Ub"[U5[UR5:a URnU RRUR5 UR!S S9HrunnUunnnUR R#SUUUR%54-5 UU ;a)U UnUU;aUUR'U5 MbU/UU'MjUU/0U U'Mt GMZ UR R[S5[U5-5 [)U R+55GHunnUR R,(a|UR R#SU-5 [)UR+55HAunmTH5unnnUR R#SUUR%54-5 M7 MC [U5S:Xa[/UR+55Sunm[1U4SjTSS55(aPUR R[S5UUR%54-5 U R2"U/TSQ76 GM9[4R6U;aQUR R[S5U-5 U R2"U/U[4R6SQ76 GM[4R8U;aQUR R[S5U-5 U R2"U/U[4R8SQ76 GM[4R:U;ae[4R<U;aQUR R[S5U-5 U R2"U/U[4R:SQ76 GM|[4R<U;aQUR R[S5U-5 U R2"U/U[4R<SQ76 GM[4R>U;ae[4R@U;aQUR R[S5U-5 U R2"U/U[4R>SQ76 GMZ[4R@U;aU[4R@Sm[1U4SjU[4R@SS55(a=UR R[S5U-5 U R2"U/TQ76 GMUR R[S5U-5 [)UR+55HAunmTH5unnnUR RSUUR%54-5 M7 MC [/UR+55SunmUR RC[S5UUR%54-5 U R2"U/TSQ76 GM UR R[S55 U REX5 URG5c [IXXK5 U RKXX$U 5 [MXX#SU 5 U $) an Calculate the actions needed to merge mctx into wctx using ancestors Uses manifestmerge() to merge manifest and get list of actions required to perform for merging two manifests. If there are multiple ancestors, uses bid merge if enabled. Also filters out actions which are unrequired if repository is sparse. Returns mergeresult object same as manifestmerge(). r sparseNrsdevelsdebug.abort-updates5note: merging %s and %s using bids from ancestors %s s and c3N# UHn[R"U5v M g7frD)rrM)rvrs r/rx#calculateupdates..s L)3!1!1#!6!6)s#%rGs" calculating bids for ancestor %s T)rhr %s: %s -> %s s/ auction for merging merge bids (%d ancestors) s list of bids for %s: s %s -> %s c32># UH oTS:Hv M g7f)rNrg)rvrls r/rxrs0%QAaDy%ss %s: consensus for %s s %s: picking 'keep' action s" %s: picking 'keep absent' action s& %s: picking 'changed/deleted' action s %s: picking 'keep new' action s% %s: picking 'delete/changed' action c3,># UH oT:Hv M g7frDrg)rvrga0s r/rxrPsL)KACx)Krzs %s: picking 'get' action s% %s: multiple bids for merge action: s %s -> %s s( %s: ambiguous merge - picked %s action send of auction )'rrrrr$rexitrNr r&rhrrrrrrO __bytes__r)rr debugflagrOallrrr^rbrr`rrrrrSrfilterupdatesactionsr)r(r:r; ancestorsrrrfrgrerrrfbidsrrrmresult1r<rrr|r.rbids_frrs @@r/calculateupdatesrs0G 9~    aL        4tGH 77  h(= > > G  G H(   L) LL  - *!H GGLLBChN O$" H t4* M#h&6&6"7#g,"F"**#s<'83%%<( (44    & &x';'; < ((d(31 4 0AsAKKM3JJK:aAAv! A !s! !A3xE!H4?"Z  B C)n  ekkm,GAtww   81<="4::<0DAq)* D# &6#q{{}9M&MN*+1 4yA~DJJL)!,10!AB%000GGLL45AKKM8JJOOA-!-((D0 Q>?!CDGD)B)B$CA$FG//47 QEFJKND)I)I$J1$MN44<!11T9 QIJQNO]AAB1E,,4 QBCaGHKD)F)F$G$JK44<!,,4 QHIAMN]AAB1E''4/=334Q7Lm.F.F)G)KLLLGGLL#A!BQ!FGOOA,, GGLLDEI Jtzz|,1%&MBcGGLLC3G!GH&'- %a(DAq GGLL>?akkm$%  OOA %! % _-`  Q,-.W3 xxzt;8 DwGDlG< Nr?cN[R"5$![a gf=frD)rgetcwdFileNotFoundErrorrgr?r/_getcwdrns&  s  $$c ## URRn[5nSnUHupgnURRSXh4-5 U(a'URR [ S5U-5 XR 5 XRSS9 US:XaXV4v SnUS - nM US:aUW4v U(aB[5(d2URR[ S 5UR-5 ggg![aQn URR[ S5U[R"U R54-5 Sn A NSn A ff=f7f) zKapply removes to the working directory yields tuples for progress updates rs %s: %s -> r removing %s T) ignoremissings update failed to remove %s: %s! Ndr sCcurrent directory was removed (consider changing to repo root: %s) )r$verboserrOrNr rQrOSErrorrr forcebytestrstrerrorroot) r(r:r rcwdir<r|r.insts r/ batchremoverus< ggooG )C A   '1(23  GGLL+,q0 1    GNNN . 8$JA Q  1ud  799  : ii   s  GGLL67j--dmm<=>   s2B E( D A,E( E%AE E( E%%E(c ## 0nURRnURnURnSn URR U[ U5S9 UGHun upn URR SX4-5 U(a'URR[S5U -5 U (aU nURRU 5(dA[R"U 5H'nURRU5(dM%Un O URRU5(a=[R"XU5n[R "UR#U5U5 X*nUR%5 UR'SS5nUR)U"U 5R+5U SUS9nU(a9UR-5nUR.n[0R2"U5nUUU4XZ'U S :Xa S X44v Sn U S - n GM S S S 5 U S:aS U W 44v SU4v g !,(df  N#=f7f) aRapply gets to the working directory mctx is the context to get from Yields arbitrarily many (False, tuple) for progress updates, followed by exactly one (True, filedata). When wantfiledata is false, filedata is an empty dict. When wantfiledata is true, filedata[f] is a triple (mode, size, mtime) of the file f written for each action. r) expectedcounts %s: %s -> g s getting %s rksupdate.atomic-fileT)backgroundclose atomictemprFr N)r$rfilectxr8backgroundclosingrrOrNr rTrrPrSr backuppathrrenamewjoin clearunknownrwriterlstatst_modermtime_of)r(r;r: wantfiledatar filedatarfctxr$rr<r~r}r. conflictingrZrwfctxrsizerEmodemtimes r/batchgetrsHggooG <GE    8MNJ;;Q  $% D :KKMyy!**1-#T51 CxaVm# FAA(/ ED 1uaVm .I E Ds&AI B:H;DH;I ; I I cUR[R[R[R[R /5n[ Rn[ RnU"UUR5U"X54/5 g)zInvoke ``scmutil.prefetchfiles()`` for the files relevant to the dict of merge actions. ``ctx`` is the context being merged in.N) r\rrrrrr prefetchfilesrYrS)r(ctxrr\prefetchrYs r/_prefetchfilesrs{ MM  $ $  0 0  5 5  & &   E$$H##J   4'  r?)frozenc\rSrSr\R "5r\R "5r\R "5r\R "5r Sr Sr g) updateresulticUR=(d2 UR=(d UR=(d UR(+$rD) updatedcount mergedcount removedcountunresolvedcountrHs r/isemptyupdateresult.isemptysA    $ $   $##   r?rgN) rarbrcrdr ibrrrrrrfrgr?r/rrs3779L'')K779LggiO r?rc L[XU5 Supxn URSS9n U RUR5R 5UR 5U5 UR R 5HupU RX5 M UR[RR5n UR5U - nURR[S5[S5US9nSUR[R ;a["R$"XX2XF5 UR'[R(/SS9Hun nnUunnURR*nU"[S 5U -5 US :XaU"[S 5U-5 OU"[S 5U-5 U"[S 5U -5 U R-U UU5 UR/U S9 M UR15(aSOSn[2R2"URU[4X4[7UR'[R /SS955nUHunnUR/UUS9 M UR[R 45n UR'[R8/SS9Hun nnURR;SU U4-5 UunnUUR=5(aURR?[S5UU 4-5 X+RA5 X+RCUREU5RG5UREU5RI55 UURK5 UR/U S9 M URRMSS5n2"URU[NXX%4[7UR'[RP/SS95USS9n0nUH&unnU(aUnMUunnUR/UUS9 M( SUR[RP;a["R$"XX2XF5 UR'[RR4SS9H6un nnURR;SU U4-5 UR/U S9 M8 UR'[RT4SS9H6un nnURR;SU U4-5 UR/U S9 M8 UR'[RV4SS9H6un nnURR;SU U4-5 UR/U S9 M8 [RRHNnUR'U4SS9H6un nnURR;SU UURY54-5 M8 MP UR'[RZ4SS9Hun nnURR;SU U4-5 UR/U S9 Uunn URR?[S5UU 4-5 X+RA5 X+RCUREU5RG5U 5 UURK5 M UR'[R\4SS9Hun nnURR;SU U4-5 UR/U S9 Uunn URR?[S5UU 4-5 X+RCUREU5RG5U 5 M UR'[R^4SS9Hfun nnURR;SU U4-5 UR/U S9 Uun X+RA5 X+RaS U ;SU ;5 Mh /n![7UR'[Rb[Rd[Rf/SS95n"U"Hun nnUunn#n$n%n&U S:XaMUc[hRj"UU$5n'O%URR;S UU 4-5 UUn'U#c[hRj"UU$5n(OUU#n(UU&n)U$U);aU)U$n*OUREU[lS!9n*U RoU'U(U*U 5 UU :wdMU%(dMU!RqU5 M U!H^n X+R=5(dMURR;S"U -5 X+RA5 X+RK5 M` UR[RP[R^[R\[RZ45nU"Hun nnURR;S#U U4-5 U RU S$S%05 UR/U S9 U S:Xa)["R$"XX2RsU5XF5 MyX+RA5 U RuX5 M U R{5 U R}5n+U R5un,n-n.UU,- nUU-- nU U.- n U R5n/UR5 [XxU U+5UU/4$![vRxa Nf=f!U R{5 f=f)&aapply the merge action list to the working directory mresult is a mergeresult object representing result of the merge wctx is the working copy context mctx is the context to be merged into the working copy Return a tuple of (counts, filedata), where counts is a tuple (updated, merged, removed, unresolved) that describes how many files were affected by the update, and filedata is as described in batchget. )rrrT)cleansupdatingsfiles)unittotalrArsD%s: path conflict - a file or link has the same name as a directory rs&the local file has been renamed to %s s'the remote file has been renamed to %s s1resolve manually then use 'hg resolve --mark %s' )itemrgMbP?)steprs %s: %s -> pr smoving %s to %s rksworker.wdir-get-thread-safe) threadsafe hasretvals %s: %s -> f s %s: %s -> a s %s: %s -> am rs %s: %s -> dm s %s: %s -> dg sgetting %s to %s s %s: %s -> e xs! preserving %s for resolve of %s )fileidrs %s: %s -> m smergedrH)Crrstartp1r]r&rrrr MergeAction NO_OP_ACTIONSr$ makeprogressr rrrsubmergerrstatusaddpathconflict incrementr3rrrOrrOrTrNrQrrrr~rrrrrrrrrrr3setflagsrrrr absentfilectxr rUr)rresolverInterventionRequiredcommitrcountsr completer)0r(rr:r; overwriterlabelsupdatedmergedrmsr<op num_no_op numupdatesprogressr|r.rforEcostprogrrf0origf0r getfiledatafinalr*rr~moves mergeactionsr=rrrfclfcoactxfca unresolved msupdatedmsmerged msremoved extraactionss0 r/ applyupdatesrsQ *4w'&GW t $BHHTWWY^^ tyy{F3##))+ ,  M55CCDI*Jww## +Qx[ $H// 0K0KLLTYG **  + +,4+ 4B GGNN      : a:;b@ A a;>,@FJ  kk !  *  + +,A B B  1   C + "!  ! !s.6D D#"D#r!snoneslinears noconflictc SSKJn UceU(d9U(d2U c[n [[[4n X;aSnXU 4-n[ U5eU b+U R 5(a[R"5nOUR5nU U cUSn U R5nUSnXnUbX/nOURRSS5S/:XakURRUR5UR55n[!U5=(d UR"/Vs/sHnUUPM nnOUR%UUS 9/nUR5UR5['U5['U54unnnnU=(a U(+nU(d~[)U5S:a[*R,"[/S 55eU R15nUR35(a+[/S 5n[/S 5n[*R,"UUS 9eU(Ga0[/S5nUU/:Xa[*R4"U5eUU/:XaTU(dMU R75UR75:Xa+[/S5n[/S5n[*R4"UUS 9eU(dUU R95(dU R;5(a+[/S5n[/S5n[*R,"UUS 9eU R 5(d;[!U R<5H"nU R?U5RA5 M$ OU(dUU:Xa;URCSSUSS9 URCSUSSS9 [ESSSS5sSSS5 $U [:XaUU/U/4;aU RGSS9nU(ah[HRJ"UUR5/5n XR5U ;aO,[/S5n[/S5n[*RL"UUS 9eU(aU /nO U(dU/nURROSS5n!U(aSn!O US(dSn!U(dU RGSS9(dSn!Sn"Sn#[P(aURROSS5(a[RbURU5[V:XaU(dURY5cxUcuU R15R[5(dRSU;aL[\R^"UR`5n$[cU$5n%U%ceU%RdS :Xa [cU$5 U"(GaURi5 U RkU[VURU5/5 URCSSUUS9 URlRoS!URq55 URROS"S#5(aURRsS"S$S5OSn&[RRuUR`URU5U&5n'URvRy5 URvR{U5 URvR}U5 SSS5 URvRUR75URY55 U RU5 URCSUUSS9 [R"URlRS!55 [EU'SSS5sSSS5 $[UU UUUUUU!UUS%9 n(U [:Xa@U(R5(a+[/S&5n[/S5n[*R,"UUS 9eU(RS5n)U)(GadSn*U)un+n,n[R"U5n-U*U-S''U+[R:XaURR[/S(5U--S5(a#U(RU*[RSS)5 OU*U;a#U(RU*[RSS*5 OU(RU*[RSS*5 OU+[R:Xa}U,un.n/n0n1nUU/R5n2URR[/S+5U--S5S:Xa%U(RU*[RU2S4S,5 OU(RU*5 [R"UR5(dYU(d8U(dU RGSSS-9(d[UUR5S5 O[X R5U(5 [!U(RR55H]un*n3URR[/S.5U*-5 [!U35H!n4URRS/U4-5 M# M_ [!U(RR55H]un*n3URR[/S05U*-5 [!U35H!n4URRS/U4-5 M# M_ U(dUUR"US4unnnnUSL=(d UR5n5U =(a U5=(a U R 5(+n U (aCU#(d<URCSSUUS9 URlRoS!URq55 [UU(R)[R45UR55 U =(a U(+n6[UU(U UUU6US19un7n8n9U (GaU9(amU9R5HYun:n;U;Hn"Cww!!(,=>4&H~~::2779bggiP-3D\-Jdkk]-JL-JStCy-JL{{2K{89WWY 59eBiGS#s-+o 2w{&&q)I'JKKB!!##6778&&s66 NOCrd{kk#&&$ )C/0CCDD++c55bhhjjBJJLL./;<&&s66==?? ,AFF1I++--Rx ,dC M )S#Q G#Aq!Q/c f00SA6.")!3!3D2779+!FJz(J6 67 !OP#//$?? $C$Cww))(OD  LQ L288D8#9 L $)! ! !""7,?@@+G#'')1MMO**,,b(!zz$))4 "#34O". ..##v-,)*      NN4'2668!4 5 IIl$SI I HHNN>2668 477%%i<<!!)Z>   < / @ @IIrvvx!  ((*]]33D9MM,,S1: '' T5L5L5NO--d3 )S#Q G DHHMM.9:#M1a;_ d#        !   1 1##%%./GH&&s66 ~. ALAtS**62GGDMM88877''2   OO%33(  "WOO%99& OO%00&  m:::(,%BD#2 GG((7 " "  OO%00, &&q)##DII..RXXd5XAbkkmT:kkmW=GOO1134EAr GGLL,  Rj X]+!5G006689EAr GGLL)  Rj X]+!:!$dkk3!; Cc3D4GNN$4'JFJ2==?7J "; IIl$SI I HHNN>2668 4  '++}779:BGGI &9k/ +7      , ({L +113GAt!!a8!AB%8"M444!%A04K!-"& 4{#  DHHMM.9:#11$7'6_ H  sCu7L7L   L{ M@%,'+$,::9#00 1,0) 1\65_ s B%w*1vIw*"G w*- v8B:w*3/v<"5w*v*3Bw*R=w*w*&A(w*Cww*w* v'#w*&v''w** v9 4w*<ww*ww* w' #w** w8c0nURRnSnSnU(aY[R"URR 5nUS:gnUb'U(a [ R"UR5nUc%[ R"UR5nUS4nUcgUupxU(aSnUR5HgupU cM [ R"U SU5n U bU S(aU(aU(dU SU SS4X)'MNU S(dMZU SU SU 4X)'Mi UR5H upXU 'M U$![a Nf=f)u( We've gathered "cache" information for the clean files while updating them: their mtime, size and mode. At the time this comment is written, there are various issues with how we gather the `mode` and `mtime` information (see the comment in `batchget`). We are going to smooth one of these issues here: mtime ambiguity. i.e. even if the mtime gathered during `batchget` was correct[1] a change happening right after it could change the content while keeping the same mtime[2]. When we reach the current code, the "on disk" part of the update operation is finished. We still assume that no other process raced that "on disk" part, but we want to at least prevent later file changes to alter the contents of the file right after the update operation so quickly that the same mtime is recorded for the operation. To prevent such ambiguities from happenning, we will do (up to) two things: - wait until the filesystem clock has ticked - only keep the "file data" for files with mtimes that are strictly in the past, i.e. whose mtime is strictly lower than the current time. We only wait for the system clock to tick if using dirstate-v2, since v1 only has second-level granularity and waiting for a whole second is too much of a penalty in the general case. Although we're assuming that people running dirstate-v2 on Linux don't have a second-granularity FS (with the exclusion of NFS), users can be surprising, and at some point in the future, dirstate-v2 will become the default. To that end, we limit the wait time to 100ms and fall back to the filtering method in case of a timeout. +------------+------+--------------+ | version | wait | filter level | +------------+------+--------------+ | V1 | No | Second | | V2 | Yes | Nanosecond | | V2-slow-fs | No | Second | +------------+------+--------------+ This protects us from race conditions from operations that could run right after this one, especially other Mercurial operations that could be waiting for the wlock to touch files contents and the dirstate. In an ideal world, we could only get reliable information in `getfiledata` (from `getbatch`), however this filtering approach has been a successful compromise for many years. A patch series of the linux kernel might change this in 6.12³. At the time this comment is written, not using any "cache" file data at all here would not be viable, as it would result is a very large amount of work (equivalent to the previous `hg update` during the next status after an update). [1] the current code cannot grantee that the `mtime` and `mode` are correct, but the result is "okay in practice". (see the comment in `batchget`) [2] using nano-second precision can greatly help here because it makes the "different write with same mtime" issue virtually vanish. However, dirstate v1 cannot store such precision and a bunch of python-runtime, operating-system and filesystem parts do not provide us with such precision, so we have to operate as if it wasn't available. [3] https://lore.kernel.org/all/20241002-mgtime-v10-8-d1c4717f5284@kernel.org NTsnfsFrr ) r7_use_dirstate_v2r getfstyper4baserwait_until_fs_tick get_fs_nowrrmake_mtime_reliable) r( file_dataambiguous_mtime dirstate_v2 fs_now_resultfast_enough_fsfstypenow timed_outr<rreliables r/rArA sYH!#O--00KMN .6)  .%88BM &&txx0C %LM& "NOO%DA}$881sC#QKN +,A$!d);O&a[[+,A$!h)?O&#&$$))+DAaL, A   s$E EEc X[UR5UR5USUUUS9$)z}Merge another topological branch into the working copy. force = whether the merge was run with 'merge --force' (deprecated) T)rrrrrFr\r(rS)rrrrFs r/mergerp s2       r?c \[UR5UR5SS/SQUUS9$)aDo a regular update to the given commit, aborting if there are conflicts. The 'updatecheck' argument can be used to control what to do in case of conflicts. Note: This is a new, higher-level update() than the one that used to exist in this module. That function is now called _update(). You can hopefully replace your callers to use this new update(), or clean_update(), merge(), revert_to(), or graft(). F)s working copys destinationsworking copy parent)rrrrErFro)rrErFs r/rr s2     H  r?cT[UR5UR5SSUS9$)z}Do a clean update to the given commit. This involves updating to the commit and discarding any changes in the working copy. FT)rrrFro)rrFs r/ clean_updaters s# 388:swwye4B OOr?c X[UR5UR5SSSUUS9$)zRevert the working copy to the given commit. The working copy will keep its current parent(s) but its content will be the same as in the given commit. FT)rrrDrerFro)rrerFs r/ revert_toru s2       r?c U=(d USnUR5nU=(d UR5nURRUR5UR55=(d! UR 5UR 5:Hn[ UUR5SSUR5UUUS9n U(a"U R (aUR5n O[URn UR5n U(a8[U 5S:Xa)X+;a$U RU5 U SR5n XR5:Xa URn UR5(a9URUR5U 5 [R"XaU5 U $URR!U5 URUR5U 5 URR#UR%55 [R"XaU5 SSS5 U $!,(df  U $=f)aDo a graft-like merge. This is a merge where the merge ancestor is chosen such that one or more changesets are grafted onto the current changeset. In addition to the merge, this fixes up the dirstate to include only a single parent (if keepparent is False) and tries to duplicate any renames/copies appropriately. ctx - changeset to rebase base - merge base, or ctx.p1() if not specified labels - merge labels eg ['local', 'graft'] keepparent - keep second parent if any keepconflictparent - if unresolved, keep parent used for the merge NT)rCrrFr^r)rr& isancestorr]rSr\rrrIrrr3r9r graftcopiesr7r8rr.) r(rrar keepparentkeepconflictparentr:pctxrCrYpotherrIs r/graftr} s@  4:D 779D  3668D !!$))+sxxz: $ 88: #       #  Ee33++- #g,!+ NN4 QZ__&F    V,4d+ L ]] + +D 1 OODIIK 0 MM   7 7 9 :   t$ / 2 L 2 1 Ls A!H;; I c Uc9UR5bSn[R"U5eUR5n[ UR 5USSUR 5SS9$)Ns/must specify parent of merge commit to back outTF)rrrrC)rcrProgrammingErrorrr\r(r])rparentrFr.s r/back_outr s_ ~ 668 DC((- -     r?c n^^UU4Sjn URn /n U(a/n U RUlTRXUS9n U(Ga(Sn[U R5n[U R 5nU(aU(a[ S5nUUU4-nOU(a[ S5nUU-nOvU(a[ S5nX-nO_U(aXSnW H9nU"U5(dMTRRU5(aM4US- nM; U(a[ S 5nUU-nUcU Xl$US - nTRRUSS 9S:Xa[R"[ S 55eU(a[U R U R-5H_nU(dDTRR[ S 5U-5 U "TRRU5 U RU5 Ma U(a[W SS9HnU"U5(dMTRRU5(aM4U(dDTRR[ S5U-5 U "TRR U5 U RU5 M U Xl$!Xlf=f)aPurge the working directory of untracked files. ``matcher`` is a matcher configured to scan the working directory - potentially a subset. ``unknown`` controls whether unknown files should be purged. ``ignored`` controls whether ignored files should be purged. ``removeemptydirs`` controls whether empty directories should be removed. ``removefiles`` controls whether files are removed. ``abortonerror`` causes an exception to be raised if an error occurs deleting a file or directory. ``noop`` controls whether to actually remove files. If not defined, actions will be taken. ``confirm`` ask confirmation before actually removing anything. Returns an iterable of relative paths in the working directory that were or would be removed. c>U"U5 g![aU [S5U-nT(a[R"U5eTRR [S5U-5 gf=f)Ns%s cannot be removeds warning: %s )rr rrr$r)removefnrr abortonerrorr(s r/rpurge..removeF sZ 6 TN 6)*T1Akk!n$ Q/0145  6s AA+*A+)rignoredunknownNs3permanently delete %d unknown and %d ignored files?s$permanently delete %d unknown files?s$permanently delete %d ignored files?rr s1permanently delete at least %d empty directories?s (yN)$$ &Yes $$ &No)defaultsremoval cancelledsremoving file %s T)reversesremoving directory %s ) traversedirr)rrrrr r8listdirr$r?r CanceledErrorrrNr<rmdir)r(rerrremoveemptydirs removefilesrnoopconfirmroldtraversedirr* directoriesrr. nb_ignored nb_unknown dir_countr<s` ` r/purger" s=H6((N C7- K"-"4"4G 7WM CV^^,JV^^,JjNO J//?@z!?@!  $Aqzz$))*;*;A*>*>!Q %LC9$C{0----77''Q'71<--a0D.EFF FNNV^^;<GGLL#8!9A!=>499++Q/ 1 = K61::dii&7&7&:&: Q'A%BQ%FGtyy2JJqM 7-ns,CJ,$J,$J,1C-J,"J,A!J,,J4rD)rrh)rrhr6r7)rzmergeresult | Noner6r7)r6zIterator[tuple[bytes, bytes]]r;)r6rhr2)NFNNFTNN)reFileDatar6zOptional[FileData])NFNrG)NNFFN)TFTTFFF)X __future__rrr0structtypingrrrrri18nr r]r thirdpartyr TYPE_CHECKINGutilsr dirstateutilsrrrrrrrrZrrrrrrrrrrtupleMergeResultDatarMergeResultActionrFileMappingValuer r-pack_packunpack_unpackr0r>rArrrrrrrhrrrrrrrrErrrUPDATECHECK_ABORTr rr!r,r\r=rrArprrsrur}rrrgr?r/rss# << $" OeXo%>EFJ!!8O#