4.qddlZddlZddlmZddlmZddlmZddlm Z ddl m Z ddl m Z mZmZmZmZmZmZmZmZmZmZmZmZmZej:Zej>Z d Z!d.d Z"Gd d Z#d Z$dZ%dZ&dZ'dZ(dZ)GddZ* d/dZ+dZ, d0dZ-dZ.dZ/dZ0dZ1ejddGddZ3 d.d Z4d!Z5d"Z6d#Z7d$Z8d%Z9 d1d&Z:d2d'Z;d3d(Z d4d+Z?d3d,Z@ d5d-ZAy)6N)_)nullrev)attr) stringutil) timestamp)copiesencodingerror filemergematch mergestateobsutilpathutilpolicypycompatscmutil subrepoutilutilworkerc|jj||}gd}||vrNdj|Dcgc] }d|zdz c}}td}|||||fz}t j ||Scc}w)N)abortsignorewarns, 's$%s.%s not valid ('%s' is none of %s))uiconfigjoinrr ConfigError)reposectionnamervalidvvalidstrmsgs 3usr/lib/python3.12/site-packages/mercurial/merge.py_getcheckunknownconfigr'&s WW^^GT *F *E U::>1tax$>?78 vx00$$ M ?sA5c|jry||}|j||xr,|j||vxr||j||SNF) isinmemoryisfileorlink_checkdir normalizecmp)dirstatewvfsdircachewctxmctxff2s r&_checkunknownfiler51sa   z  ""8Q/ "   q ! 1 " HLLa !ceZdZdZdZdZy)_unknowndirscheckeray 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@t|_t|_yN)set_unknowndircache_missingdircacheselfs r&__init__z_unknowndirschecker.__init__Ns!$ !$r6c|jrytttj|D]}||j vry||j vr"|jjj|sH|jj|r+|jj||jvr|cS|jj|s|j j|y|j j||jjj|r|jj|r|jj!|D]m\}}}|D]b}t#j$|jj'||}|jj|d}||jvs^|ccSoy)NFT)isknown)r*reversedlistrfinddirsr=r<r/auditcheck isfileorlinkr.r,lexistsaddisdirwalkrpconvertreljoin) r?rr1r3pdirsfilesfnrelfs r&__call__z_unknowndirschecker.__call__Yss ?? $x00345AD)))D)))yy$$Q'II**1- //2$--GHyy((+))--a0%%))!,6" 99??  # (:"&)).."34B==):):1b)ABD==2242FD4==0   #4 r6N)__name__ __module__ __qualname____doc__r@rTr6r&r8r8Cs &r6r8c $ttttt|dd}t|dd}|jjdd}t } |j } |j } |s$fd} t} |jtjtjfD]J}t| | | |||rj|%|s(||vs-| |||}|:j|L|jtjgD],\}}}t| | | ||||dsj|.z}|Dchc] }|j j!|s|"}}||z }| ||| ||nt#|jtj$gD]\}}}|\}}t| | | |||}|j j!|r|}n|}|s%|j'|tj(|d fd c|s|d k(r(|j'|tj*||dd |fd |d k(rj||d k(rj||j'|tj(|dfd t-D]u}|jj.}|vrE|j j1|r|t3d|zM|t3d|zb|t3d|zwrt5j6t3dt-D]l}|j j1|r(|jj/t3d|zF|jj/t3d|znfd}|j9tjtj(|ycc}w)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.checkpathconflictscb|dk(rj|y|dk(rj|yy)Nrr)update) conflictsrabortconflicts warnconflictss r&collectconflictsz,_checkunknownfiles..collectconflictss4!%%i07"$$Y/#r6NrFremote createdrs#remote differs from untracked localrTs,%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|vxs1xr-|vxs'tfdtj|D}|\}||fS)Nc3&K|]}|v ywr:rY).0rO pathconflictss r& z<_checkunknownfiles..transformargs..sH3GaqM)3Gs)anyrrE)r3argsbackupflags fileconflictsrhs r& transformargsz)_checkunknownfiles..transformargssW   ]"IH83D3DQ3GHH vr6)r;r'r configbooldictr.r/r8rQ mergestatemodACTION_CREATEDACTION_DELETED_CHANGEDr5rJ getactionsACTION_LOCAL_DIR_RENAME_GET_ignorerDACTION_CREATED_MERGEaddfile ACTION_GET ACTION_MERGEsortedwarnrHrr StateError mapaction) rr1r2forcemresult mergeforce unknownconfig ignoredconfig pathconfigr0r.r/rccheckunknowndirsr3pathrkr% allconflictscignoredconflictsunknownconflictsfl2anc differentrr}rorarnrhrbs @@@@r&_checkunknownfilesr{s EMEMEMUN*4?KM*4?KM##4JvH}}H 99D  0 /0,,44  A !44qI!!!$ 'dA6#!%%d+ $..  6 6 7 LAtS!$$aa!!!$  %}4 '3P|!t}}7L7LQ7OA|P'*::)=9)=9    B BC D LAtSHC)$$aI}}$$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 , P  P c"tj}|rtj}|jD]}||vs|j ||dd|s=|j D])}||vs|j |tjdd+yy)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)rr ACTION_FORGET ACTION_REMOVEdeletedryremoved)r1r2 branchmergermr3s r&_forgetremovedr s ##A  ' ' \\^ D= OOAq$(9 : A}!//%   r6c|j}|jsUt|j|}|rDt |j D]}||r |j |n t|}|r|j tjtjtjtjtjtjfD]}|j||j tjfD]}|j!||j#tj$gD]-\}}}|\}} |j!||j|/|j tj&fD]}|j||j#tj(gD]2\}}}|\} }} } } | r|j!| |j|4i}|D]J}t+j,|}||vr*t/d}||||fz}t1j2||||<Ldx}x}}t5|j7D]Z\}}|j9|r8|j9|s't/d}|||fz}t1j2||dz}|dz}|}\y)z, Check for case-folding collisions. s(case-folding collision between %s and %sr6s5case-folding collision between %s and directory of %s/N) narrowmatchalwaysr;rLrDrQ removefilerr ACTION_ADDACTION_ADD_MODIFIEDrrzACTION_CHANGED_DELETEDrtrJrdiscardruACTION_DIR_RENAME_MOVE_LOCALrvr{rnormcaserr r~r|items startswith)rwmfrrpmmfr3rkr%r4rmf1famoverfoldmapfold foldprefix unfoldprefixlastfulls r&_checkcollisionr+s ""$K    388K() '--/*"1~&&q)+ 3x((11++((4444    A HHQK   ; ;=>A LLO?#..  7 7 8 LAtSIB LL  HHQK   I IKLA HHQKM#.. 0J0J/KLLAtS$( !BBc R HHQK MG }}Q 7??@C Awt}% %C""3' ' ,/.J.'--/*a ??: &q||L/ILMC Ha= C""3' 'D[ 4x +r6c#fK|D](}tj|D]}||vs||f(*yw)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)rrE)rmanifestrPr3rOs r& _filesindirsros: ""1%ADyd &s"1 1c |j}t}t}t}t}t} |jtjtj tj tjfD]I} |jtj| |j| s9|j| K|jtjfD]} | j| |jtj fD]"\} } } | \} }}}}|s| j| $|jtjfD]\} } } | \}}| j||D]}||vr'||vr|j|n|j||j!|}|sB|dtjtj tj tjfvs|j||D]}|| vst#|j%d}t'j(|||t|j}||j+xs|}|j-|tj.||fd|j-|tj0|dfd|rt#|j%d}t3|||D]\} }| | vs |j!|\}} } t'j(|||t|j}|tj tj fvr|j-||| | n)| d}|j-|tj4||fd|j-|tj0|dfd|j7|n|rL|D])}|j8j;t=d|z+t?j@t=d y ) 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 conflictsremote path conflictrs#%s: is both a file and a directory s,destination manifest contains path conflictsN)!rr;rQrrrsrtr{rxr_rrEhasdirrJrrurgetfilebytesrstriprsafename copysourceryACTION_PATH_CONFLICT_RESOLVEACTION_PATH_CONFLICTrrvremoverr}rr r~)rr1r2rmflocalconflictsremoteconflictsinvalidconflictscreatedfiledirs deletedfilesr3rkr%rr4rrrrmrOpdctxnamepnewporigrfls r&checkpathconflictsr|s BUNeO ueO5L ]]  ( (  0 0  & &  . .   x0034 99Q<    " ]]M779 :;!,,m.H.H-JKD# $BD#    R L",,  3 35D# E  7Dy!$$Q'""1% __Q  "Q%  ( (  0 0  & &  . .      #+0 L Dk((.G==GT3w}}3GHDG&&(-AE OO::E &   OO22t   $+$$T* r?;DAq $&q1 4}}Qs7==?7KL!88!.. OOD!T37aBOO%AAB/  !664L$   &&q)5<8!A GGLLBCaG H" = >  r6c|jD]\}}||r|s|j|#|djr|j|D|djrs|j ds2|j||j |d|dj td}td}tj||z|td}tj||zy) 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) filemaprno_op narrow_safeendswith addcommitinfochangesrr Abortr~)rrrr3actionr%rs r&_filternarrowactionsrs__& 6 q>    q ! AY__   q ! AY " "::d#""1%%%5vay7H7H2CDkk#'55FGC""37+ +/'r6ceZdZdZdZdZdZdZddZddZ d Z dd Z dd Z dd Z d ZedZedZedZedZdZdZy) mergeresultzAn 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.ci|_i|_i|_tjt |_tjt |_y)aY 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) _filemapping_diverge _renamedelete collections defaultdictrq _commitinfo_actionmappingr>s r&r@zmergeresult.__init__,sA &2248)55d;r6c ||_||_yr:)rr)r?diverge renamedeletes r& updatevalueszmergeresult.updatevalues>s )r6c||jvr#|j|\}}}|j||=|||f|j|<||f|j||<y)aadds 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)r?filenamerdatamessageadrs r&ryzmergeresult.addfileBsk t(( (''1GAq!##A&x0'-tW&=(#15wF#H-r6c|j|}|j|=|j|}|jD]*\}\}}|||}|||f|j|<||f||<,y)zchanges all occurrences of action `actionfrom` into `actionto`, transforming its args with the function `transform`. N)rrr) r? actionfromactionto transformorigdestr3rr%s r&rzmergeresult.mapactionSsz"":.    +""8,"jjlNA{cQ%D$,dC#8D  a SkDG+r6Nc@||jvr|j|S|S)zfreturns (action, args, msg) about this file returns default_return if the file is not present)r)r?rdefault_returns r&rzmergeresult.getfile_s) t(( ($$X. .r6c#zK||jD]}|y|D]}|j|D]}|yw)zvreturns files on which provided action needs to perfromed If actions is None, all files are returned Nr)r?actionsr3rs r&rQzmergeresult.filesgsH ?&&',,Q/AG0s9;cd|j|\}}}|j|=|j||=y)zXremoves a file from the mergeresult object as the file might not merging anymoreNr)r?rrrrs r&rzmergeresult.removefilews<!% 1 1( ;g   h '    ' 1r6c#K|D]m}|r:t|j|D]}|j||\}}|||f ?|j|jD]\}\}}|||foyw)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)r|rr)r?rsortrr3rkr%s r&ruzmergeresult.getactions~s A 3 3A 67A $ 3 3A 6q 9ID#T3,&8'+&9&9!&<&B&B&DNA{cT3,&'E sA4A6cZ|tjStfd|DS)zreturns number of files which needs actions if actions is passed, total of number of files in that action only is returnedc3NK|]}tj|ywr:)lenr)rgrr?s r&riz"mergeresult.len..s"@13t**1-.s"%)rrsum)r?rs` r&rzmergeresult.lens, ?t(() )@@@@r6c#Ktr2t|jjD] \}}||f y|jjD] \}}||f ywr:)r|rr)r?rkeyvals r&rzmergeresult.filemaps\ "4#4#4#:#:#<=S3h>!--335S3h6sA"A$c(||j||<y)zdadds key-value information about filename which will be required while committing this mergeNr)r?rrvalues r&rzmergeresult.addcommitinfos+0"3'r6c|jSr:)rr>s r&rzmergeresult.diverges }}r6c|jSr:)rr>s r&rzmergeresult.renamedeletes!!!r6c|jSr:rr>s r& commitinfozmergeresult.commitinfosr6ctjt}|jj D]7\}}|j D]\}\}}||j |||f!9|S)z}returns a dictionary of actions to be perfomed with action as key and a list of files and related arguments as values)rrrDrrappend)r?resrrr3rkr%s r& actionsdictzmergeresult.actionsdictsf%%d+''--/DAq"#'');D#A q$n-#,0 r6c||_tjt|_|jj D]\}\}}}||f|j||<yr:)rrrrqrr)r?rr3actrr%s r& setactionszmergeresult.setactionss[#)55d;#'#4#4#:#:#< AT3*.)D   $Q '$=r6c|jjD]a}|tjtjtj tj fvsD|j|sT|jrayy)z^tells whether this merge resulted in some actions which can result in conflicts or notTF)rkeysrrrz ACTION_EXECrrr)r?rs r& hasconflictszmergeresult.hasconflictssm$$))+A!,,!--!//!>> ''*,r6r:F)rUrVrWrXr@rryrrrQrrurrrpropertyrrrr rrrYr6r&rr&s: <$*@" " 2 ' A0 ""  4 r6rc ~t} ||jrd}tj||gztj D cgc]} | j c} tj} tj} i}|rtj|||\} } }tjt|}tjt|}tjt|}|jjtd|jj!d|||fz|jj!d||fzj |j |j }}}t#| j$j'}|j)| j*j't#| j$j'}|j)| j*j'd|vrGj-7t/fdj0Dr|j2j4|d<||gjzvr| s|jj7dd s|j8d k(st#|j;|j=}| j$j?D]\}}||vs |jA|| j*D]}|jA|t jB||}tEjF||}|j;|| }|j?D]\}\\}}\} }!|r| r||vr| j$jI|dxs| j$jI|d}"d \}#}$|"|||"d |jKf}#d|"z}$n||dd |jKf}#d}$| jM|tNjP|#|$|| j$vrI| j$|}"| jM|tNjP||"|"d |jKfd|"z|| j$vrI| j$|}"| jM|tNjP|"||"d |jKfd|"z^||}%|jS|}&d||!z|&zv}'| |%k(r)|!|&k(r$| jM|tNjTdd||%k(rl||&k(rg|| k(r%| jM|tNjV|!fd| jM|tNjX|!d fd|s| j[|dd|'r*| |%k(r%| jM|tNjV|!fdI|'rB||%k(r=| jM|tNjX|d fd|sx| j[|dd| jM|tNjP|||d |jKfd|r||vr|| j*vrs| j*|}(|(|vr7| jM|(tNjP||(dd|jKfd%| jM|(tNj\||fd|zN|| j$vrI| j$|}(| jM|tNjP||(|(d |jKfd|(z||vr|||k7rt|r$| jM|tNj^dd| jM|tNj`|d|d |jKfd|s| j[|d d!%||j2jbk(r$| jM|tNjddd"b| jM|tNj^dd#|s| j[|d d!| jM|tNjfdd$| s||vr|| j*vrs| j*|}(|(|vr7| jM|(tNjP|(|dd |jKfd%#| jM|(tNjh||!fd&|zL|| j$vrq| j$|}(d \}$}#|(|vr|(||(d |jKf}#d'|(z}$n|(||(d|jKf}#d(|(z}$| jM|tNjP|#|$||vr|s%| jM|tNjj|!fd)|s%| jM|tNjj|!fd)| jM|tNjl|!|jKfd*Q| ||k7rd})| jnD]3}*|jq|*s| jn|*|ts|*dz})n|)>|)|vr:| jM|)tNjP|)||d |jKfd+|z|r%| jM|tNjj|!fd,| jM|tNjtd||d |jKfd-|s=| j[|d d!R| jM|tNjvdd.|sx| j[|d d!|jj7dd/rty||| |j{}+|+js t}|+|| | j~},|,j)| j~| j||,| Scc} w)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 .hgsubstatec3\K|]#}j|j%ywr:)subdirty)rgsr1s r&riz manifestmerge..s#:Mqtxx{  "Ms),r\smerge-track-salvagedschangeset-sidedata)r NNFsboth renamed from %ss both createdslocal replaced from %ssother replaced from %srrYsremote 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 %srdsremote created, get or merges-local directory rename - respect move from %ssremote recreatingsprompt deleted/changeds#local not present, remote unchangedr])Arrr|parentsrintrevrr branch_copies mergecopiesrbytestrboolrnoterdebugr;copyvaluesr_ movewithdirrevrjsubstate nodeconstantsmodifiednodeidrpfilecopiesmodediffrrrJ matchfilesmatchmodintersectmatchersgetnoderyrrr{rm ACTION_KEEPrrzrrrr addednodeidrACTION_KEEP_NEWrvrsrxdirmoverrrtACTION_KEEP_ABSENTrrrrr)-rr1p2parrmatcher acceptremote followcopies forcefulldiffrxbranch_copies1branch_copies2rboolbmboolfboolmm1m2macopied1copied2 relevantfilescopykey copyvalue movedirkey filesmatcherr-r3n1fl1n2rrrkr%rflanolr4dfrrrs- ` r& manifestmergerTs *mGw~~/  "b1w~~FFA F ))+N))+NG282D2D $B3 /  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""&;; 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 !#5xR1WOO%11-  R1WOO%00e *  #--a1CXNOO%22Aq%3*  G|^///#//28OO%22BdBGGI6@ OO%BBCAAE  n)))#((+!..Brwwy11B6  bA;#)77 ,  )@@a :5  '#11 !#=v4--999OO%33) OO%33(  #  --96 !117 G|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/+FG4r73""$K    [+w?!..L334 ,/ NI sn:ct|jtjfD]A}||vs||j ||r |j |tj ddCt|jtjfD]0}||vs||j ||r |j|2y)zXResolves false conflicts where the nodeid changed but the content remained the same.Ns prompt same) rDrQrrrr-ryrrtr)rr1r2ancestorrr3s r&_resolvetrivialrWVs '--!E!E GH I =aXa[!9 OO=..n J'--!E!E GH I =aXa[!9   q !Jr6c &ddlm} d} t|dk(rPt||||d||||| } t ||||| | |j j ddrtdn|j jtd||tdjd |Dfzi} t} d \} }|D]R}|j jtd |zt|||||||||d }t |||||| | !t|jt| kr |j} |!t|t|jkr |j}| jj|j|j!d D]k\}}|\}}}|j j#d|||j%fz|| vr%| |}||vr||j'|]|g||<d||gi| |<mU|j jtdt|zt)| j+D]\}}|j j,rx|j j#d|zt)|j+D]>\}D]4\}}}|j j#d||j%fz6@t|dk(rt/|j+d\}t1fdddDrO|j jtd||j%fz| j2|gd(t4j6|vrP|j jtd|z| j2|g|t4j6dt4j8|vrP|j jtd|z| j2|g|t4j8dt4j:|vrbt4j<|vrP|j jtd|z| j2|g|t4j:d`t4j<|vrP|j jtd|z| j2|g|t4j<dt4j>|vrbt4j@|vrP|j jtd|z| j2|g|t4j>d6t4j@|vrz|t4j@dt1fd|t4j@ddDr<|j jtd|z| j2|g|j jtd|zt)|j+D]>\}D]4\}}}|j jd||j%fz6@t/|j+d\}|j jCtd||j%fz| j2|gd|j jtd| jE| ||jGtI|||| | jK||||| tM||||d| | S) a 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(). rsparseNrsdevelsdebug.abort-updates5note: merging %s and %s using bids from ancestors %s s and c3FK|]}tj|ywr:)rr!)rgrs r&riz#calculateupdates..s L)3!1!1#!6)s!rs" calculating bids for ancestor %s T)r=r %s: %s -> %s s/ auction for merging merge bids (%d ancestors) s list of bids for %s: s %s -> %s c3.K|] }|dk(yw)rNrY)rgrls r&riz#calculateupdates..s0%QqAaDy%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(K|] }|k( ywr:rY)rgrga0s r&riz#calculateupdates..sL)KAqCx)Kss %s: picking 'get' action s% %s: multiple bids for merge action: s %s -> %s s( %s: ambiguous merge - picked %s action send of auction )'rZrrTrrrpexitr#rrrrrrr_rr$ __bytes__r r|r debugflagrDallryrrr3r7rr5rtrzr}rr(rfilterupdatesactionsrW)rr1r2 ancestorsrrr;r<r:rrZrfbidsrrrVmresult1r3rrrkr%rbids_frar_s @@r&calculateupdatesrmhs0G 9~    aL        4tUGZH 77  h(= > G  G H(   L) LL  - *!H GGLLBChN O$" H tT4* 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%00GGLL45AKKM8JJ$GOOA-!-((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)KLLGGLL#A!BQ!FG#GOOA,, GGLLDEI Jtzz|,1%&MBcGGLLC3G!GH&'- %a(DAq GGLL>?akkm$%  GOOA %! % _-`  Q,-.Wl3 xxztT;8 dD+wGD$ilG< Nr6cJ tjS#t$rYywxYwr:)r getcwdFileNotFoundErrorrYr6r&_getcwdrq2s&  s  ""c #K|jj}t}d}|D]\}}}|jjd||fz|r'|jj t d|z||j  ||jd|dk(r||fd}|d z }|dkDr|f|r=ts2|jjt d |jzyyy#t$rP} |jjt d|tj| jfzYd} ~ d} ~ wwxYww) zSapply removes to the working directory yields tuples for progress updates rs %s: %s -> r removing %s T) ignoremissings update failed to remove %s: %s! NdrsCcurrent directory was removed (consider changing to repo root: %s) )rverboserqr$r#rrFrOSErrorr}r forcebytestrstrerrorroot) rr1rrvcwdir3rkr%insts r& batchremover~9sE ggooG )C A 4  '1c(23  GGLL+,q0 1 Q   GNNN . 8Q$JA Q  1ud  79  : ii   s  GGLL67j--dmm<=>   s2BE C? AE? EAEEEEc#\Ki}|jj}|j}|j}d} |jj |t |5|D]\} \} } } |jj d| | fz|r'|jjtd| z| r| }|jj| s9tj| D]!}|jj|s|}n|jj|r g s getting %s r\supdate.atomic-fileT)backgroundclose atomictempruFrN)rrvfilectxr/backgroundclosingrr$r#rrIrrErHr backuppathrrenamewjoin clearunknownrpwriterlstatst_modermtime_of)rr2r1 wantfiledatarfiledatarvfctxrr|r3rmrlr% conflictingrOrwfctxrsizermodemtimes r&batchgetr`sHggooG <GE    8MNJ;;Q  $% D :KKMyy!**1-#T51 CxaVm# FAA(/ ED 1uaVm .I E Ds&AH,B)H C>H H, H)%H,c |jtjtjtjtj g}t j}t j}|||j|||fgy)zInvoke ``scmutil.prefetchfiles()`` for the files relevant to the dict of merge actions. ``ctx`` is the context being merged in.N) rQrrrzrtrvr{r prefetchfilesr.r()rctxrrQprefetchr.s r&_prefetchfilesrs} MM  $ $  0 0  5 5  & &   E$$H##J   4'  r6T)frozenceZdZejZejZejZejZdZ y) updateresultcp|jxs(|jxs|jxs |j Sr:) updatedcount mergedcount removedcountunresolvedcountr>s r&isemptyzupdateresult.isemptysA    $ $   $##   r6N) rUrVrWribrrrrrrYr6r&rrs;4779L$'')K4779LdggiO r6rc t|||d\}}} |jd} | j|jj |j ||j j D]\} } | j| | |jtjj} |j| z }|jjtdtd|}d|jtj vrt#j$|||||||j'tj(gdD]\} }}|\}}|jj*}|td | z|d k(r|td |zn|td |z|td | z| j-| |||j/| |j1rdnd}t3j2|j|t4||ft7|j'tj gd}|D]\}}|j/|||jtj f} |j'tj8gdD]\} }}|jj;d| |fz|\}}||j=r|jj?td|| fz|| jA|| jC|jE|jG|jE|jI||jK|j/| |jjMdd}t3j2|j|tN||||ft7|j'tjPgd|d}i}|D]"\}}|r|} |\}}|j/||$d|jtjPvrt#j$|||||||j'tjRfdD]8\} }}|jj;d| |fz|j/| :|j'tjTfdD]8\} }}|jj;d| |fz|j/| :|j'tjVfdD]8\} }}|jj;d| |fz|j/| :tjjD]N}|j'|fdD]5\} }}|jj;d| ||jYfz7P|j'tjZfdD]\} }}|jj;d| |fz|j/| |\}} |jj?td|| fz|| jA|| jC|jE|jG| ||jK|j'tj\fdD]\} }}|jj;d| |fz|j/| |\}} |jj?td|| fz|| jC|jE|jG| |j'tj^fdD]h\} }}|jj;d| |fz|j/| |\} || jA|| jad | vd| vjg}!t7|j'tjbtjdtjfgd}"|"D]\} }}|\}}#}$}%}&| dk(r|tijj||$}'n%|jj;d || fz||}'|#tijj||$}(n||#}(||&})|$|)vr|)|$}*n|jE|tl!}*| jo|'|(|*| || k7s|%s|!jq||!D]Z} || j=s|jj;d"| z|| jA|| jK\|jtjPtj^tj\tjZf} |"D]\} }}|jj;d#| |fz| j| d$d%i|j/| | dk(r*t#j$||||js|||||| jA| ju| | | j{| j}}+| j\},}-}.||,z }||-z }| |.z } | j}/|jt||| |+||/fS#tvjx$rYwxYw#| j{wxYw)&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)unittotalrr\sD%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 r\sworker.wdir-get-thread-safe) threadsafe hasretvals %s: %s -> f s %s: %s -> a s %s: %s -> am r]s %s: %s -> dm s %s: %s -> dg sgetting %s to %s s %s: %s -> e xs! preserving %s for resolve of %s )fileidrss %s: %s -> m smergedr)Crrstartp1r2rrrrrr MergeAction NO_OP_ACTIONSr makeprogressrrrrsubmergerurstatusaddpathconflict incrementr*rr~rDrr$rIr#rFrrrrmrrprrzrrrrdrrvrsetflagsrrtr{r absentfilectxrrJr rVresolver InterventionRequiredcommitrcountsrcompleter)0rrr1r2 overwriterlabelsupdatedmergedrmsr3op num_no_op numupdatesprogressrkr%rforcostprogr|rf0origf0r getfiledatafinalr rrmmoves mergeactionsr4rrrfclfcoactxfca unresolved msupdatedmsmerged msremoved extraactionss0 r& applyupdatesrs *4w'&GVW t $BHHTWWY^^ tyy{F3##))+2 B,  M55CCDI*Jww## +Qx[ $H// 0K0KLLT4tYG **  + +,4+ 4B GGNN      : a:;b@ A a;>,@FJ  dkk ! * *  + +,A B  1   C + "!  ! !s-6D DDrsnoneslinears noconflictc ddlm} |J|s3|s1| t} tttf} | | vrd}|| | fz}t || %| j rtj}n|j}|5| |d} | j}|d}||}|||g}n|jjdddgk(rc|jj|j|j}t!|xs |j"gDcgc]}|| }}n|j%|| g}|j|jt'|t'|f\}}}}|xr| }|syt)|dkDrt+j,t/d | j1}|j3r-t/d }t/d }t+j,|| |rt/d}||gk(rt+j4|||gk(rP|sN| j7|j7k(r-t/d}t/d}t+j4|| |sM| j9s| j;r-t/d}t/d}t+j,|| | j st!| j<D]!}| j?|jA#n|s||k(rA|jCdd|d|jCd|ddtEddddcdddS| tk(r||g|gfvr}| jGd}|rhtIjJ||jg} ||j| vrn.t/d}t/d}t+jL||  |r| g}n|s|g}|jjOdd}!|rd}!n|dsd}!|s| jGdsd}!tQ|| ||||||!|| }"| tk(r=|"jSr-t/d}t/d}t+j,|| |"jUd}#|#rYd}$|#\}%}&}tWjX|}'|$|'d <|%tZj\k(r|jj_t/d!|'zdr#|"ja|$tZjbdd"n|$|vr#|"ja|$tZjddd#n|"ja|$tZjfdd#n|%tZjhk(r||&\}(})}*}+}||)jk},|jj_t/d$|'zddk(r%|"ja|$tZjl|,dfd%n|"jo|$tjp|jrsN|s1|s| jGdd&stu||jwdntu|| jw|"t!|"jxj{D]Z\}$}-|jj}t/d'|$zt!|-D] }.|jj}d(|.z"\t!|"j~j{D]Z\}$}-|jj}t/d)|$zt!|-D] }.|jj}d(|.z"\|s||j"|df\}}}}|duxs|j}/| xr|/xr| j } | r?|jCdd|||jjd*|jt||"j)tZjlf|j| xr| }0t||"| |||0|+\}1}2}3| r|3r_|3j{D]L\}4}5|5D]}6|"j`|6d|4g|6dd|4tZjlk(s;|0s>|5D] }6d|2|6d< Nt)|2|0r |"j)tZjlfndk(sJ|jj|5|2r}i}7tj|j}8|8d}2nW|8d}9|2j{D]"\}$}%|% |%d,d|9k\s|%d|%ddf|7|$<$|7j{D] \}$}%|%|2|$< |j||t[j||"j||2tj|jjd*|s8|jj|j7|j|s| j|dddddd| r|jCd1j21Scc}w#1swY9xYw#1swY=xYw)-a Perform a merge between the working directory and the given node node = the node to update to branchmerge = whether to merge between branches force = whether to force branch merging or file overwriting matcher = a matcher to filter file lists (dirstate not updated) mergeancestor = whether it is merging with an ancestor. If true, we should accept the incoming changes for any prompts that occur. If false, merging with an ancestor (fast-forward) is only allowed between different named branches. This flag is used by rebase extension as a temporary fix and should be avoided in general. labels = labels to use for local, other, and base mergeforce = whether the merge was run with 'merge --force' (deprecated): if this is True, then 'force' should be True as well. The table below shows all the behaviors of the update command given the -c/--check and -C/--clean or no options, whether the working directory is dirty, whether a revision is specified, and the relationship of the parent rev to the target rev (linear or not). Match from top first. The -n option doesn't exist on the command line, but represents the experimental.updatecheck=noconflict option. This logic is tested by test-update-branches.t. -c -C -n -m dirty rev linear | result y y * * * * * | (1) y * y * * * * | (1) y * * y * * * | (1) * y y * * * * | (1) * y * y * * * | (1) * * y y * * * | (1) * * * * * n n | x * * * * n * * | ok n n n n y * y | merge n n n n y y n | (2) n n n y y * * | merge n n y n y * * | merge if no conflict n y n n y * * | discard y n n n y * * | (3) x = can't happen * = don't-care 1 = incompatible options (checked in commands.py) 2 = abort: uncommitted changes (commit or update --clean to discard changes) 3 = abort: uncommitted changes (checked in commands.py) The merge is performed inside ``wc``, a workingctx-like objects. It defaults to repo[None] if None is passed. Return the same tuple as applyupdates(). rrYNz&Invalid updatecheck %r (can accept %r)rr[spreferancestor*)r}soutstanding uncommitted mergesoutstanding merge conflictssuse 'hg resolve' to resolvers7merging with a working directory ancestor has no effectsnothing to merges#use 'hg update' or check 'hg heads'suncommitted changessuse 'hg status' to list changess preupdateTr6)throwparent1parent2supdate)rrr )missings+commit or update --clean to discard changess followcopiesF)r:rsconflicting changesrfsjlocal%(l)s changed %(f)s which other%(o)s deleted use (c)hanged version or (d)elete?$$ &Changed $$ &Deletes prompt deletes prompt keepsrother%(o)s changed %(f)s which local%(l)s deleted use (c)hanged version or leave (d)eleted?$$ &Changed $$ &Deletedsprompt recreating)rbranchs<note: possible conflict - %s was renamed multiple times to: s %s s9note: possible conflict - %s was deleted and renamed to: s updatestate)r)RrbrZUPDATECHECK_LINEARUPDATECHECK_NONEUPDATECHECK_NO_CONFLICT ValueErrorr*rnullcontextmanagerwlockrr configlist changelogcommonancestorsheadsr2r|rrVrrr r~rrrrrrQrr)r bailifchangedhookrrr foreground UpdateAbortrprmrrr partextrasrrr promptchoiceryrrrrtrmrzrfscasesensitiverrrrrr}rrvfsrhexrrr.changing_parentsr get_fs_now setparents recordupdatesr unlinkr setbranchcurrenttransactionprunetemporaryincludes):rr2rrrV mergeancestorrr:rupdatedirstate updatecheckwcrZokayr% maybe_wlockplrr8pascahsrfp1fp2xp1xp2rrrm_arrrr<rvalsr3rrkpromptsrr4rrrmrnfrrstatsrrkactsrambiguous_mtimenownow_secs: r&_updater$&s F    u  ,K "46MN d ";C K& &CS/ ! ~"--/--/ jjl  :dB ZZ\ U $Z  >"Cww!!(,=>4&H~~::2779bggiP-3D\-Jdkk]-JL-JStCy-JL{{2K{89WWY 59eBiGS#s-+o 2w{&&q)I'JKKB!!#6778&&s66 NOCrd{kk#&&$ )C/0CCDD++c55bhhjBJJL./;<&&s66==? ,AFF1I++--Rx ,dC M )S#Q G#Aq!Q/c f00SA6.")!3!3D2779+!FJDz(J6 67 !OP#//$?? $C$Cww))(OD  LQ L288D8#9 L#        !   1 1##%./GH&&s66 ~. ALAtS**62GGDMM88877''2   OO%33(  "WOO%99& OO%00&  m:::(,%BD#2 GG((7 " "  OO%00, &&q)##DII.RXXd5XAbkkmT:bkkmW=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{# #11$7c6c H  sCu7L7L   L{ ML65c sZ9Bi$ i$H)i$T8i$i$Ai$1Ai8 iCi i$i$i! i$$i-c ^t|j|j|d|||S)zMerge another topological branch into the working copy. force = whether the merge was run with 'merge --force' (deprecated) T)rrrrrr$rr()rrrrs r&merger's2       r6c bt|j|jddgd||S)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)rrrrrr&)rrrs r&r_r_s2     H  r6cZt|j|jdd|S)zDo a clean update to the given commit. This involves updating to the commit and discarding any changes in the working copy. FT)rrrr&)rrs r& clean_updater*s# 388:swwye4B OOr6c ^t|j|jddd||S)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)rrrr:rr&)rr:rs r& revert_tor,s2       r6c L|xs|d}|j}|xs|j}|jj|j|jxs!|j |j k(}t ||jdd|j|||} |r| j r|j} nT|j} |j} |r6t| dk(r(|| vr$| j|| dj} | |jk(r |j} |jr9|j|j| tj|||| S|jj!|5|j|j| |jj#|j%tj|||ddd| S#1swY| SxYw)aIDo 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)r rrrr)rr isancestorr2r(r$rrrrrr*rr graftcopiesr.rrr ) rrbaser keepparentkeepconflictparentr1pctxr rpotherrs r&graftr5 s@  4:D 779D  3668D !!$))+sxxz: $ 88: #       #  Ee33++- #g,!+ NN4 QZ__&F    V,4d+ L ]] + +D 1 OODIIK 0 MM   7 7 9 :   tS$ / 2 L 2 Ls .A!HH#c|7|jd}tj||j}t |j |dd|j dS)Ns/must specify parent of merge commit to back outTF)rrrVr )r8r ProgrammingErrorrr$rr2)rparentrr%s r&back_outr9V s_ ~ 668 DC((- -     r6c fd} |j} g} |rg} | j|_j|||} |rd}t| j}t| j }|r|rt d}|||fz}nm|rt d}||z}nZ|rt d}||z}nG|rEd} D],}||s jj|r(|dz }.|rt d }||z}| | | |_S|d z }jj|d dk(rtjt d |r~t| j | jzD]Y}|sDjjt d |z| jj|| j|[|rt dD]~}||s jj|r(|sDjjt d|z| jj || j|| | |_S#| |_wxYw)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 ||y#t$rOtd|z}rtj|jj td|zYywxYw)Ns%s cannot be removeds warning: %s )rwrr rrr})removefnrr abortonerrorrs r&rzpurge..remove sZ 6 TN 6)*T1Akk!n$ Q/0145  6s AA$#A$)r ignoredunknownNs3permanently delete %d unknown and %d ignored files?s$permanently delete %d unknown files?s$permanently delete %d ignored files?rrs1permanently delete at least %d empty directories?s (yN)$$ &Yes $$ &No)defaultsremoval cancelledsremoving file %s T)reversesremoving directory %s ) traversedirr rrr>r?rr/listdirrrr CanceledErrorr|r#r rmdir)rr:r?r>removeemptydirs removefilesr=noopconfirmroldtraversedirr  directoriesrr% nb_ignored nb_unknown dir_countr3s` ` r&purgerOf s=H6((N C7- K"-"4"4G 7GWM CV^^,JV^^,JjNO J//?@z!?@z!  $Aqz$))*;*;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,B%I>II>CII8AI I#r:rr))NFNNFTNN)NFNr)NNFFN)TFTTFFF)Brstructi18nrr2r thirdpartyrutilsr dirstateutilsrrbr r r r r r/rrrrrrrrrrrpack_packunpack_unpackr'r5r8rrrrrrrrTrWrmrqr~rrrrrrUPDATECHECK_ABORTrrrr$r'r_r*r,r5r9rOrYr6r&rZs $"   --$55pL^BAH D N ,Fllr~B "6 GT$ NSl:t     , EP2 j'   _D ",P*   IX &    k-r6