6hfSSKJr SSKrSSKrSSKJr SSKJr SSKJ r J r J r J r SSKJr SSKJrJr \ R("S S S 9rS rS rSrS+SjrS+SjrSrSrSrSrSrSr Sr!Sr"Sr#Sr$Sr%Sr&Sr'Sr(S,Sjr)Sr*Sr+S+S jr,S!r-S"r.S#r/"S$S%5r0S&r1S'r2S(r3S)r4S*r5g)-) annotationsN)_)nullrev)matchpathutilpolicyutil) stringutil)flagutilsidedata copy_tracingT)pyo3c~[UR55H up4X4:XaX# MX@;aX# MX1;dMX# M" g)z)filters out invalid copies after chainingN)listitems)srcdsttkvs 2/usr/lib/python3/dist-packages/mercurial/copies.py_filterr"s8,QWWY 6 \ \ c~UR5nUR5Hup4URXD5X#'M U$)z.chain two sets of copies 'prefix' and 'suffix')copyrget)prefixsuffixresultkeyvalues r_chainr#Cs4 [[]Flln jj. % MrcUR5HlnUR5nURUS5UR5:XaUs $U(dMDURUS5UR5:XdMjUs $ g)zreturn file context that is the ancestor of fctx present in ancestor manifest am Note: we used to try and stop after a given limit, however checking if that limit is reached turned out to be very expensive. we are better off disabling that feature.N) ancestorspathrfilenode)fctxambasemffr&s r _tracefiler,Ks`^^ vvx 66$  -K 6fjjt, <K rcURnUR5R5n[U5H=nUR U5R (aU(dM,U"U5(aM;X4 M? U$N)dirstatecopiesrr get_entrytracked)repordscrs r_dirstatecopiesr6[sV B A !W||A&&55q Hrc`UR5nUR5nURX2S9$)zComputes which files are in b but not a. This is its own function so extensions can easily wrap this call to see what files _forwardcopies is about to process. r)manifest filesnotin)abrmambs r_computeforwardmissingr?ds+ B B === ))rchURS:XagURRSS5nSnX;$)z9Checks if we should use changeset-centric copy algorithmschangeset-sidedataT experimentalscopies.read-from)schangeset-onlys compatibility)filecopiesmodeuiconfig)r3readfromchangesetsources rusechangesetcentricalgorHns7 33ww~~o/BCH;O  &&rcURn[U5(a [XU5$URR=(a URR SS5nURR nU(a U"SX4-5 UR5nUcSOUR5n0n Un UR5U:Xa`UR5R5[:Xa:[R"UR55n [R"X;5n URR SS5(a6[!UR#U55n U(aU"S[%U 5-5 O%['XU S9n U(aU"S[%U 5-5 URR(R+UR5/S S 9n [-U 5HnU(a U"S U-5 XnXlU(a[0R2"5n[5XU5nU(aU(a U"S U-5 UX'U(dMmU"S [0R2"5W- -5 M U $)z@Like _forwardcopies(), but b.rev() cannot be None (working copy)devel debug.copiess3debug.copies: looking into rename from %s to %s Nscopy-tracing.trace-all-filess+debug.copies: searching all files: %d r8s/debug.copies: missing files to search: %d T inclusives&debug.copies: tracing file: %s s%debug.copies: rename of: %s s(debug.copies: time: %f seconds )_reporH_changesetforwardcopiesrD debugflag configbooldebugr9p1p2revrmatchmodexactfilesintersectmatchersrwalklenr? changelogr%sorted_ancestrycontextr timerr,)r;r<baserr3rRdbgr)r*cmforwardmissingmatch filesmatchermissingancestrycontextr+r(startopaths r_committedforwardcopiesriws 77Dt$$&qU33 GG   O$''"4"4X"OE ''--C  Cqf LM B\Tt}}F B ttv{qttvzz|w.~~aggi0 &88M ww($CDDqvve}%  ?#g,N O(5HI  Cg,  gg''111557)t1LO G_  :Q> ?t / JJLE4V, =EFBE 5 <::<%') $ Irc^^^^URnURmURm[RmUR m[ b UUUU4SjnU$UUUU4SjnU$)zreturns a function that returns the following data given a " * p1: revision number of first parent * p2: revision number of first parent * changes: a ChangingFiles object c>T"U5upT"U5T-(a0T"U5RR[R5nOSnXU4$r.) _sidedatar sidedatamodSD_FILES)rUrSrTraw HASCOPIESINFOchangelogrevisionflagsparentss rrevinfo _revinfo_getter..revinfosJS\FBSzM)',66::;;O;OPC= rcj>T"U5upT"U5T-(aT"U5RnOSnXU4$r.)changes)rUrSrTrwrprqrrrss rrtrus:S\FBSzM)+C088G$ $r)r\ parentrevsrrr REVIDX_HASCOPIESINFOrqrustmod)r3rclrtrprqrrrss @@@@r_revinfo_getterr|s_ BmmG HHE11M,, ! !$ N % % Nrc^^0mUU4SjnU$)z&return a cached version of is_ancestorch>X:agX:XagX4nTRU5nUc T"X5=nTU'U$)NFT)r)ancdescr!retcache is_ancestors r _is_ancestor(cached_is_ancestor.._is_ancestorsD : [kiin ;*35 5C%* r)rrrs` @rcached_is_ancestorrs E  rc UR5[UR54;a0$UR5R5nURnUR nUR n[[4nURUR5/SS9nURUR5/UR5/S9n [5n Sn URRSS5n U H^n U"U 5nX:XaSn MUunnU[:waX;aU RU5 U[:wdMEUU;dMMU RU5 M` U (d0$U (a][U 5n [U 5nUR5/nURUUU SS9n[U5nU V s/sH oU;dM U PM n n UR S:XaU V s0sHoS _M nn U HAn UR#U 5H)nU[:XaMS UU 'UU;dMUU==S - ss'M+ MC [%X25nURR'5 [)U UUR5UUUU 5sSSS5 $U V s0sHo/_M nn U HHn UR#U 5H0nU[:XaM/UU 'UU;dMUUR+U 5 M2 MJ U R-5nUUR5:XdeU R/U 5 U R15 [3U5n[5U UUR5UX%5$s sn fs sn f!,(df  g=fs sn f) NTrL)commonheadsFrJscopy-tracing.multi-thread) includepathrArr)rUrr3 unfilteredr\ isancestorrev_uncheckedparentrevsr%findmissingrevssetrDrQaddrminreachablerootsrCrxr|reading_combine_changeset_copiesappendpopextendsort_revinfo_getter_extra_combine_changeset_copies_extra)r;r<rr3r{ isancestorrs graph_rootsr%revsrootshas_graph_roots multi_threadrpsrSrTmh roots_to_headchildren_countprtchildrenxs rrOrOsuuw7AEEG$$ 668   D B!!J%%GG$K aeegY$ 7I  aeegYquuwi  @D EEO77%%h0LML QZ "OFBW} " W}y "   U  J UUWI))!Q4)H M* 64a #546 33)..1Q$.A]]1%<$%q!&"1%*% &"$. ^^ # # %,& %$))5arE5)A]]1%<  =QK&&q) & HHJAEEG|| E '-. (AEEGWe  a7/& %*s$* M7M M  M: M  Mc UR5n[b"[R[U5XX65nGO[ U5n0n UGHn U"U 5upn SnSU 4SU 44GHpunnU[ :XaMUR U5nUcM)US-nUUU'U(aU R US5nOU RUS5nUc0=nnOU(aUR5nOUnU b0nUS:Xa U RnOUS:Xa U RnU(aWUR5nUR5H,unnUR U5nUb USbUSnU U4UU'M. UULdeU R(a7U RH'nUU;dM UULaUR5nU S4UU'M) UcUnGMYUS:Xde[UUUU U 5nGMs XU 'GM 0nXnUceUR5HununnUcMUUU'M U(d2[UR55HnU"U5(aMUU M U$)acombine the copies information for each item of iterrevs revs: sorted iterable of revision to visit children_count: a {parent: } mapping. targetrev: the final copies destination revision (not in iterrevs) revinfo(rev): a function that return (p1, p2, p1copies, p2copies, removed) match: a matcher It returns the aggregated copies information for `targetrev`. Nr)alwaysrzcombine_changeset_copiesrrrrrrcopied_from_p1copied_from_p2rremoved_merge_copies_dictkeys)rr targetrevrtrrr alwaysmatch final_copies all_copies current_revrSrTrwcurrent_copiesparent parent_revremaining_childrenr0 newcopies childcopiesdestsourceprevr+targetrev_itemsttfilenames rrr^s,,.K77 J7 ( 3  K%k2OBG!N)*2wB&8" (%3%7%7 %C"%-"a'"-?z*%'^^J=F'^^J=F>)++I' & I &I&"$K{&-&<&< 1&-&<&< "$*KKM ,7,=,=,?LD&#)::f#5D#/DG4G)-a/:F.CIdO -@ )666!(A I~#,#617 I0;T/B ! "1")%.N"Q;&;%7!&"# &Nu'9B'5{ #M R $/***"1"7"7"9 D,2v!%+ T"#: \..01H?? *2 rrcUR5HcupVURU5nUcX`U'M[X2XWU5upU (aU[:Xa XFS4X'MIXGS4X'MSU[:XdM_X`U'Me U$)amerge two copies-mapping together, minor and major In case of conflict, value from "major" will be picked. - `isancestors(low_rev, high_rev)`: callable return True if `low_rev` is an ancestors of `high_rev`, - `ismerged(path)`: callable return True if `path` have been merged in the current revision, return the resulting dict (in practice, the "minor" object, updated) r)rr_compare_values PICK_MAJOR) minormajorrrw current_mergerr"otherpick overwrites rrrs{{}  $ =$K-T%OD:%#0(";EK#0(";EK##d % LrcUupVUupxXW:XaXh:Xde[S4$UbUbUcX R;a[S4$UbUbUcX R;a[S4$U"Xu5(a"UbX R;a[S4$[S4$U"XW5(a"UbX R;a[S4$[S4$Uc[S4$Uc[S4$[S4$)zcompare two value within a _merge_copies_dict loop iteration return (pick, overwrite). - pick is one of PICK_MINOR, PICK_MAJOR or PICK_EITHER - overwrite is True if pick is a return of an ambiguity that needs resolution. FT) PICK_EITHERsalvaged PICK_MINORrmerged) rwrrrrmajor_tt major_valueminor_tt minor_values rrrs"H!H)))E!!  #   $$ $4  #   $$ $4 H ' '  4>>#9t# #u$ $ H ' '  4>>#9t# #u$ $  4  44rcX^^^TRnURmU4SjmUUU4SjnU$)a;return a function that return multiple data given a "i * p1: revision number of first parent * p2: revision number of first parent * p1copies: mapping of copies from p1 * p2copies: mapping of copies from p2 * removed: a list of removed files * ismerged: a callback to know if file was merged in that revision c">^TUmUU4SjnU$)Nc>UTR5;agTUnURRUR5nSnUHnUTR:wdMUS- nM US:$)NFrrr)rX_filelogrs _filenodenullid)r&r(rs nb_parentsnctxr3s rismerged=_revinfo_getter_extra..get_ismerged..ismerged>se399;&t9Dmm++DNN;GJ #!OJ? "rr)rUrrr3s @r get_ismerged+_revinfo_getter_extra..get_ismerged;s3i #rcv>T"U5upT UnURupEUR5nXXEUT"U54$r.)_copies filesremoved) rUrSrTrp1copiesp2copiesrrrsr3s rrt&_revinfo_getter_extra..revinfoKsE3i [[""$x7L4EEEr)r\rx)r3r{rtrrss` @@rrr.s) BmmG F Nrc ^0nUR5nUGHbnURUS5n U c0n [X5GH5upU"U 5uppnnX:XaSnUnO X:XdeSnUnU(d5UR5VVs0sHunnU"U5(dMUU_M nnnU nU(aWU R 5nUR5H,unnU R U5nUb USbUSnU U4UU'M. UU LdeUH'nUU;dM UU LaU R 5nU S4UU'M) UR U 5nUcUXk'GM US:Xa[ UUUU5 GM#[ UUUU5 UXk'GM8 GMe 0nXbR5HununnUcMUUU'M U$s snnf)zuversion of `_combine_changeset_copies` that works with the Google specific "extra" based storage for copy informationNrr)rr enumeraterrr_merge_copies_dict_extra)rrrrtrrrrrr0ir5rSrTrrrrrrrrrrrrr+ othercopiesrrs rrrUs J,,.K 4( >Fhk*DA->-@-@cE#JHCH-@I"KKM $/$5$5$7LD&!::f-D'DG,?!%a'(&kIdO %8 !... > F*%+KKM $%t9IaL%..+K" ) Q;,#Y H-!; H%.JMc+ pL(399;lr6  !'L < [s ?F) F) cUR5H\upEURU5nUcXPU'MUSnUSnUSUS:XaM7Xx:XdU"Xx5(aU"U5(dMXXPU'M^ g)znversion of `_merge_copies_dict` that works with the Google specific "extra" based storage for copy informationNrr)rr) rrrrrr"rnew_ttother_tts rrrsw{{}  $ =$K1XFQxHQx58#"!&33D>>#d !%rcUcUnUR5RU5nUR5c<[XR 5X#5n[ U[ URU55nU$[XX#5nU$)zgiven copies to context 'dst', finds renames from that context)r]r)r0rrrrrs rrrsD Av||~& q  8 ! ' HrcURnURR=(a URRSS5nU(aURR SX4-5 X:XdU(aU(d0$UR 5c@XR 5:Xa-U(aURR S5 [X25$URU5nXP:Xa-U(aURR S5 [XUS9nOXQ:Xa-U(aURR S5 [XUS9nOU(aURR S 5 SnUR 5[:waUn[XP5n[XQXrS9n [U5[U 5-n U H-n URU 5U RU 5:XdM)X X M/ [XU5n [U U 5n[!XU5 U$) z5find {dst@y: src@x} copy mapping for directed comparerJrKs-debug.copies: searching copies from %s to %s Ns$debug.copies: search mode: dirstate s#debug.copies: search mode: forward r8s$debug.copies: search mode: backward s$debug.copies: search mode: combined )rNrDrPrQrRrUrSr6ancestorrrrrrrr#r) ryrr3rRr;r0r`x_copiesy_copies same_keysrx_backward_renamess r pathcopiesrs 77D GG   O$''"4"4X"OE   = F  vQa uuw1;  GGMMB Ct++ 1 Av  GGMMA BE2   GGMMB C!!e4  GGMMB C 557g D!!'!!:MCM1 A||A(,,q/1KK.h5A    A& MrcU(a U(aX:Xa[5[504$UR5R5nUR5cKUR5URR 5:Xa[[ X55[504$URRSS5n[R"U5SLa[5[504$[U5(a [XX#5$US:Xa)[XU5(a [XX#5$[XX#5$[XX#5$)az Finds moves and copies between context c1 and c2 that are relevant for merging. 'base' will be used as the merge base. Copytracing is used in commands like rebase, merge, unshelve, etc to merge files that were moved/ copied in one merge parent and modified in another. For example: o ---> 4 another commit | | o ---> 3 commit that modifies a.txt | / o / ---> 2 commit that moves a.txt to b.txt |/ o ---> 1 merge base If we try to rebase revision 3 on revision 4, since there is no a.txt in revision 4, and if user have copytrace disabled, we prints the following message: ```other changed which local deleted``` Returns a tuple where: "branch_copies" an instance of branch_copies. "diverge" is a mapping of source name -> list of destination names for divergent renames. This function calls different copytracing algorithms based on config. rBrFs heuristics) branch_copiesr3rnoder/rSr6rDrEr parseboolrH_fullcopytracing_isfullcopytraceable_heuristicscopytracing)r3c1c2r`r copytracings r mergecopiesr  sB R28 33'')'')K wwyRWWY$--*:*:*<< /$< = O   ''..,?KK(E1 33t$$"33 m# $ / /#Db7 7%d99"33rcJUR5cUR5nUR5(amUR5(aXURR SS5n[ UR SUR5UR555nXC:$g)aChecks that if base, source and destination are all no-public branches, if yes let's use the full copytrace algorithm for increased capabilities since it will be fast enough. `experimental.copytrace.sourcecommitlimit` can be used to set a limit for number of changesets from c1 to base such that if number of changesets are more than the limit, full copytracing algorithm won't be used. rBscopytrace.sourcecommitlimit%d::%dF)rUrSmutablerD configintr[r)r3r r`sourcecommitlimitcommitss rrrQs| vvx UUW zz||  GG-- ; dii 488:rvvx@A** rc X;a X;aXU'ggX;agX@X0:wa[XPX`5(dgX@X0:wd$URU5URU5:waUHn XU 'M ggr.)_relatedrr) rdsts1m1m2r>r r`r renamedeleters r_checksinglesidecopiesres } = %    BG HRWdi$@$@ BG rxx} =CI >rc*\rSrSrSrSSjrSrSrg)rizaInformation about copies made on one side of a merge/graft. "copy" is a mapping from destination name -> source name, where source is in c1 and destination is in c2 or vice-versa. "movewithdir" is a mapping from source name -> destination name, where the file at source present in one context but not the other needs to be moved to destination by the merge process, because the other context moved the directory it is in. "renamedelete" is a mapping of source name -> list of destination names for files deleted in c1 that were renamed in c2 or vice-versa. "dirmove" is a mapping of detected source dir -> destination dir renames. This is needed for handling changes to new files previously grafted into renamed directories. NcpUc0OUUlUc0OUUlUc0OUUlUc0UlgUUlgr.rrdirmove movewithdir)selfrrrrs r__init__branch_copies.__init__sA,BD "."6BL$_r' !,!42+rc xSUR<SUR<SUR<SUR<S3 $)Nzr)rs r__repr__branch_copies.__repr__s. !!     r)rrrr)NNNN)__name__ __module__ __qualname____firstlineno____doc__r r#__static_attributes__rrrrrzs&GKF  rrc ^^$^%^&^'^(UR5m&UR5m'UR5m([X15n[X25nU(dU(d[5[504$0n0nUR5H&upUR U /5R U5 M( UR5H&upUR U /5R U5 M( 0n 0n 0n 0n 0n[ U5[ U5-nUHn URU 5nURU 5nU(aU(aU T&;aNU T';aH[ U5n[ U5nUU-(aUU-H nXU'XU'M Mu[UU-5X'MU T&;a4U T';a,[ U5n[ U5nUU-H nXU'XU'M MMMU(a[U UT&T'T(X#X5 MU(dM[U UT'T&T(XX5 M /m%U%U&U'U(U4Sjm$U$4SjnU$4SjnTRR(GaU"5nU"5nSnU(a2TRRSUS-SRU54-5 U(a2TRRSUS-SRU54-5 [ 5n[ 5nU R5HnURU5 M U R5HnURU5 M UR5HnURU5 M TRRS 5 SU4S U44HunnU(dMTRRS U-5 [U5HPnS nUU ;dUU ;aUS - nUU;aUS- nUU;aUS- nTRRSUUUU4-5 MR M AATRRS5 [!TXUU5unn[!TX+UU5un n![XUU!5n"[XU U5n#U"U#U 4$)aThe full copytracing algorithm which finds all the new files that were added from merge base up to the top commit and for each file it checks if this file was copied from another file. This is pretty slow when a lot of changesets are involved but will track all the copies. c>T(dlTRTT R55nTRTT R55n[X- 5n[X!- 5nTRX445 TU$r.)r:rr]r) idx addedinm1 addedinm2u1u2rrrr>r3s r_get_addedfiles)_fullcopytracing.._get_addedfilessj b$*:*:*<=I b$*:*:*<=I -.B -.B LL" "Szrc>T"S5$)Nrrr2sr"_fullcopytracing.. ?1%rc>T"S5$)Nrrr5srr6r7r8rs unmatched files in %ss %s: %s slocals sothersK all copies found (* = to merge, ! = divergent, % = renamed and deleted): sremotes on %s side: r*!%s src: '%s' -> dst: '%s' %s s! checking for directory renames )r9rrr setdefaultrrrr]rrDrPrRjoinvaluesupdate _dir_renames))r3r r r`copies1copies2inversecopies1inversecopies2rrcopy1copy2diverge renamedelete1 renamedelete2 allsourcesrdsts2u1fnu2fnr0r1headerrenamedeleteset divergesetdstssider0r+notedirmove1 movewithdir2dirmove2 movewithdir1branch_copies1branch_copies2r2rrrr>s)` @@@@@rrrs! B B B"G"G w 33NNMMO!!#r*11#6$MMO!!#r*11#6$ E EGMM^$s>'::J""3'""3' U"}BE E  5=$u}%(c %(c  -$*%%-#8GLsbyE E  5=C!$#J!$#J) ) "UBB% U "UBB% GP E &D %D ww V V+ GGMM6H#4hmmB6G"HH   GGMM6H#4hmmB6G"HH %U NN$D   d #%!((*D  " "4 (+!((*D  " "4 (+   + '09g2FGLD& GGMM-4 5F^:eDLD ?DLD'DLD 6&)Q9MM$ H  GGMM78)$7DIHl)$7DIHl"5<PN"5<PN >7 22rcv[5n0nUR5Hupx[R"U5[R"U5pX;aM7UR U 5(a)UR U 5(aUR U 5 MvX;aXiU :waUR U 5 MXU 'M UH n X;dM Xk M AU(d004$UR5V V s0sHupU S-U S-_M nn n UH%nUR RSXU4-5 M' [USS9n0nU"5HknUU;dM UHZnURU5(dMXnU[U5S-nUU;a%UUU'UR RSUU4-5 Mi Mm UU4$s sn n f)aiFinds moved directories and files that should move with them. ctx: the context for one of the sides copy: files copied on the same side (as ctx) fullcopy: files copied on the same side (as ctx), including those that merge.manifestmerge() won't care about addedfilesfn: function returning added files on the other side (compared to ctx) /s) discovered dir src: '%s' -> dst: '%s' T)reverseNs' pending file src: '%s' -> dst: '%s' ) rrrdirnamehasdirrrDrRr] startswithr[)r3rrfullcopy addedfilesfninvalidrrrdsrcddstrrrddirmove_children_firstrr+dfs rrArA-seGGNN$%%c*H,<,odaq4xT!oG>   9Q O K $GT:K ^ H +<<?? aAk1B~)+ A G "g&, K ;?s,F5c^^^UR5cUR5nTR5cTR5m[5nUR5mUR STR5TR55(d(UR R S5 [XTT5$TnUT:wa|[UR55S:Xa(UR R S5 [XTT5$URUR55 UR5nUT:waM|0n[TT5nUR5HupU T;dM XU'M UUU4Sjn UV s/sHo"U 5(dMU PM n n 0n U (Ga[R"[ 5n[R"[ 5nTR#TR55Hin [$R&R)U 5n[$R&R+U 5nUUR-U 5 UUR-U 5 Mk U Hn [$R&R)U 5n[$R&R+U 5nUUnUUnUU-nTR/U 5nUR R1SS5n[U5U:a4UR R3[5S5U [U54-5 MUH+nUR/U5n[7UU5(dM'XU'M- M [9U 5[9U504$s sn f) aAFast copytracing using filename heuristics Assumes that moves or renames are of following two types: 1) Inside a directory only (same directory name but different filenames) 2) Move from one directory to another (same filenames but different directory names) Works only when there are no merge commits in the "source branch". Source branch is commits from base up to c2 not including base. If merge is involved it fallbacks to _fullcopytracing(). Can be used by setting the following config: [experimental] copytrace = heuristics In some cases the copy/move candidates found by heuristics can be very large in number and that will make the algorithm slow. The number of possible candidates to check can be limited by using the config `experimental.copytrace.movecandidateslimit` which defaults to 100. rs?switching to full copytracing as base is not an ancestor of c2 rs0switching to full copytracing because of merges c>>UT;=(a UT;=(a UT;$r.r)r+r`r rs rr6(_heuristicscopytracing..sQb[:Q$Y:17:rrBscopytrace.movecandidateslimitsBskipping copytracing for '%s', more candidates than the limit: %d )rUrSrr9rrDrRrr[rsr@rXrr collections defaultdictrr:osr&basenamer^rfilectxrstatusrrr)r3r r r` changedfilesrrCcprrfiltr+ missingfilesrBbasenametofilenamedirnametofilenameror^ samebasename samedirnamemovecandidatesf2 maxcandidates candidatef1rs `` @rrrts2 vvx UUW vvx UUW5L B 99Y BFFH 5 5   #  "d33 C + s{{}  " GGMMN O#Db$7 7CIIK(ffh +G b !BHHJ "9CL ;D+7|!tAwA|L7G(44T:'33D9t}}/Aww''*Hggooa(G x ( / / 2 g & - -a 0 0 Aww''*Hggooa(G-h7L+G4K)K7NAB!GG--!AM>"]2;#n-. /+ ZZ *B##*+I& ,3B  !=#92 ==]8s ?M3M3ctX:XagUR5UR5p2UR5UR5pTUc [U5nUc [U5nUR5UR5pTXE:a [U5nOXT:a [U5nOX:H$MG![a gf=f)a2return True if f1 and f2 filectx have a common ancestor Walk back to common ancestor to see if the two files originate from the same file. Since workingfilectx's rev() is None it messes up the integer comparison logic, hence the pre-step check for None (f1 and f2 can only be workingfilectx's initially). TF)r%linkrevnext StopIteration)r~r{g1g2f1rf2rs rrrs x \\^R\\^::<S ;bB ;bBzz|RZZ\y"X"Xx sBB*(B** B76B7c[X!5nUR5n[X@U5 [UR 55HupVXT;dM X5 M UR 5HupxXR U5 M g)areproduce copies between base and ctx in the wctx Unlike mergecopies(), this function will only consider copies between base and ctx; it will ignore copies between base and wctx. Also unlike mergecopies(), this function will apply copies to the working copy (instead of just returning information about the copies). That makes it cheaper (especially in the common case of base==ctx.p1()) and useful also when experimental.copytrace=off. merge.update() will have already marked most copies, but it will only mark copies if it thinks the source files are related (see merge._related()). It will also not mark copies if the file wasn't modified on the local side. This function adds the copies that were "missed" by merge.update(). N)rrSrrr markcopied) wctxrr` new_copiesrr__rrs r graftcopiesrsq D&J WWYF F*% ))+, > -$$& S!'rr.)NN)6 __future__rrlrni18nrrrrrVrr r utilsr revlogutilsr r rm importrustrzrr#r,r6r?rHrir|rrOrrrrrrrrrrrrrr rrrrrArrrrrrrs#    N 6B   *'@F#L$i Xnd   >7 t$NCL$,  .  +\C4L(*$ $ NI3XD Nj>ZB"r