a &0É_µ?ã@sÂddlmZddlZddlZddlZddlZddlmZddlm Z ddl m Z m Z m Z mZmZmZmZddlmZdZd d „Zd d „Zdd d„Zddd„Zdd„Zdd„Zddd„Zdd„ZdS)é)Úabsolute_importNé)Ú_)Úgetattr)ÚconfigÚerrorÚ filemergeÚpathutilÚphasesÚpycompatÚutil)Ú stringutil)órsemptyc s@t ¡‰ˆ ¡‰d‡‡‡‡‡fdd„ ‰dˆvr6ˆdƒˆ d¡D] \}}ˆ d||ˆ d|¡¡q@i}dˆvr(z€tˆd ¡ ¡ƒD]f\}}| ¡}|sœq†z|  dd¡\}}Wn2t yât   t d ƒˆ d¡|df¡‚Yn0|||<q†Wn6ty&}z|jtjkr‚WYd}~n d}~00‡fd d „} i} ˆd  ¡D]ö\}}d } | d¡r˜d|vrtt   t dƒ¡‚|  dd¡\} }| dd…} | ¡}t |¡ ¡stˆdd} | rt | ¡} t | jpÒd |¡| _t | j¡| _t| ƒ} | | ƒ}|| kr | |ƒ}n|}| |ƒ}| ¡| |d ¡| f| t |¡<qD| S)z return a state dict, mapping subrepo paths configured in .hgsub to tuple: (source from .hgsub, revision from .hgsubstate, kind (key in types dict)) Nc s–|ˆvrzzˆ| ¡}WnLtyd}z4|jtjkr6‚ˆ tdƒˆ |¡¡WYd}~dSd}~00ˆ ||||ˆ¡nt  tdƒˆ |¡¡‚dS)Ns*warning: subrepo spec file '%s' not found s subrepo spec file '%s' not found) ÚdataÚIOErrorÚerrnoÚENOENTÚwarnrÚpathtoÚparserÚAbort)ÚfZsectionsÚremaprÚerr©ÚctxÚpÚreadÚrepoÚui©ú7/usr/lib/python3/dist-packages/mercurial/subrepoutil.pyr's  ÿÿÿzstate..readó.hgsubósubpathsó .hgsubstateó rs8invalid subrepository revision specifier in '%s' line %dc sˆ d¡D]€\}}t |¡}t dd|¡}zt |||d¡}Wq tjyˆ}z0t tdƒˆ d|¡t  |¡f¡‚WYd}~q d}~00q |S)Nr#s \\\\([0-9]+)s\\\1rs#bad subrepository pattern in %s: %s) Úitemsr Z escapestrÚreÚsubrrrÚsourceZ forcebytestr)ÚsrcÚpatternÚreplÚe)rr r!rVs  þÿÿzstate..remaprshgó[ó]s!missing ] in subrepository sourceF©Úabort)NN) rrZ configitemsÚsetZ configsourceÚ enumeraterÚ splitlinesÚlstripÚsplitÚ ValueErrorrrrrrrrr&Ú startswithr ÚurlÚisabsÚ _abssourceÚ posixpathÚjoinÚpathÚnormpathÚbytesÚstripÚgetÚpconvert)rrr>r*ZrevÚiÚlZrevisionrrÚstateÚkindÚparentZjoinedZremappedr rr!rFsh  ÿüÿ         $rFcs.‡fdd„tˆƒDƒ}| dd |¡d¡dS)z=rewrite .hgsubstate in (outer) repo with these subrepo statescs4g|],}ˆ|dtdkrdˆ|d|f‘qS)rs%s %s )Ú nullstate©Ú.0Ús©rFr r!Ú Œsþzwritestate..r$rN)ÚsortedZwwriter=)rrFÚlinesr rMr!Ú writestateŠs þrQcsÀ||kr| ¡}|j}|j}|j}i} ˆj d|||f¡d‡fdd„ } t |¡} tt |¡ƒD]–\} } |  | t ¡}| }|  | ¡  ¡rž| d| ddf}||krª|}|   ¡}| |d<| |vrˆ|| }||ksÜ||krê| | | <qbqú||kr| | d |ƒ|  | ¡  ||¡|| | <qú|d|dkrˆ| d|d <|d|d <ˆj td ƒ|d¡r†| | d |ƒ|  | ¡  ||¡|| | <nþ|d|dkrÂ| | d|ƒ|  | ¡  ||¡|| | <nÄ| | dƒ|  | ¡}| | d¡|d<| |d¡|d<ˆj tdƒ|d¡}|dkr@|  | ¡ |¡| | | <| | d|ƒnF|dkr`| | | <| | d| ƒn&|  | ¡  ||¡|| | <| | d|ƒqb||kr¬| | dƒ|  | ¡ ¡qb|t krÌ| | dƒ| | | <qbqbˆj tdƒ|d¡rb| | dƒ|  | ¡ ¡qbt| ¡ƒD]¨\} }| |vr qnŽ| |vrP| | d|ƒ|  | ¡  |¡|| | <n^||| kr|   ¡}| |d<ˆj tdƒ|d¡dkr| | d|ƒ|  | ¡  |¡|| | <qtˆ| ƒ| S)z{delegated from merge.applyupdates: merging of .hgsubstate file in working context, merging context and ancestor contextssubrepo merge %s %s %s rcs&|r d|}ˆj d|||f¡dS)Ns%s:%s:%ss subrepo %s: %s %s )rÚdebug)rLÚmsgÚr©rr r!rR szsubmerge..debugrró+ó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)Úp1ÚsubstaterrRrZ partextrasrOr Z iteritemsrBrIr(ZdirtyÚcopyZ promptchoicerZshortidÚmergeÚremover&rQ)rÚwctxZmctxZactxZ overwriteÚlabelsÚs1Ús2ZsaZsmrRZ promptssrcrLrEÚaZldZpromptsrTZsrepoZoptionr rUr!Úsubmerge”sÜ        ÿù÷      ÿø ö      ÿúø     ÿúø öÿ   rbFcsìg}tƒ}|j ¡‰d|vr¦|j|j|jfD]}d|vr.| d¡q.| ¡j}tˆ  ¡ƒD]Ê} ˆ| ƒs”| |vr~|| ˆ| <q\|s”t   t dƒ| ¡‚|  | ¡ d¡} | rÜ| dd¡sÆt j | t dƒd‚| | ¡| | ¡q\|  | ¡ ¡} ˆ| d | ˆ| d fˆ| <| | d ¡d | kr\| | ¡q\| ¡D]0} ‡fd d„| jDƒ} |‡fdd„| Dƒ7}q0|râˆdƒs–d| ¡| ¡vr–t   t dƒ¡‚|j d d¡n.csg|]}ˆ|ƒr|‘qSr r rJ)Úmatchr r!rNSrs$can't commit subrepos without .hgsub)r2rYrZZmodifiedZaddedZremovedr\rXrOÚkeysrrrr(Ú dirtyreasonZ configboolÚappendÚaddZ basestaterBÚparentsÚinsert)rr]ZstatusrfZforceZsubsZ commitsubsÚcZoldstaterLrhZbsrrTr )rfrer!Ú precommitsZ       ÿ þ     ÿ  ÿrncCs2|}t |d¡r|j}q|jtt |j¡ƒd…S)z9return path to this (sub)repo as seen from outermost repoó _subparentN)r Ú safehasattrÚ _subparentÚrootÚlenr Z normasprefix)rrHr r r!Ú reporelpathes rtcCs|jS)z7return path to this subrepo as seen from outermost repo)Z_relpath)r(r r r!Ú subrelpathmsruTcCsPt |d¡rˆt |j¡}| ¡r(t|ƒSt |j¡|_t |j |dd}|r†t t  |¡¡}t  |jpfd|j¡|_t |j¡|_t|ƒSn°d}t |d¡r |j }nV|rÂ|j dd¡rÂ|j dd¡}n4|j dd ¡rà|j dd ¡}n| ¡rötj |j¡S|r8t |¡r4t|ƒd ks(|d d …d vr4tj |¡}|S|rLt td ƒ¡‚dS)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.roFr0rNs _subtoppathspathss default-pushsdefaultrdés\/s(default path for subrepository not found)r rpr9Z _subsourcer:r@r<r?r>r;rqrCr=Z _subtoppathrrZsharedÚosÚdirnameZ sharedpathZhasdriveletterrsÚabspathrrr)rÚpushr1r)rHr>r r r!r;rs6       r;c Csìt |¡}t|ddƒ}|s|S| dd¡}|dvrDt tdƒ|¡‚|dkrP|Stj}d}t|ƒD]0}|  |¡}|  ||d¡} || krb| }|}qb||krè|dkrÈt td ƒtj |tj ||f¡‚|  td ƒtj ||f¡|S|S) NrYsphasess checksubrepos)óignoresfollowóaborts.invalid phases.checksubrepos configuration: %sr{rr|s=can't commit in %s phase conflicting %s from subrepository %ssAwarning: changes are committed in %s phase from subrepository %s ) r ÚnewcommitphaserrrrrZpublicrOr(ZphaseZ phasenamesr) rrZ commitphaserYZcheckZmaxphaseZmaxsubrLr(Zsubphaser r r!r}¢sP    ÿ  ÿýüÿ ÿ üÿr})N)F)FT)Z __future__rrrwr<r'Zi18nrr rÚrrrr r r Zutilsr rIrFrQrbrnrtrur;r}r r r r!Ús$   $ k  F 0