6h SSKJr SSKrSSKrSSKJr SSKJrJr SSK J r J r "SS5rS rS rS+S jrS rS rSrSrSrS,SjrSrSrSrSrSrSrSr\"SS5r \"SS5r!\"SS5r"\"SS5r#\"SS5r$\"SS5r%\"S S5r&\"S!S5r'\"S S5r(\RR"S"5r*\RR"S#5r+S$r,S%r-S&r.S'r/S(r0S)r1S*r2g)-) annotationsN)nullrev)errorutil)flagutilsidedatac\rSrSrSrSSjrSr\S5r\ RS5r Sr S r \ RS 5rS rS r\ RS 5rSrSr\ RS5rSrSr\ RS5rSrSr\ RS5rSrSr\ RS5rSrSrSr g) ChangingFilesaNA 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. Nc[UcSOU5Ul[UcSOU5Ul[UcSOU5Ul[UcSOU5Ul[UcSOU5UlURR UR5 URR UR5 URR UR5 [UcSOU5Ul[UcSOU5Ul g)N) set_added_merged_removed_touched _salvagedupdatedict _p1_copies _p2_copies)selftouchedaddedremovedmergedsalvaged p1_copies p2_copiess 4/usr/lib/python3/dist-packages/mercurial/metadata.py__init__ChangingFiles.__init__-s "59 2V< '/Bw? '/Bw? 8#3RB T[[) T\\* T]]+Y%6rIFY%6rIFcURUR:H=(a URUR:H=(a URUR:H=(ay URUR:H=(aY URUR:H=(a9 UR UR :H=(a UR UR :H$N)rrrrrcopied_from_p1copied_from_p2)rothers r!__eq__ChangingFiles.__eq__Bs JJ%++ % < u||+ <  - < / <  -  < ##u';';;  < ##u';';; r$c[UR=(dE UR=(d2 UR=(d UR=(d UR 5$r&)boolrrrr'r(rs r!has_copies_infoChangingFiles.has_copies_infoMsN LL #{{ #}} #"" #""   r$c,[UR5$)afiles 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 r!rChangingFiles.addedWs%%r$c~S[U5;aU?URRU5 UR U5 g)Nr)varsrradd mark_touchedrfilenames r! mark_addedChangingFiles.mark_addedds1 d4j   ! (#r$c8UHnURU5 M gr&)r:r filenamesfs r! update_addedChangingFiles.update_addedjsA OOA r$c,[UR5$)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. )r2rr.s r!rChangingFiles.mergedns&&r$c~S[U5;aU?URRU5 UR U5 g)Nr)r5rrr6r7r8s r! mark_mergedChangingFiles.mark_mergedxs3 tDz !  " (#r$c8UHnURU5 M gr&)rEr=s r! update_mergedChangingFiles.update_merged~sA   Q r$c,[UR5$)aWfiles 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 )r2rr.s r!rChangingFiles.removedsD''r$c~S[U5;aU?URRU5 UR U5 g)Nr)r5rrr6r7r8s r! mark_removedChangingFiles.mark_removeds3 T "  (# (#r$c8UHnURU5 M gr&)rMr=s r!update_removedChangingFiles.update_removedA   a r$c,[UR5$)afiles 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" )r2rr.s r!rChangingFiles.salvageds((r$c~S[U5;aU?URRU5 UR U5 g)Nr)r5rrr6r7r8s r! mark_salvagedChangingFiles.mark_salvageds3 d #  8$ (#r$c8UHnURU5 M gr&)rVr=s r!update_salvagedChangingFiles.update_salvagedsA   q !r$c,[UR5$)z0files either actively modified, added or removed)r2rr.s r!rChangingFiles.toucheds''r$c\S[U5;aU?URRU5 g)Nr)r5rrr6r8s r!r7ChangingFiles.mark_toucheds% T "  (#r$c8UHnURU5 M gr&)r7r=s r!update_touchedChangingFiles.update_touchedrRr$c6URR5$r&)rcopyr.s r!r'ChangingFiles.copied_from_p1##%%r$cBS[U5;aU?XRU'g)Nr')r5r'rrsourcedests r!mark_copied_from_p1!ChangingFiles.mark_copied_from_p1 tDz )# &r$cXUR5Hup#URX25 M gr&)itemsrjrcopiesrirhs r!update_copies_from_p1#ChangingFiles.update_copies_from_p1""LLNLD  $ $V 2+r$c6URR5$r&)rrcr.s r!r(ChangingFiles.copied_from_p2rer$cBS[U5;aU?XRU'g)Nr()r5r(rrgs r!mark_copied_from_p2!ChangingFiles.mark_copied_from_p2rlr$cXUR5Hup#URX25 M gr&)rnrwros r!update_copies_from_p2#ChangingFiles.update_copies_from_p2rsr$)rrrrrrr)NNNNNNN)!__name__ __module__ __qualname____firstlineno____doc__r"r*propertyr/r propertycacherr:r@rrErHrrMrPrrVrYrr7r`r'rjrqr(rwrz__static_attributes__rr$r!r r s:(G*      & &$  ''$   !(!(F$ ! ))$ " (($ ! &&' 3 &&' 3r$r cUR5nUR5nUR5[:Xa#UR5[:Xa [ U5$UR5[:wa#UR5[:Xa [ X5$UR5[:Xa"UR5[:wa [ X SS9$UR5UR5:Xa [ X5$[ XU5$)z'compute the files changed by a revision)parent)p1p2revr _process_root_process_linear_process_merge)ctxrrs r!compute_all_files_changesrs B B vvx7rvvx72S!! W W!4r'' W W!4rq11 RVVX r''bc**r$cn[5nUR5nUHnURU5 M U$)zEcompute the appropriate changed files for a changeset with no parents)r manifestr:)rmdrr9s r!rrs1 B||~H h Ir$c"[5nUR5nUR5n/nURU5R5H_upxUSScUR U5 M!UR U5 USScUR U5 MNURU5 Ma US:Xa URn OUS:Xa URn O SU-5eUH*nXR5n U (dMU upU "X5 M, U$)zJcompute the appropriate changed files for a changeset with a single parentrrrzbad parent value %d) r rdiffrnrMappendr:r7rjrwrenamed) parent_ctx children_ctxrrparent_manifestchildren_manifestcopies_candidater9dcopied copy_inforhsrcnodes r!rr s B ))+O$--/&++,=>DDF  Q47? OOH %  # #H -tAw h')G{'' 1''4+f44u$ *224 9'OF 6 $ % Ir$cH^UR5n[5nUR5nUR5nUR5nURU5nURU5n UR5RR UR 5UR 55n U (d[/n U V s/sH#oR5U R5PM% n n /n UR5GH_umnU RTS5nUc[XLTU5 M+USSc-USSc$URT5 U RT5 MaUSScUSScURT5 MUSSbUSSbUSSb USSc>[U4SjU 55(aURT5 OqUR!T5 O_UR#TUSSS9nUR%5R'5[:XaUR!T5 OUR)T5 U RT5 GM[S5e U R5Humn[XLTU5 M U HmUTR+5nU(dMUunnUU;a+UUR-5U:XaUR/UT5 MUUU;dM]UUR-5U:XdMvUR1UT5 M U$s sn f)u_compute 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@># UHn[UT5SLv M g7fr&_find.0mar9s r! !_process_merge..sISr5X.d:S)fileid unreachable)repor rr changelogcommonancestorsheadsnoderrnpop_process_other_unchangedr:rrManyrVr7filectxrrrErfilenoderjrw)p1_ctxp2_ctxrrrmp1mp2mdiff_p1diff_p2cahsrmascopy_candidatesd1d2fctxrrhrr9s @r!rr.s^ 88:D B A // C // ChhqkGhhqkG 88:   4 4 v{{} D y-1 2T88:a= ! ! #TC 2O  " [[4 ( : $Rh ;!uQxBqE!H$4 h'&&x0Aq!beAh&6)Aq%"Q%(*>a58#r!uQx'7ISIII((21<<Aq<BDwwy}}'11x0&&x0,m+uI(P  " (B7($M))+ 9'OFGF6N$;$;$=$H&&vx86!fVn&=&=&?7&J&&vx8$ Iy 3s*Lc6X;agURU5S$)z%return the associate filenode or NoneNrfind)rr9s r!rrs == "1 %%r$c^^USSmUSSnTb1Uc.[UU4SjU55(aURT5 ggTc0Ub-[U4SjU55(aURT5 ggTbUbgS5e)Nrrc3D># UHn[UT5T:X+v M g7fr&r)rrr9 source_nodes r!r+_process_other_unchanged..sD"5X&+5s c3@># UHn[UT5SLv M g7fr&rrs r!rrs=2uR"$.rr)rrMrV)rrr9r target_noders ` @r!rrsq'!*Kq'!*K;#6 DD D D OOH % E  !8 == = =   X & >  [%<  $m#ur$c.^[U4SjU55$)Nc3@># UHn[UT5SLv M g7fr&rrs r!r._missing_from_all_ancestors.. s9SruR"d*Srall)rr9s `r!_missing_from_all_ancestorsr s 9S9 99r$c^/nUR5H>m[U4SjUR555(aM-URT5 M@ U$)z-return the list of files added in a changesetc3.># UH nTU;v M g7fr&r)rpr?s r!r-computechangesetfilesadded..s1=a16=s)filesrparentsr)rrr?s @r!computechangesetfilesaddedrsA E YY[13;;=111 LLO Lr$c^^^^^^UbUummmmO@TR5mTR5mTR5mTR5m[RUUU4Sj5mUUU4SjnU$)areturn 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. c >TR5nTR5nTR5RRX5nU(d[/nUVs/sH$nTR5UR 5PM& sn$s snfr&)rrrrrr)p1np2nrrrrrs r!rget_removal_filter..mas:sjggiggixxz##88B9D267$Q 1 &&($777s+B c>^TT;a'TT;=(a [UU4SjT"555$TT;a[UU4SjT"555$g)Nc3># UH4nTU;=(a# URT5TRT5:Hv M6 g7fr&r)rrr?m1s r!rAget_removal_filter..deletionfromparent..Es5'?DR4BGGAJ"''!*44u# UH4nTU;=(a# URT5TRT5:Hv M6 g7fr&r)rrr?m2s r!rrIs2LeqBw;2771:#;;erTr)r?rrrs`r!deletionfromparent.get_removal_filter..deletionfromparentCsP 7B;3'?Bu'$ "WLceLL Lr$)rrrr cachefunc)rxrrrrrrs` @@@@@r!get_removal_filterrsf2 }BB VVX VVX [[] [[] ^^88 r$c/nUR5HnX ;dM URU5 M U(a+[U5nUVs/sHoC"U5(aMUPM nnU$s snf)z/return the list of files removed in a changeset)rrr)rrr?rfrs r!computechangesetfilesremovedrPs[G YY[ < NN1   $%3gRU1g3 N4s A&A&c>/n[UR55S:aU$UR5HgnX ;dM XnURRUR5nUSUR 5R :wdMVURU5 Mi U$)z.return the list of files merged in a changesetrr)lenrr_filelog _filenodernullidr)rrr?rrs r!computechangesetfilesmergedr\s~ F 3;;=A YY[ 86Dmm++DNN;GqzSXXZ... a  Mr$c0n0nUR5nUR5nURR5nUR 5HznU"U5(aX`;aMXR 5nU(dM2UupX;aX8R 5U :XaXU'MWX;dM^XHR 5U :XdMvXU'M| X4$)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}` )rr_repo narrowmatchrrr) rp1copiesp2copiesrrrdstrsrcrs r!computechangesetcopiesrjsHH B B))'')Kyy{33> !!#   9))+w6SM Y27++-8SM  r$c/n[U5H$up4XA;dM URSX1U4-5 M& [U5[U5:wa[R"S5eSR U5$)Ns%d%ss(some copy targets missing from file list ) enumeraterrrProgrammingErrorjoin)rrprnirs r! encodecopiesrsn EE" = LLa%55 6# 5zS[ $$ 7   ::e r$c0nU(dU$URS5H)nURS5upE[U5nXnXRU'M+ U$![[4a gf=f)Nr)splitint ValueError IndexError)rdatarplstrindexrrrs r! decodecopiesr sm ME"AGGENMHH A(C3K #   #s A ?A A A c[U5n/n[U5H up4XA;dM URSU-5 M" SRU5$)Ns%dr)rrrr)rsubsetindicesrr?s r!encodefileindicesrsG [FG%  ; NN519 %! ::g r$c/nU(dU$URS5H8n[U5nUS:dU[U5:a gURX5 M: U$![[ 4a gf=f)Nrr)rrrrrr)rrr r rs r!decodefileindicesrsr M 5)HH A1uSZ MM%( # *   #s A5AAA/.A/11100r00100010000110010000101001110z>Lz>bLLc4[UR5nURURR 55 URUR R 55 [ U5n[U5VVs0sHup#X2_M nnnSUS'[R[U55/nSnUGH#n[U5nXg- nSnX0R;a U[-nOcX0R;a U[-nOJX0R;a U[ -nO1X0R";a U[$-nOX0R;a U[&-nSn X0R;a%U[(-nURR+U5n O3X0R ;a$UR R+U5n U[,-nXIn UR/[0RXU 55 GM& UR3U5 [4R6SR9U50$s snnf)Nrr$)rrrr'valuesr(sortedr INDEX_HEADERpackrr ADDED_FLAGr MERGED_FLAGr REMOVED_FLAGr SALVAGED_FLAG TOUCHED_FLAGCOPIED_FROM_P1_FLAGgetCOPIED_FROM_P2_FLAGr INDEX_ENTRYextend sidedatamodSD_FILESr) r all_filesrr?file_idxchunksfilename_length filename_sizeflagrccopy_idxs r!encode_files_sidedatar1sEMM"I U))0023 U))0023y!I#,Y#78#7!#7H8HTNI/ 0FO A (  J D ,,  K D --  L D .. M !D --  L D $$ $ ' 'D''++A.D && &''++A.D ' 'D> k&&thGH/0 MM)  #((6"2 33?9sHc`[5nUR[R5nUcU$/n/n[ U5[ R :de[ RUS5Sn[ R nU[R U--nUn[ U5U:de[U5GHcn [RX&5upn X- n X(U n X- n[ U 5U:XdeU[R - nU nURU 5 U [-[:XaURU 5 OU [-[:XaURU 5 OhU [-[ :XaUR#U 5 OEU [-[$:XaUR'U 5 O"U [-[(:XaUR+U 5 SnU [,-[.:Xa UR0nOU [,-[2:Xa UR4nUcGMPURXU 45 GMf UHupn U"XLU 5 M U$Nr)r r$r(r)rrsize unpack_fromr&ranger ACTION_MASKrr:rrEr rMr!rVr"r7 COPIED_MASKr#rjr%rw)r rrawrpr* total_filesoffsetfile_offset_basefile_offset_lastidxr/file_endr0r9filesizers r!decode_files_sidedatarAs B ,,{++ ,C { FI s8|(( (( (**3215K   F!1!1K!?@' s8' '' '[!#.#:#:3#G $1.8}(((+"""#" +  + MM( # K ; . NN8 $ K < / OOH % K = 0   X & K < / OOH % + !4 4++F K #6 6++F   MM6X6 77":'-"(y"H-'- Ir$cNXn[U5n[U5UR4$r&)rr1r/)srcreporrrs r! _getsidedatarD+s) ,C %c *E  ')>)> >>r$cX[X5upEU(a[ROSnXFS44$r3)rD sidedataflagREVIDX_HASCOPIESINFO)rrevlogrexisting_sidedatar r/ flags_to_adds r!copies_sidedata_computerrK1s, ,T 7H8G<44QL A& &&r$cUR5 UR5nUbB[X5nURXE45 UR5 UR5nUbMBUR 5 g)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)acquirer$rDputrelease)rC revs_queuesidedata_queuetokensrrs r!_sidedata_workerrS7sb NN .. C /G)C;'nn /  NNr$2c^^ ^ ^ SSKJn URUR5n[R "U[ -5m [R"5n[R"5m URbeURR5HnURU5 M [U5HnURS5 M /n[U5HBnXT T 4n[R"[US9n URU 5 U R!5 MD 0m U U U 4Sjn U $)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>T RUS5nUc5T R5upTXR:waUT U'T R5upTXR:waMT R5 UupgSnU(a[RnXhS44$r3)rr$rOrFrG) rrHr old_sidedatarrr r/new_flag sidedataqstagingrRs r!sidedata_companion6_get_worker_sidedata_adder..sidedata_companionys}{{3% < mmoGA(! #--/( $(! #88HA&&r$)rV _numworkersuimultiprocessingBoundedSemaphoreBUFF_PER_WORKERQueue filternamerrevsrNr6ProcessrSrstart)rCdestreporV nbworkersrevsqrr allworkersrXwr^r\r]rRs @@@r!_get_worker_sidedata_adderrpQs ""7::.I  - -i/.I JF  ! ! #E%%'I    %% %   # # % ! &9  $J 9  62  # #+;$ G!  G'" r$)rr&)3 __future__rrcstructrrr`rr revlogutilsrrFr r(r rrrrrrrrrrrrrr rrrr7rrr r!r"r8r#r%Structrr&r1rArDrKrSrerprr$r!rus0#   P3P3f+$"Jyx&$6:4n  4 "&*a Q  *a :q! J" :q! $l $l$l}}T" mmF# $4N3l? ' .9r$