Eٌ(ddlZddlZddlmZddlmZmZddlmZ m Z GddZ dZ d Zd*d Zd Zd Zd ZdZdZd+dZdZdZdZdZdZdZdZeddZeddZeddZ eddZ!eddZ"eddZ#eddZ$ed dZ%eddZ&ejNd!Z(ejNd"Z)d#Z*d$Z+d%Z,d&Z-d'Z.d(Z/d)Z0y),N)nullrev)errorutil)flagutilsidedataceZdZdZ ddZdZedZejdZ dZ dZ ejd Z d Zd Zejd Zd ZdZejdZdZdZejdZdZdZejdZdZdZejdZdZdZy) ChangingFilesazA class recording the changes made to files by a changeset Actions performed on files are gathered into 3 sets: - added: files actively added in the changeset. - merged: files whose history got merged - removed: files removed in the revision - salvaged: files that might have been deleted by a merge but were not - touched: files affected by the merge and copies information is held by 2 mappings - copied_from_p1: {"": ""} mapping for copies - copied_from_p2: {"": ""} mapping for copies See their inline help for details. Nct|dn||_t|dn||_t|dn||_t|dn||_t|dn||_|jj |j|jj |j|jj |jt|dn||_t| d|_ y||_ y)N) set_added_merged_removed_touched _salvagedupdatedict _p1_copies _p2_copies)selftouchedaddedremovedmergedsalvaged p1_copies p2_copiess 6usr/lib/python3.12/site-packages/mercurial/metadata.py__init__zChangingFiles.__init__,s "59 2V< '/Bw? '/Bw? 8#3RB T[[) T\\* T]]+Y%6rIFY%6rFIFcx|j|jk(xr|j|jk(xr|j|jk(xrj|j|jk(xrO|j|jk(xr4|j |j k(xr|j |j k(SN)rrrrrcopied_from_p1copied_from_p2)rothers r__eq__zChangingFiles.__eq__As JJ%++ % < u||+ <  - < / <  -  < ##u';';;  < ##u';';; r!ct|jxs6|jxs(|jxs|jxs |j Sr#)boolrrrr$r%rs rhas_copies_infozChangingFiles.has_copies_infoLsN LL #{{ #}} #"" #""   r!c,t|jS)aKfiles actively added in the changeset Any file present in that revision that was absent in all the changeset's parents. In case of merge, this means a file absent in one of the parents but existing in the other will *not* be contained in this set. (They were added by an ancestor) ) frozensetrr*s rrzChangingFiles.addedVs%%r!czdt|vr|`|jj||j |y)Nr)varsrradd mark_touchedrfilenames r mark_addedzChangingFiles.mark_addedcs1 d4j   ! (#r!c4|D]}|j|yr#)r4r filenamesfs r update_addedzChangingFiles.update_addedisA OOA r!c,t|jS)zfiles actively merged during a merge Any modified files which had modification on both size that needed merging. In this case a new filenode was created and it has two parents. )r-rr*s rrzChangingFiles.mergedms&&r!czdt|vr|`|jj||j |y)Nr)r/rrr0r1r2s r mark_mergedzChangingFiles.mark_mergedws3 tDz !  " (#r!c4|D]}|j|yr#)r<r6s r update_mergedzChangingFiles.update_merged}sA   Q r!c,t|jS)afiles actively removed by the changeset In case of merge this will only contain the set of files removing "new" content. For any file absent in the current changeset: a) If the file exists in both parents, it is clearly "actively" removed by this changeset. b) If a file exists in only one parent and in none of the common ancestors, then the file was newly added in one of the merged branches and then got "actively" removed. c) If a file exists in only one parent and at least one of the common ancestors using the same filenode, then the file was unchanged on one side and deleted on the other side. The merge "passively" propagated that deletion, but didn't "actively" remove the file. In this case the file is *not* included in the `removed` set. d) If a file exists in only one parent and at least one of the common ancestors using a different filenode, then the file was changed on one side and removed on the other side. The merge process "actively" decided to drop the new change and delete the file. Unlike in the previous case, (c), the file included in the `removed` set. Summary table for merge: case | exists in parents | exists in gca || removed (a) | both | * || yes (b) | one | none || yes (c) | one | same filenode || no (d) | one | new filenode || yes )r-rr*s rrzChangingFiles.removedsD''r!czdt|vr|`|jj||j |y)Nr)r/rrr0r1r2s r mark_removedzChangingFiles.mark_removeds3 T "  (# (#r!c4|D]}|j|yr#)rAr6s rupdate_removedzChangingFiles.update_removedA   a r!c,t|jS)a.files that might have been deleted by a merge, but still exists. During a merge, the manifest merging might select some files for removal, or for a removed/changed conflict. If at commit time the file still exists, its removal was "reverted" and the file is "salvaged" )r-rr*s rrzChangingFiles.salvageds((r!czdt|vr|`|jj||j |y)Nr)r/rrr0r1r2s r mark_salvagedzChangingFiles.mark_salvageds3 d #  8$ (#r!c4|D]}|j|yr#)rGr6s rupdate_salvagedzChangingFiles.update_salvagedsA   q !r!c,t|jS)z0files either actively modified, added or removed)r-rr*s rrzChangingFiles.toucheds''r!cXdt|vr|`|jj|y)Nr)r/rrr0r2s rr1zChangingFiles.mark_toucheds% T "  (#r!c4|D]}|j|yr#)r1r6s rupdate_touchedzChangingFiles.update_touchedrDr!c6|jjSr#)rcopyr*s rr$zChangingFiles.copied_from_p1##%%r!c@dt|vr|`||j|<y)Nr$)r/r$rrsourcedests rmark_copied_from_p1z!ChangingFiles.mark_copied_from_p1" tDz )# &r!cX|jD]\}}|j||yr#)itemsrUrcopiesrTrSs rupdate_copies_from_p1z#ChangingFiles.update_copies_from_p1&"LLNLD&  $ $VT 2+r!c6|jjSr#)rrOr*s rr%zChangingFiles.copied_from_p2rPr!c@dt|vr|`||j|<y)Nr%)r/r%rrRs rmark_copied_from_p2z!ChangingFiles.mark_copied_from_p2rVr!cX|jD]\}}|j||yr#)rXr_rYs rupdate_copies_from_p2z#ChangingFiles.update_copies_from_p2r\r!)NNNNNNN)__name__ __module__ __qualname____doc__r r'propertyr+r propertycacherr4r9rr<r>rrArCrrGrIrr1rMr$rUr[r%r_rar r!rr r s:(G*      & &$  ''$   !(!(F$ ! ))$ " (($ ! &&' 3 &&' 3r!r c|j}|j}|jtk(r"|jtk(r t |S|jtk7r#|jtk(r t ||S|jtk(r%|jtk7rt ||dS|j|jk(r t ||St |||S)z'compute the files changed by a revision)parent)p1p2revr _process_root_process_linear_process_merge)ctxrkrls rcompute_all_files_changesrrs B B vvx7rvvx72S!! W W!4r3'' W W!4r3q11 RVVX r3''b"c**r!cjt}|j}|D]}|j||S)zEcompute the appropriate changed files for a changeset with no parents)r manifestr4)rqmdrtr3s rrnrns1 B||~H h Ir!c t}|j}|j}g}|j|jD][\}}|dd|j | |j ||dd|j |K|j|]|dk(r |j} n|dk(r |j} n Jd|z|D]&}||j} | s| \} } | | |(|S)zJcompute the appropriate changed files for a changeset with a single parentrrrizbad parent value %d) r rtdiffrXrAappendr4r1rUr_renamed) parent_ctx children_ctxrjruparent_manifestchildren_manifestcopies_candidater3dcopied copy_inforSsrcnodes rroros B ))+O$--/&++,=>DDF ! Q47? OOH %  # #H -tAw h')G{'' 1''4+f44u$ *224 'OFG 68 $ % Ir!c|j}t}|j}|j}|j}|j|}|j|} |jjj |j |j } | stg} | D cgc]#} |j| j%} } g} |jD]O\}| jd}|t|| |*|dd+|dd#|j| j]|dd|dd|j|dd|dd|dd|dd8tfd| Dr|jns|j!na|j#|dd}|j%j'tk(r|j!n|j)| jKJd| jD]\}t|| || D]x|j+}|s|\}}||vr)||j-|k(r|j/|K||vsP||j-|k(sg|j1|z|Scc} w)ucompute the appropriate changed files for a changeset with two parents This is a more advance case. The information we need to record is summarise in the following table: ┌──────────────┬──────────────┬──────────────┬──────────────┬──────────────┐ │ diff ╲ diff │ ø │ (Some, None) │ (None, Some) │ (Some, Some) │ │ p2 ╲ p1 │ │ │ │ │ ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤ │ │ │🄱 No Changes │🄳 No Changes │ │ │ ø │🄰 No Changes │ OR │ OR │🄵 No Changes │ │ │ │🄲 Deleted[1] │🄴 Salvaged[2]│ [3] │ ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤ │ │🄶 No Changes │ │ │ │ │ (Some, None) │ OR │🄻 Deleted │ ø │ ø │ │ │🄷 Deleted[1] │ │ │ │ ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤ │ │🄸 No Changes │ │ │ 🄽 Touched │ │ (None, Some) │ OR │ ø │🄼 Added │OR 🅀 Salvaged │ │ │🄹 Salvaged[2]│ │ (copied?) │ (copied?) │ ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤ │ │ │ │ 🄾 Touched │ 🄿 Merged │ │ (Some, Some) │🄺 No Changes │ ø │OR 🅁 Salvaged │OR 🅂 Touched │ │ │ [3] │ │ (copied?) │ (copied?) │ └──────────────┴──────────────┴──────────────┴──────────────┴──────────────┘ Special case [1]: The situation is: - parent-A: file exists, - parent-B: no file, - working-copy: no file. Detecting a "deletion" will depend on the presence of actual change on the "parent-A" branch: Subcase 🄱 or 🄶 : if the state of the file in "parent-A" is unchanged compared to the merge ancestors, then parent-A branch left the file untouched while parent-B deleted it. We simply apply the change from "parent-B" branch the file was automatically dropped. The result is: - file is not recorded as touched by the merge. Subcase 🄲 or 🄷 : otherwise, the change from parent-A branch were explicitly dropped and the file was "deleted again". From a user perspective, the message about "locally changed" while "remotely deleted" (or the other way around) was issued and the user chose to deleted the file. The result: - file is recorded as touched by the merge. Special case [2]: The situation is: - parent-A: no file, - parent-B: file, - working-copy: file (same content as parent-B). There are three subcases depending on the ancestors contents: - A) the file is missing in all ancestors, - B) at least one ancestor has the file with filenode ≠ from parent-B, - C) all ancestors use the same filenode as parent-B, Subcase (A) is the simpler, nothing happend on parent-A side while parent-B added it. The result: - the file is not marked as touched by the merge. Subcase (B) is the counter part of "Special case [1]", the file was modified on parent-B side, while parent-A side deleted it. However this time, the conflict was solved by keeping the file (and its modification). We consider the file as "salvaged". The result: - the file is marked as "salvaged" by the merge. Subcase (C) is subtle variation of the case above. In this case, the file in unchanged on the parent-B side and actively removed on the parent-A side. So the merge machinery correctly decide it should be removed. However, the file was explicitly restored to its parent-B content before the merge was commited. The file is be marked as salvaged too. From the merge result perspective, this is similar to Subcase (B), however from the merge resolution perspective they differ since in (C), there was some conflict not obvious solution to the merge (That got reversed) Special case [3]: The situation is: - parent-A: file, - parent-B: file (different filenode as parent-A), - working-copy: file (same filenode as parent-B). This case is in theory much simple, for this to happens, this mean the filenode in parent-A is purely replacing the one in parent-B (either a descendant, or a full new file history, see changeset). So the merge introduce no changes, and the file is not affected by the merge... However, in the wild it is possible to find commit with the above is not True. For example repository have some commit where the *new* node is an ancestor of the node in parent-A, or where parent-A and parent-B are two branches of the same file history, yet not merge-filenode were created (while the "merge" should have led to a "modification"). Detecting such cases (and not recording the file as modified) would be a nice bonus. However do not any of this yet. Nrrc3:K|]}t|duywr#_find.0mar3s r z!_process_merge..sISr5X.d:S)fileid unreachable)repor rtrw changelogcommonancestorsheadsnoderrXpop_process_other_unchangedr4rxrAanyrGr1filectxrlrmr<ryfilenoderUr_)p1_ctxp2_ctxrqrrump1mp2mdiff_p1diff_p2cahsrmascopy_candidatesd1d2fctxrrSrr3s @rrprp-s^ 88:D B A // C // ChhqkGhhqkG 88:   4 4 v{{} D y-1 2T388:a= ! ! #TC 2O  " [[4 ( : $Rh ;!uQxBqE!H$4 h'&&x0Aq!beAh&6)Aq%"Q%(*>a58#r!uQx'7ISII((21<<Aq<BDwwy}}'11x0&&x0,m+uM(T  " S(B7($M))+ 'OFGF6N$;$;$=$H&&vx86!fVn&=&=&?7&J&&vx8$ I} 3s(K5c4||vry|j|dS)z%return the associate filenode or NoneNrfind)rtr3s rrrs!x == "1 %%r!c|dd|dd}*|(tfd|Dr|jyy)|'tfd|Dr|jyy|yJd)Nrrc3>K|]}t|k( ywr#r)rrr3 source_nodes rrz+_process_other_unchanged..s!D"5X&+55sc3:K|]}t|duywr#rrs rrz+_process_other_unchanged..s=2uR"$.rr)rrArG)rurr3rw target_noders ` @rrrsq'!*Kq'!*K;#6 DD D OOH % E  !8 == =   X & >  [%<  $m#ur!c,tfd|DS)Nc3:K|]}t|duywr#rrs rrz._missing_from_all_ancestors..s9SruR"d*Srall)rr3s `r_missing_from_all_ancestorsr s 9S9 99r!cg}|jD]6tfd|jDr&|j8|S)z-return the list of files added in a changesetc3&K|]}|v ywr#r )rpr8s rrz-computechangesetfilesadded..s1=a16=s)filesrparentsrx)rqrr8s @rcomputechangesetfilesaddedrs> E YY[13;;=11 LLO Lr!c||\n@jjjjtjfdfd}|S)a<return a function to detect files "wrongly" detected as `removed` When a file is removed relative to p1 in a merge, this function determines whether the absence is due to a deletion from a parent, or whether the merge commit itself deletes the file. We decide this by doing a simplified three way merge of the manifest entry for the file. There are two ways we decide the merge itself didn't delete a file: - neither parent (nor the merge) contain the file - exactly one parent contains the file, and that parent has the same filelog entry as the merge ancestor (or all of them if there two). In other words, that parent left the file unchanged while the other one deleted it. One way to think about this is that deleting a file is similar to emptying it, so the list of changed files should be similar either way. The computation described above is not done directly in _filecommit when creating the list of changed files, however it does something very similar by comparing filelog nodes. cj}j}jjj||}|stg}|Dcgc]#}j|j %c}Scc}wr#)rrrrrrt)p1np2nrrrqrkrls rrzget_removal_filter..mas;slggiggixxz##88cB9D267$Q 1 &&($777s(Bcvr vxrtfdDSvrtfdDSy)Nc3pK|]-}|vxr#|jjk(/ywr#r)rrr8m1s rrzAget_removal_filter..deletionfromparent..Fs6'?DR4BGGAJ"''!*44u36c3pK|]-}|vxr#|jjk(/ywr#r)rrr8m2s rrzAget_removal_filter..deletionfromparent..Js3LeqBw;2771:#;;erTr)r8rrrs`rdeletionfromparentz.get_removal_filter..deletionfromparentDsP 7B;3'?Bu'$ "WLceLL Lr!)rkrlrtr cachefunc)rqxrrrrrkrls` @@@@@rget_removal_filterrsf2 }BB VVX VVX [[] [[] ^^88 r!cg}|jD]}||vs|j||r#t|}|Dcgc] }||r |}}|Scc}w)z/return the list of files removed in a changeset)rrxr)rqrr8rfrs rcomputechangesetfilesremovedrQs]G YY[ C< NN1   $%3gRU1g3 N4s A Ac2g}t|jdkr|S|jD]c}||vs||}|jj|j}|d|j j k7sS|j|e|S)z.return the list of files merged in a changesetrir)lenrr_filelog _filenodernullidrx)rqrr8rrs rcomputechangesetfilesmergedr]s F 3;;=A YY[ 8q6Dmm++DNN;GqzSXXZ... a  Mr!ci}i}|j}|j}|jj}|j D]k}||r||vr||j }|s&|\}} ||vr||j | k(r|||<K||vsP||j | k(sg|||<m||fS)zreturn the copies data for a changeset The copies data are returned as a pair of dictionnary (p1copies, p2copies). Each dictionnary are in the form: `{newname: oldname}` )rkrl_repo narrowmatchrryr) rqp1copiesp2copiesrkrlrdstrsrcrs rcomputechangesetcopiesrksHH B B))'')Kyy{33c> S!!#  W "9C))+w6HSM BY2c7++-8HSM X r!cg}t|D]#\}}||vs |jd|||fz%t|t|k7rtjddj |S)Ns%d%ss(some copy targets missing from file list ) enumeraterxrrProgrammingErrorjoin)rrZrXirs r encodecopiesrst EE"3 &= LLa%55 6# 5zS[ $$ 7   ::e r!c i}|s|S|jdD]+}|jd\}}t|}||}|||<-|S#ttf$rYywxYw)Nr)splitint ValueError IndexError)rdatarZlstrindexrrrs r decodecopiesrss ME"AGGENMHcH A(CF3K #   #sA AA AAct|}g}t|D]\}}||vs |jd|z dj|S)Ns%dr)r rrxr)rsubsetindicesrr8s rencodefileindicesrsK [FG% 1 ; NN519 %! ::g r!c g}|s|S|jdD]6}t|}|dks|t|k\ry|j||8|S#tt f$rYywxYw)Nrr)rrrrxrr)rrrrrs rdecodefileindicesrst M 5)HH A1uSZ MM%( # *   #sA3AAA&%A&11100ri00100010000110010000101001110z>Lz>bLLc&t|j}|j|jj |j|j j t |}t|Dcic]\}}|| }}}d|d<tjt|g}d}|D]}t|}||z }d}||jvr |tz}n_||jvr |tz}nG||jvr |t z}n/||j"vr |t$z}n||jvr |t&z}d} ||jvr%|t(z}|jj+|} n2||j vr$|j j+|} |t,z}|| } |j/t0j||| !|j3|t4j6dj9|iScc}}w)Nrr!)r rrr$valuesr%sortedr INDEX_HEADERpackrr ADDED_FLAGr MERGED_FLAGr REMOVED_FLAGr SALVAGED_FLAG TOUCHED_FLAGCOPIED_FROM_P1_FLAGgetCOPIED_FROM_P2_FLAGrx INDEX_ENTRYextend sidedatamodSD_FILESr) r all_filesrr8file_idxchunksfilename_length filename_sizeflagrOcopy_idxs rencode_files_sidedatarsEMM"I U))0023 U))0023y!I#,Y#78#7!Q1#7H8HTNI/ 0FO A =(   J D %,,  K D %--  L D %.. M !D %--  L D $$ $ ' 'D''++A.D %&& &''++A.D ' 'DD> k&&t_hGH/0 MM)  #((6"2 33?9s H cNt}|jtj}||Sg}g}t |t j k\sJt j|dd}t j }|tj |zz}|}t ||k\sJt|D]^} tj||\} } } | |z } ||| } | |z }t | |k(sJ|tj z }| }|j| | tztk(r|j| n| tztk(r|j| ne| tzt k(r|j#| nC| tzt$k(r|j'| n!| tzt(k(r|j+| d}| t,zt.k(r |j0}n| t,zt2k(r |j4}|K|j|| | fa|D]\}} } ||| | |SNr)r rrrrrsize unpack_fromrrangerx ACTION_MASKrr4rr<rrArrGrr1 COPIED_MASKrrUrr_)rrurawrZr total_filesoffsetfile_offset_basefile_offset_lastidxr file_endr r3filesizers rdecode_files_sidedatars B ,,{++ ,C { FI s8|(( (( (**3215K   F!1!1K!?@' s8' '' '[!#.#:#:3#G h$$'1..8}(((+"""#" +  + MM( # K ; . NN8 $ K < / OOH % K = 0   X & K < / OOH % + !4 4++F K #6 6++F   MM68X6 77":'-"(y"H-'- Ir!cP||}t|}t||jfSr#)rrrr+)srcrepormrqrs r _getsidedatar!,s+ #,C %c *E  ')>)> >>r!cTt||\}}|rtjnd}||dffSr)r! sidedataflagREVIDX_HASCOPIESINFO)rrevlogrmexisting_sidedatarr+ flags_to_adds rcopies_sidedata_computerr(2s2 ,T3 7Ho8G<44QL lA& &&r!c|j|j}|Bt||}|j||f|j|j}|B|j y)aThe function used by worker precomputing sidedata It read an input queue containing revision numbers It write in an output queue containing (rev, ) The `None` input value is used as a stop signal. The `tokens` semaphore is user to avoid having too many unprocessed entries. The workers needs to acquire one token before fetching a task. They will be released by the consumer of the produced data. N)acquirerr!putrelease)r  revs_queuesidedata_queuetokensrmrs r_sidedata_workerr08sf NN .. C /GS)C;'nn /  NNr!2cN ddlm}|j|j}t j |t z t j}t j |jJ|jjD]}|j|t|D]}|jdg}t|D]D}|| f}t jt|} |j| | j!Fi fd} | S)zThe parallel version of the sidedata computation This code spawn a pool of worker that precompute a buffer of sidedata before we actually need themr)workerN)targetargsc j|d}|6 j\}}||k7r| |< j\}}||k7r j|\}}d}|rtj}||dffSr)rrr,r#r$) rr%rm old_sidedatarrrr+new_flag sidedataqstagingr/s rsidedata_companionz6_get_worker_sidedata_adder..sidedata_companionzs{{3% < mmoGAts(! #--/4s( $(!/ #88H(A&&r!)r3 _numworkersuimultiprocessingBoundedSemaphoreBUFF_PER_WORKERQueue filternamerrevsr+rProcessr0rxstart)r destrepor3 nbworkersrevsqrr allworkersr5wr;r9r:r/s @@@r_get_worker_sidedata_adderrLRs ""7::.I  - -i/.I JF  ! ! #E%%'I    %% %   # # % ! &9  $J 9  62  # #+;$ G!  G'" r!)rr#)1r?structrrr<rr revlogutilsrr#rrr rrrnrorprrrrrrrrrrrrrrrrrrrrrrStructrrrrr!r(r0rArLr r!rrPs1   P3P3f+$"J{|&$6:4n  4 "&*a Q  *a :q! J" :q! $l $l$lv}}T" fmmF# $4N3l? ' .9r!