q&fFddlZddlZddlZddlZddlmZmZmZmZmZm Z ddl m Z ddl m Z mZmZmZmZmZddlmZmZeeeeee gsJdZej.rddl mZmZmZmZmZmZeeeeeegsJee e e e e ffZ!d d d d d e!fdZ"ddde!d dfdZ# d*dddddd dd de$deed e!fdZ% d+d d ddddddde$d e ee ee e!ff d Z&d!Z'ddd e fd"Z(d#d$d e fd%Z) d,ddd&e$d'e$d ee fd(Z*d d d d d e+fd)Z,y)-N)AnyDictListOptionalSetTuple)_)configerror filemergepathutilphasesutil) stringutilurlutil)rsempty)context localrepomatchscmutilsubrepouictxzcontext.changectxrzuimod.uireturnc ~tjjdfd dvrdjdD])\}}jd||j d|+i}dvrb t dj jD]3\}}|j}|s |jdd\}}|||<5 d t d t ffd }i} j#d D]]\}}d } |j%drLd|vrtjtd|jdd\} }| dd} |j}t'j(|j+st-d} | rt'j(| } t/j0| j2xsd || _t/j4| j2| _t!| } || } | | k(r ||}n| }||}|j7|j9|d | f| t;j<|<`| S#t$r6tjtdjd|dzfzwxYw#t$rYwxYw)zreturn a state dict, mapping subrepo paths configured in .hgsub to tuple: (source from .hgsub, revision from .hgsubstate, kind (key in types dict)) Nc6|vr* |j}j ||||yt jtdj |z#t$r/jtdj |zYywxYw)Ns*warning: subrepo spec file '%s' not found s subrepo spec file '%s' not found)dataFileNotFoundErrorwarnr pathtoparser Abort) fsectionsremaprrpreadrepors 7/usr/lib/python3/dist-packages/mercurial/subrepoutil.pyr(zstate..readPs 8 1v{{} GGAtXud 3++784;;q>I % FGkk!n%  sA 5BB.hgsubsubpaths .hgsubstate r s8invalid subrepository revision specifier in '%s' line %dsrcrc jdD]J\}}tj|}tjdd|} tj|||d}L|S#tj $rK}t j tdjd|tj|fzd}~wwxYw)Nr,s \\\\([0-9]+)s\\\1r s#bad subrepository pattern in %s: %s) itemsr escapestrresubr r#r source forcebytestr)r/patternrepler's r*r&zstate..remap|sWW[1 MGT''-D66*Hd;D ffWdC3 $ 88 kk<=g6"//2 sA""C5AB;;Crshg[]s!missing ] in subrepository sourceFabort)NN)r r) configitemsset configsource enumerater splitlineslstripsplit ValueErrorr r#r r!rbytesr1 startswithrurlisabs _abssource posixpathjoinpathnormpathstripgetrpconvert)rrrMr/revilrevisionr&statekindparentjoinedremappedr'r(r)s`` @@@r*rVrVHs }}A 88:D"C Y^^K0J c k4book4&HIJ C !#n"5":":"<"G"G"IJ %1HHJ %&WWT1%5NHd%D  %$5U* EWWS\M c >>$ 3kk!$H"IJJ $*ID#8D**,C{{3%%'E2F V,'nnV[[-?CE '00= v!=v%*C"CCj&)iik37743Et%LdmmD!"3M6 L{"++; ;;~6Q@ A!   s+AJ/I-J/-?J,,J// J<;J<r)zlocalrepo.localrepositoryrVct|Dcgc]!}||dtdk7r d||d|fz#}}|jddj|dycc}w)z=rewrite .hgsubstate in (outer) repo with these subrepo statesr s%s %s r-rN)sorted nullstatewwriterL)r)rVsliness r* writestaterasj  8A;)A, & eAhqk1%% E   KK5  s&Awctxzcontext.workingctxmctxactx overwritelabelsc||k(r|j}|j}|j}|j}i} jjd|||fzdfd } t j |} t |jD]\} } |j| t}| }|j| jr | d| ddzf}||k(r|}| j}| |d<| |vr|| }||k(s||k(r| | | <||k(r1| | d||j| j|||| | <|d|dk7rk| d|d<|d|d <jjtd |zds| | d ||j| j|||| | <-|d|dk(r2| | d ||j| j|||| | <j| | d |j| }|j| d|d<|j|d|d<jjtd|zd}|dk(r1|j| j!|| | | <| | d||dk(r| | | <| | d| &|j| j|||| | <| | d|X||k(r*| | d|j| j#|tk(r| | d| | | <jjtd|zds| | d|j| j#t |jD]\} }| |vr | |vr0| | d||j| j||| | <?||| k7sH| j}| |d<jjtd|zddk(s| | d||j| j||| | <t%| | S)z{delegated from merge.applyupdates: merging of .hgsubstate file in working context, merging context and ancestor contextssubrepo merge %s %s %s cV|rd|z}jjd|||fzy)Ns%s:%s:%ss subrepo %s: %s %s )rdebug)r_msgrr)s r*rizsubmerge..debugs+ aA  .!S!<=rrr +ssother changed, getslosros subrepository sources for %(s)s differ you can use (l)ocal%(l)s source (%(lo)s) or (r)emote%(o)s source (%(ro)s). what do you want to do?$$ &Local $$ &Remotesprompt changed, getsother side changed, getsboth sides changedsslssrs subrepository %(s)s diverged (local revision: %(sl)s, remote revision: %(sr)s) you can (m)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s. what do you want to do?$$ &Merge $$ &Local $$ &Remotes merge withskeep local subrepo revisionsget remote subrepo revisionsremote removed, removeslocal added, keepsz local%(l)s changed subrepository %(s)s which remote%(o)s removed use (c)hanged version or (d)elete?$$ &Changed $$ &Deletes prompt removesremote added, getsz remote%(o)s changed subrepository %(s)s which local%(l)s removed use (c)hanged version or (d)elete?$$ &Changed $$ &Deletesprompt recreate)r)p1substaterrir partextrasr\r1rPr]r4dirtycopy promptchoicer shortidmergeremovera)r)rbrcrdrerfs1s2sasmri promptssrcr_rTaldpromptsrksrepooptions` r*submergers} t|wwy B B B BGGMM-tT0BBC> %%f-Jrxxz"W%1 FF1i   88A;   A$!t $B 4<A//# 71AQw!q&1qa.2 9-1A!A$!"1!"177''0 !3Q7HHQKOOAy1BqEA!A$a3Q7 9-1a./ !&qt!4!&qt!4--: Q;HHQK%%a(BqE!]A.q[BqE!;Q?HHQKOOAy1BqE!;Q? 1W !. / HHQK   )^ !) *BqE ww##.   a)* ""$oW%rrxxz"1 7  b[ !)1 - HHQKOOA BqE "Q%Z oo'GGDM$$2    a+Q/ "138tR Irzcontext.workingcommitctxstatuszscmutil.statusrzmatchmod.basematcherforcecg}t}|jj}d|vr;|j|j|j fD]}d|vs|j d|jj} t|jD]} || s0| | vr | | || <|s!tjtd| z|j| jd} | rU|jdds tj| td|j!| |j#| |j| j%} || d | || d f|| <| j'| d d | k7s|j!| |j)D]<} | jD cgc] } | |vs|  }} ||D cgc] } || s | c} z }>|r|dsAd|j|j zvrtjtd |jj+d dnVd|j vrHd|vrDd|j|jz|j zvr|j j+d d|||fScc} wcc} w)ayCalculate .hgsubstate changes that should be applied before committing Returns (subs, commitsubs, newstate) where - subs: changed subrepos (including dirty ones) - commitsubs: dirty subrepos which the caller needs to commit recursively - newstate: new state dict which the caller must write to .hgsubstate This also updates the given status argument. r+r-s#commit with new subrepo %s excludedTsuiscommitsubreposs#use --subrepos for recursive commit)hintr)NNNr s$can't commit subrepos without .hgsub)r?rorrmodifiedaddedremovedrvrnr\keysr r#r r4 dirtyreason configboolappendadd basestaterPparentsinsert)rrbrrrsubs commitsubsnewstatecoldstater_rbsr'rks r* precommitrMs DJ}}!!#HD&,,> )A"( ) 779%% ( #A8="*1+HQK++@AAE((1+11$7K}}U,=>++#EF Aq!XXa[**,'{1~r8A;q>B <<#56q9R?KKN/ #4 /AJJ "" &, ' NN >>6 "D**34::K4zz$*  ??5 !8DCC 4-#- 0B0B40HH $,,T2 rc|}t|dr|j}t|dr|jtt j |jdS)z9return path to this (sub)repo as seen from outermost reporN)rrrootlenr normasprefix)r)rXs r* reporelpathrsN F &, '"" &, ' 99S..v{{;<> ??rr4zsubrepo.abstractsubrepoc|jS)z7return path to this subrepo as seen from outermost repo)_relpath)r4s r* subrelpathrs <<rpushr=czt|drtj|j}|j r t |St j|j|_t|j|d}|rtjtj|}t j|jxsd|j|_t j|j|_t |Sd}t|dr |j}n|r9|jj!ddr|jj!dd}nr|jj!dd r|jj!dd }n9|j#r)t$jj'|j(S|rAtj*|r*t-|d k(s|d d d vrtj.|}|S|rt1j2t5d y)zreturn pull/push path of repo - either based on parent repo .hgsub info or on the top repo config. Abort or return None if no source found.rFr<rN _subtoppathspathss default-pushsdefaultrs\/s(default path for subrepository not found)rrrHrrIrFrKrNrMrJrrrQrLrrr sharedosdirname sharedpathhasdriveletterrabspathr r#r )r)rr=r5rXrMs r*rJrJst\"T__- <<>= ((5 DOOT? [[v!67F#..);V[[IFK#,,V[[9FK=  4 '##D dggnnX?77>>(O>(J7D [[]77??4??3 3 %%d+t9>T!AYf%<<<-DK kk!GHII rcztj|}t|dd}|s|S|jdd}|dvr!t j t d|z|dk(r|Stj}d}t|D]4}|j|}|j||d} || ks1| }|}6||kr}|dk(rFt j t d tj|tj||fz|jt d tj||fz|S|S) Nrosphasess checksubrepos)ignoresfollowaborts.invalid phases.checksubrepos configuration: %srr rs=can't commit in %s phase conflicting %s from subrepository %ssAwarning: changes are committed in %s phase from subrepository %s ) rnewcommitphasegetattrr r r#r publicr\r4phase phasenamesr ) rr commitphaserocheckmaxphasemaxsubr_r4subphases r*rrsf''+KsJ-H  IIi!1 2E 44kk ? @5 H   }}H F H ggaj99Xa[^, h HF  X H ++= %%k2%%h/     5   *F3  4  r)N)F)FT)-rrKr3typingrrrrrri18nr r r r rrrutilsrrr] TYPE_CHECKINGrrrmatchmodrrruimodrFSubstaterVraboolrrrrrrJintrrr*rs&     !       uUE5011 2e"e exeP6066d6 ! P %P P P  P  P SM PPp I&I& $I& I& " I&  I&  4;E H ,- I&X:@1@e@-%1J %1J 1J 1Je_ 1Jh)z)(;))r