cg/zddlmZddlmZmZddlmZmZmZm Z m Z m Z dZ d dZ d dZdZdd Zd Z dd Zd Zy))_)hexnullrev)context mergestatemetadataphasesscmutil subrepoutilc|jdk(rd}d}||fS|jjdd}|dk7}|dv}||fS)zreturn a (changelog, filelog) boolean tuple changelog: copy related information should be stored in the changeset filelof: copy related information should be written in the file revision changeset-sidedataT experimentalscopies.write-tochangeset-only)rs compatibility)filecopiesmodeuiconfig)repowritechangesetcopywritefilecopymeta writecopiestos 4usr/lib/python3.12/site-packages/mercurial/commit.py_write_copy_metarsn  33!  0 00 8JK )->>*/   0 00Nc |j}|j|j}}|j}|j 5|j d5}t ||||\}} |jj} | dD]} | j| d|jjdk(r t|| | } |jj} |jjt!d|jj#||jj%|| |j'||j)|j)||j+| } || j-}| |jjk7r+|j/||jj1||j3|xr|j3xsd}}|j5dd t3| || t7j8|j|}| |jjk(xr||j; }|r|st=j>||||g| cdddcdddS#1swYnxYwdddy#1swYyxYw) aAdd a new revision to the target repository. Revision information is passed via the context argument. ctx.files() should list all files involved in this commit, i.e. modified/added/removed files. On merge, it may be wider than the ctx.files() to be committed, since any file nodes derived directly from p1 or p2 are excluded from the committed ctx.files(). origctx is for convert to work around the problem that bug fixes to the files list in changesets change hashes. For convert to be the identity, it can pass an origctx and this function will use the same files list when it makes sense to do so. scommit)errororigctxN)p1copiesp2copies filesadded filesremovedsextrascommitting changelog rs pretxncommitT)thrownodeparent1parent2) unfilteredp1p2userlock transaction_prepare_filesextracopypop changelog_copiesstorage_extra_with_copiestiprevrnoter delayupdateadd descriptionr"daterevregister_changesetchangelogrevisionrhookr newcommitphasephaser registernew)rctxrrr&r'r(trmnfilesr,nameoldtipnr8xp1xp2 targetphase waspublics r commitctxrJ*s@ ?? D VVXsvvxB 88:D d&&y1R"2s%I E   "    $%  >> ( (H 4&tUE:E&&(  Q012 ""2& NN     OO   GGI GGI  HHJ  1gkkm T^^**, ,  # #C)I)I#)N O668R_BFFH3S Q  "00#> dnn3355Od3ioo>O:O y   tRse <u2111s%K#H9J/ K/J8 4KK c|j}|j}t|\}}tj}t j j |} t|| |} | D]} |j| i} |jjjs?| jjD]\} }|jd}||| | < |jr| s|jj!d|j}|j#|j%|r|j'|j)|j+|j-nO|j%s.| s,|jj!d|j}nt/||| || |}|rQ|j|k(r>|j%}|j0j3|sJ|j#||r>|j5|j7|j9|j;||fS)Nsoutside-narrow-merge-actionsreusing known manifest s*reusing manifest from p1 (no file change) )r)rr&rr ChangingFilesrread _get_salvaged mark_salvaged narrowmatchalways allextrasitemsget manifestnoderdebugupdate_touchedrB update_added filesaddedupdate_removed filesremoved_process_filestouchedissubsetupdate_copies_from_p1p1copiesupdate_copies_from_p2p2copies)r@r?rrrr&rrrBmssalvageds narrow_filesfeactionrA origfiless rr+r+{s 88:D B,}|j|jd}|dk(s)||vs.|j|@|S)zzreturns a list of salvaged files returns empty list if config option which process salvaged files are not enabledr rmerge-removal-candidateyes) rlenparentsactivesortedrRkeysextrasrTappend)rrcr?rdcopy_sdfname might_removeds rrNrNs H!!%::G3s{{}%) 99;  3 3 56 " % 0 4 45O P  F*| . 7 Orc |j}|j}|j}t|\} } |j } |j } | j } | j }| j }| j }g}t|j}t|}|jjtdtj|}|j|j!z}|j#|j%|j'|D]}|jj||dz||vrB|j)|}|t*j,k(r#|j/||j1|n|t*j2k(rU|j5||j1|||||<| j7|dxsd}|j9||n|t*j:k(rU|j=||j1|||||<| j7|dxsd}|j9||n)td}td}|j?||o ||}||j1|n|j1|tA||||||| |\||<}|r?|dk(r|j5|n(|d k(r|jC|n|j=||j9||jE|Dcgc] }||vs||vs |}}tK|Dcgc] }||vs| c}}|D]}||=|jMtNk(r|jQ|n;tSjT|||||f}|D]}||r |j/|tW|||| ||jX||t[| }|S#tF$r/|jjItd ||zwxYwcc}wcc}w) Nscommitting files:  rrs/corrupted mergestate, unknown narrow action: %bsrestart the merge)hintaddedmergedstrouble committing %s! ).rr&r'r manifestctxr-rMlistremovedrnrr3rr getuipathfnmodifiedr{extendrrsortrTrCHANGE_REMOVED mark_removedrt CHANGE_ADDED mark_addedfindsetflagCHANGE_MODIFIED mark_touchedAbort _filecommit mark_mergedflagsOSErrorwarnrqr8rrZrget_removal_filter_commit_manifestr]bool) r@r?rcrBrfrrr&r'rrm1ctxm2ctxmctxmm1m2r{rlinkrevuipathfn all_filesrg narrow_actionrmsgrzfctx is_toucheddroprfrAs rr\r\s 88:D B B, ?Aa5""1%         \ B I;  GGLL67(1+E F   90s%B#P2* Q-8Q- Q2Q228Q*c|j}|j||j} |j||j} d} | | cxk(r|jk(rnnd} t|tj r|j } | | | fvr|jjd|z| |jk7r"|j||jk7s1| |jk7r$|j||jk7rd} | | fS|j|} i}|j}d}|r||k7r|j|}| }|r| |jk(s| ||vr||}| }|rO|jjd||t|fz|r||d<t||d<|j|} } n|jjtd||fzn| |jk(r| |j} } n| |jk7r|jr2|j!|jd d k(r| |j} } nw|jr2|j!|jd d k7r| |j} } n5| j#| | }| |vr| |j} } n| |vr |j} d }|jj%ddr5|jr%|j!|jdd k(rd}|j'}| |jk7s%| |jk(s|s| j)| |s|r0| | |jk(rd} nd} | j+||||| | }|| fS||vr*|j||jk7rd} | }|| fS| }|| fS)a commit an individual file as part of a larger transaction input: fctx: a file context with the content we are trying to commit manifest1: manifest of changeset first parent manifest2: manifest of changeset second parent linkrev: revision number of the changeset being created tr: current transation includecopymeta: boolean, set to False to skip storing the copy data (only used by the Google specific feature of using changeset extra as copy source of truth). ms: mergestate object output: (filenode, touched) filenode: the filenode that should be used by this changeset touched: one of: None (mean untouched), 'added' or 'modified' Nr{sreusing %s filelog entry rs %s: copy %s:%s scopyscopyrevs8warning: can't find ancestor for '%s' copied from '%s'! sfilenode-sourcesothersmergedrmFrsmerge-track-salvagedrlTr|)pathrTnullid isinstancerfilectxfilenoderrVrfile copysourcerrrrprscommonancestorsheads configbooldatacmpr5)rr manifest1 manifest2rr@includecopymetarcrvfparent1fparent2r]r"flogmetacfnamefnodecnode newfparentfparentancestorsforce_new_nodetexts rrrs> IIKE}}UDKK0H}}UDKK0HG8*t{{*$(}} Hh' ' GGMM7%? @DKK'OOE*djjl:DKK'OOE*djjl:$= 99U D D __ F E &E/( f% DKK'5=Y&%f-E!)J  GGMM.%U1LL M &W #&u:Z !%jhH GGLL+&/ "  T[[ %t{{( T[[ 99;299U+//0BCxO!)4;;hH YY[RYYu-11)<F!)4;;hH $888L ++%-t{{(--;;N ?,CD IIK IIe  !; < F 99;DDKK t{{ "  88Hd #  ?4;;&$"tR(HE '> )   6$**, F '> '>rc |j} d} |j} |j} | j} | j }|s4|j |t j| |j} |s| r| jjd|s| ro| jjtd|rd}n| j}|j||| j| j|||}|S| jjd| j}|S)amake a new manifest entry (or reuse a new one) given an initialised manifest context and precomputed list of - files: files affected by the commit - added: new entries in the manifest - drop: entries present in parents but absent of this one Create a new manifest revision, reuse existing ones if possible. Return the nodeid of the manifest revision. NsInot reusing manifest (no file change in changelog, but manifest differs) scommitting manifest )matchs;reusing manifest from p1 (listed files actually unchanged) )rr&r'r}rMdiffr matchfilesrBrrVr3rrPwriterU)r@rr?rmanifestrBr{rhas_some_narrow_actionrmdr&r'rrrrAs rrrs, 88:D B B B NN E B WWXw11$ D E R   2    Q/01 "E$$&E ZZ   OO  OO     I  O __  Irc|j}|j}|j}|j}t |j }t |ds|xsd}|xsd}|xsd}|xsd}||||f}|td|Dri}|tj||}||d<|tj||}||d<|tj||}||d<|tj||}||d<|S)z2encode copy information into a `extra` dictionnaryrNc3$K|]}|du yw)N).0xs r z%_extra_with_copies..sBMqQd]Msrrrr ) copied_from_p1copied_from_p2r{rrqr]ranyr encodecopiesencodefileindices)rr,rBr`rbrYr[ extrasentriess rr1r1s!##H##HJ==L 5== !E D !! $ #t#t'4 #+t h L@M }BMBB((9%k((9%k//zB )m11%F !-o Lr)FN)NF)F)i18nrr"rrrrrr r r rrJr+rNr\rrr1rrrrsO 1&Nb(V"^Bb\!GT r