mercurial-scm/hg: rust/hg-core/src/copy

annotate rust/hg-core/src/copy_tracing.rs @ 46568:0d840b9d200d

copies-rust: track "overwrites" directly within CopySource Overwrite are "rare enough" that explicitly keeping track of them is going to be "cheap", or at least much cheaper that issuing many `is_ancestor` calls. Even a simple implementation using no specific optimisation (eg: using the generic HashSet type) yield good result in most cases. They are interesting optimization to can do on top of that. We will implement them in later changesets. We tried different approach to speed up the overwrite detection and this one seems the most promising. Without further optimization, we already see sizable speedup on various cases. Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 5.138169 s, 4.482399 s, -0.655770 s, ? 0.8724, 12 ?s/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 5.127809 s, 4.480366 s, -0.647443 s, ? 0.8737, 12 ?s/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 4.971136 s, 4.369070 s, -0.602066 s, ? 0.8789, 12 ?s/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 1.741678 s, 1.592506 s, -0.149172 s, ? 0.9144, 8 ?s/rev However, some of the case doing a lot of overwrite get significantly slower. The one with a really problematic slowdown are the special "head reducing" merge in mozilla-try so I am not too worried about them. In addition, further changeset are going to improve the performance of all this. Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 1.343373 s, 2.119204 s, +0.775831 s, ? 1.5775, 21 ?s/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 40.314822 s, 87.824489 s, +47.509667 s, ? 2.1785, 383 ?s/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 20.048029 s, 43.304637 s, +23.256608 s, ? 2.1600, 113 ?s/rev Full benchmark below: Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000042 s, 0.000043 s, +0.000001 s, ? 1.0238, 43 ?s/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000110 s, 0.000114 s, +0.000004 s, ? 1.0364, 19 ?s/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004945 s, 0.004937 s, -0.000008 s, ? 0.9984, 4 ?s/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000192 s, 0.000339 s, +0.000147 s, ? 1.7656, 37 ?s/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000049 s, 0.000049 s, +0.000000 s, ? 1.0000, 49 ?s/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000112 s, 0.000202 s, +0.000090 s, ? 1.8036, 28 ?s/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000323 s, 0.000409 s, +0.000086 s, ? 1.2663, 409 ?s/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.010042 s, 0.011984 s, +0.001942 s, ? 1.1934, 1997 ?s/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.049813 s, 0.050820 s, +0.001007 s, ? 1.0202, 10 ?s/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.079937 s, 0.087953 s, +0.008016 s, ? 1.1003, 12 ?s/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.059412 s, 0.062902 s, +0.003490 s, ? 1.0587, 11 ?s/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.533769 s, 0.679234 s, +0.145465 s, ? 1.2725, 15 ?s/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.013147 s, 0.013095 s, -0.000052 s, ? 0.9960, 6547 ?s/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.110680 s, 0.120910 s, +0.010230 s, ? 1.0924, 10 ?s/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000085 s, 0.000087 s, +0.000002 s, ? 1.0235, 43 ?s/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000107 s, 0.000107 s, +0.000000 s, ? 1.0000, 53 ?s/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000175 s, 0.000186 s, +0.000011 s, ? 1.0629, 62 ?s/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000720 s, 0.000754 s, +0.000034 s, ? 1.0472, 83 ?s/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.010019 s, 0.010443 s, +0.000424 s, ? 1.0423, 7 ?s/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.015602 s, 0.015697 s, +0.000095 s, ? 1.0061, 10 ?s/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.058759 s, 0.063528 s, +0.004769 s, ? 1.0812, 11 ?s/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.491550 s, 0.545515 s, +0.053965 s, ? 1.1098, 8 ?s/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000087 s, 0.000089 s, +0.000002 s, ? 1.0230, 44 ?s/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000268 s, 0.000265 s, -0.000003 s, ? 0.9888, 33 ?s/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000181 s, 0.000381 s, +0.000200 s, ? 2.1050, 42 ?s/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000661 s, 0.000672 s, +0.000011 s, ? 1.0166, 96 ?s/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003256 s, 0.003497 s, +0.000241 s, ? 1.0740, 1165 ?s/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.066749 s, 0.073204 s, +0.006455 s, ? 1.0967, 12200 ?s/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.006462 s, 0.006482 s, +0.000020 s, ? 1.0031, 4 ?s/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.004919 s, 0.005066 s, +0.000147 s, ? 1.0299, 123 ?s/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.062421 s, 0.065707 s, +0.003286 s, ? 1.0526, 8 ?s/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.026633 s, 0.026800 s, +0.000167 s, ? 1.0063, 43 ?s/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.197792 s, 0.203856 s, +0.006064 s, ? 1.0307, 6 ?s/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.259970 s, 1.293394 s, +0.033424 s, ? 1.0265, 8 ?s/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 1.689184 s, 1.698239 s, +0.009055 s, ? 1.0054, 8 ?s/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.000865 s, 0.000875 s, +0.000010 s, ? 1.0116, 437 ?s/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.000893 s, 0.000891 s, -0.000002 s, ? 0.9978, 445 ?s/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000172 s, 0.000292 s, +0.000120 s, ? 1.6977, 73 ?s/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001159 s, 0.003939 s, +0.002780 s, ? 3.3986, 1969 ?s/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.031621 s, 0.033027 s, +0.001406 s, ? 1.0445, 33027 ?s/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.068571 s, 0.073703 s, +0.005132 s, ? 1.0748, 12283 ?s/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.006452 s, 0.006469 s, +0.000017 s, ? 1.0026, 4 ?s/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005443 s, 0.005278 s, -0.000165 s, ? 0.9697, 128 ?s/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.063180 s, 0.064995 s, +0.001815 s, ? 1.0287, 9 ?s/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.293564 s, 0.301041 s, +0.007477 s, ? 1.0255, 7 ?s/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.286595 s, 0.285575 s, -0.001020 s, ? 0.9964, 7 ?s/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.083256 s, 0.085597 s, +0.002341 s, ? 1.0281, 9 ?s/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.027282 s, 0.027118 s, -0.000164 s, ? 0.9940, 44 ?s/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 1.343373 s, 2.119204 s, +0.775831 s, ? 1.5775, 21 ?s/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.665737 s, 0.701479 s, +0.035742 s, ? 1.0537, 13 ?s/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 5.138169 s, 4.482399 s, -0.655770 s, ? 0.8724, 12 ?s/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.573276 s, 0.574082 s, +0.000806 s, ? 1.0014, 16 ?s/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 5.127809 s, 4.480366 s, -0.647443 s, ? 0.8737, 12 ?s/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 4.971136 s, 4.369070 s, -0.602066 s, ? 0.8789, 12 ?s/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 1.741678 s, 1.592506 s, -0.149172 s, ? 0.9144, 8 ?s/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 40.314822 s, 87.824489 s, +47.509667 s, ? 2.1785, 383 ?s/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 20.048029 s, 43.304637 s, +23.256608 s, ? 2.1600, 113 ?s/rev private : 459513 revs, 37.179470 s, 33.853687 s, -3.325783 s, ? 0.9105, 73 ?s/rev Differential Revision: https://phab.mercurial-scm.org/D9644

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 15 Dec 2020 18:04:23 +0100
parents	b6f65d90e8af
children	34827c95092c

rev	line source
45973 ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	1 use crate::utils::hg_path::HgPath;
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	2 use crate::utils::hg_path::HgPathBuf;
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	3 use crate::Revision;
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	4 use crate::NULL_REVISION;
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	5
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	6 use im_rc::ordmap::DiffItem;
46153 0a721fc457bf copies-rust: use the `entry` API for copy information too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46152 diff changeset	7 use im_rc::ordmap::Entry;
45963 0d99778af68a copies-rust: use immutable "OrdMap" to store copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45944 diff changeset	8 use im_rc::ordmap::OrdMap;
0d99778af68a copies-rust: use immutable "OrdMap" to store copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45944 diff changeset	9
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	10 use std::cmp::Ordering;
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	11 use std::collections::HashMap;
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	12 use std::collections::HashSet;
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	13 use std::convert::TryInto;
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	14
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	15 pub type PathCopies = HashMap<HgPathBuf, HgPathBuf>;
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	16
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	17 type PathToken = usize;
46129 818502d2f5e3 copies-rust: pre-introduce a PathToken type and use it where applicable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46128 diff changeset	18
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	19 #[derive(Clone, Debug, PartialEq)]
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	20 struct CopySource {
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	21 /// revision at which the copy information was added
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	22 rev: Revision,
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	23 /// the copy source, (Set to None in case of deletion of the associated
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	24 /// key)
46129 818502d2f5e3 copies-rust: pre-introduce a PathToken type and use it where applicable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46128 diff changeset	25 path: Option<PathToken>,
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	26 /// a set of previous `CopySource.rev` value directly or indirectly
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	27 /// overwritten by this one.
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	28 overwritten: HashSet<Revision>,
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	29 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	30
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	31 impl CopySource {
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	32 /// create a new CopySource
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	33 ///
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	34 /// Use this when no previous copy source existed.
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	35 fn new(rev: Revision, path: Option<PathToken>) -> Self {
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	36 Self {
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	37 rev,
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	38 path,
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	39 overwritten: HashSet::new(),
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	40 }
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	41 }
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	42
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	43 /// create a new CopySource from merging two others
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	44 ///
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	45 /// Use this when merging two InternalPathCopies requires active merging of
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	46 /// some entries.
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	47 fn new_from_merge(rev: Revision, winner: &Self, loser: &Self) -> Self {
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	48 let mut overwritten = HashSet::new();
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	49 overwritten.extend(winner.overwritten.iter().copied());
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	50 overwritten.extend(loser.overwritten.iter().copied());
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	51 overwritten.insert(winner.rev);
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	52 overwritten.insert(loser.rev);
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	53 Self {
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	54 rev,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	55 path: winner.path,
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	56 overwritten: overwritten,
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	57 }
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	58 }
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	59
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	60 /// Update the value of a pre-existing CopySource
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	61 ///
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	62 /// Use this when recording copy information from parent → child edges
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	63 fn overwrite(&mut self, rev: Revision, path: Option<PathToken>) {
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	64 self.overwritten.insert(self.rev);
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	65 self.rev = rev;
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	66 self.path = path;
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	67 }
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	68
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	69 /// Mark pre-existing copy information as "dropped" by a file deletion
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	70 ///
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	71 /// Use this when recording copy information from parent → child edges
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	72 fn mark_delete(&mut self, rev: Revision) {
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	73 self.overwritten.insert(self.rev);
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	74 self.rev = rev;
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	75 self.path = None;
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	76 }
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	77
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	78 fn is_overwritten_by(&self, other: &Self) -> bool {
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	79 other.overwritten.contains(&self.rev)
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	80 }
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	81 }
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	82
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	83 /// maps CopyDestination to Copy Source (+ a "timestamp" for the operation)
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	84 type InternalPathCopies = OrdMap<PathToken, CopySource>;
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	85
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	86 /// hold parent 1, parent 2 and relevant files actions.
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	87 pub type RevInfo<'a> = (Revision, Revision, ChangedFiles<'a>);
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	88
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	89 /// represent the files affected by a changesets
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	90 ///
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	91 /// This hold a subset of mercurial.metadata.ChangingFiles as we do not need
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	92 /// all the data categories tracked by it.
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	93 /// This hold a subset of mercurial.metadata.ChangingFiles as we do not need
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	94 /// all the data categories tracked by it.
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	95 pub struct ChangedFiles<'a> {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	96 nb_items: u32,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	97 index: &'a [u8],
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	98 data: &'a [u8],
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	99 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	100
45973 ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	101 /// Represent active changes that affect the copy tracing.
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	102 enum Action<'a> {
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	103 /// The parent ? children edge is removing a file
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	104 ///
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	105 /// (actually, this could be the edge from the other parent, but it does
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	106 /// not matters)
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	107 Removed(&'a HgPath),
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	108 /// The parent ? children edge introduce copy information between (dest,
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	109 /// source)
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	110 Copied(&'a HgPath, &'a HgPath),
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	111 }
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	112
45975 2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	113 /// This express the possible "special" case we can get in a merge
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	114 ///
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	115 /// See mercurial/metadata.py for details on these values.
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	116 #[derive(PartialEq)]
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	117 enum MergeCase {
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	118 /// Merged: file had history on both side that needed to be merged
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	119 Merged,
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	120 /// Salvaged: file was candidate for deletion, but survived the merge
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	121 Salvaged,
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	122 /// Normal: Not one of the two cases above
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	123 Normal,
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	124 }
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	125
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	126 type FileChange<'a> = (u8, &'a HgPath, &'a HgPath);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	127
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	128 const EMPTY: &[u8] = b"";
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	129 const COPY_MASK: u8 = 3;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	130 const P1_COPY: u8 = 2;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	131 const P2_COPY: u8 = 3;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	132 const ACTION_MASK: u8 = 28;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	133 const REMOVED: u8 = 12;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	134 const MERGED: u8 = 8;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	135 const SALVAGED: u8 = 16;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	136
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	137 impl<'a> ChangedFiles<'a> {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	138 const INDEX_START: usize = 4;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	139 const ENTRY_SIZE: u32 = 9;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	140 const FILENAME_START: u32 = 1;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	141 const COPY_SOURCE_START: u32 = 5;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	142
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	143 pub fn new(data: &'a [u8]) -> Self {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	144 assert!(
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	145 data.len() >= 4,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	146 "data size ({}) is too small to contain the header (4)",
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	147 data.len()
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	148 );
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	149 let nb_items_raw: [u8; 4] = (&data[0..=3])
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	150 .try_into()
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	151 .expect("failed to turn 4 bytes into 4 bytes");
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	152 let nb_items = u32::from_be_bytes(nb_items_raw);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	153
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	154 let index_size = (nb_items * Self::ENTRY_SIZE) as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	155 let index_end = Self::INDEX_START + index_size;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	156
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	157 assert!(
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	158 data.len() >= index_end,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	159 "data size ({}) is too small to fit the index_data ({})",
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	160 data.len(),
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	161 index_end
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	162 );
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	163
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	164 let ret = ChangedFiles {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	165 nb_items,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	166 index: &data[Self::INDEX_START..index_end],
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	167 data: &data[index_end..],
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	168 };
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	169 let max_data = ret.filename_end(nb_items - 1) as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	170 assert!(
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	171 ret.data.len() >= max_data,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	172 "data size ({}) is too small to fit all data ({})",
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	173 data.len(),
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	174 index_end + max_data
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	175 );
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	176 ret
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	177 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	178
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	179 pub fn new_empty() -> Self {
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	180 ChangedFiles {
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	181 nb_items: 0,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	182 index: EMPTY,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	183 data: EMPTY,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	184 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	185 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	186
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	187 /// internal function to return an individual entry at a given index
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	188 fn entry(&'a self, idx: u32) -> FileChange<'a> {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	189 if idx >= self.nb_items {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	190 panic!(
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	191 "index for entry is higher that the number of file {} >= {}",
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	192 idx, self.nb_items
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	193 )
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	194 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	195 let flags = self.flags(idx);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	196 let filename = self.filename(idx);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	197 let copy_idx = self.copy_idx(idx);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	198 let copy_source = self.filename(copy_idx);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	199 (flags, filename, copy_source)
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	200 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	201
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	202 /// internal function to return the filename of the entry at a given index
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	203 fn filename(&self, idx: u32) -> &HgPath {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	204 let filename_start;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	205 if idx == 0 {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	206 filename_start = 0;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	207 } else {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	208 filename_start = self.filename_end(idx - 1)
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	209 }
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	210 let filename_end = self.filename_end(idx);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	211 let filename_start = filename_start as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	212 let filename_end = filename_end as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	213 HgPath::new(&self.data[filename_start..filename_end])
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	214 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	215
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	216 /// internal function to return the flag field of the entry at a given
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	217 /// index
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	218 fn flags(&self, idx: u32) -> u8 {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	219 let idx = idx as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	220 self.index[idx * (Self::ENTRY_SIZE as usize)]
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	221 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	222
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	223 /// internal function to return the end of a filename part at a given index
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	224 fn filename_end(&self, idx: u32) -> u32 {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	225 let start = (idx * Self::ENTRY_SIZE) + Self::FILENAME_START;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	226 let end = (idx * Self::ENTRY_SIZE) + Self::COPY_SOURCE_START;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	227 let start = start as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	228 let end = end as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	229 let raw = (&self.index[start..end])
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	230 .try_into()
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	231 .expect("failed to turn 4 bytes into 4 bytes");
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	232 u32::from_be_bytes(raw)
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	233 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	234
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	235 /// internal function to return index of the copy source of the entry at a
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	236 /// given index
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	237 fn copy_idx(&self, idx: u32) -> u32 {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	238 let start = (idx * Self::ENTRY_SIZE) + Self::COPY_SOURCE_START;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	239 let end = (idx + 1) * Self::ENTRY_SIZE;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	240 let start = start as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	241 let end = end as usize;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	242 let raw = (&self.index[start..end])
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	243 .try_into()
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	244 .expect("failed to turn 4 bytes into 4 bytes");
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	245 u32::from_be_bytes(raw)
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	246 }
45973 ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	247
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	248 /// Return an iterator over all the `Action` in this instance.
46058 12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	249 fn iter_actions(&self, parent: Parent) -> ActionsIterator {
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	250 ActionsIterator {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	251 changes: &self,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	252 parent: parent,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	253 current: 0,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	254 }
45973 ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	255 }
45975 2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	256
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	257 /// return the MergeCase value associated with a filename
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	258 fn get_merge_case(&self, path: &HgPath) -> MergeCase {
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	259 if self.nb_items == 0 {
45975 2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	260 return MergeCase::Normal;
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	261 }
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	262 let mut low_part = 0;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	263 let mut high_part = self.nb_items;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	264
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	265 while low_part < high_part {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	266 let cursor = (low_part + high_part - 1) / 2;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	267 let (flags, filename, _source) = self.entry(cursor);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	268 match path.cmp(filename) {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	269 Ordering::Less => low_part = cursor + 1,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	270 Ordering::Greater => high_part = cursor,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	271 Ordering::Equal => {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	272 return match flags & ACTION_MASK {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	273 MERGED => MergeCase::Merged,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	274 SALVAGED => MergeCase::Salvaged,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	275 _ => MergeCase::Normal,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	276 };
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	277 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	278 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	279 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	280 MergeCase::Normal
45975 2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	281 }
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	282 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	283
45972 8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	284 /// A struct responsible for answering "is X ancestors of Y" quickly
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	285 ///
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	286 /// The structure will delegate ancestors call to a callback, and cache the
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	287 /// result.
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	288 #[derive(Debug)]
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	289 struct AncestorOracle<'a, A: Fn(Revision, Revision) -> bool> {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	290 inner: &'a A,
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	291 pairs: HashMap<(Revision, Revision), bool>,
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	292 }
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	293
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	294 impl<'a, A: Fn(Revision, Revision) -> bool> AncestorOracle<'a, A> {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	295 fn new(func: &'a A) -> Self {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	296 Self {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	297 inner: func,
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	298 pairs: HashMap::default(),
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	299 }
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	300 }
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	301
46155 fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	302 fn record_overwrite(&mut self, anc: Revision, desc: Revision) {
fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	303 self.pairs.insert((anc, desc), true);
fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	304 }
fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	305
45972 8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	306 /// returns `true` if `anc` is an ancestors of `desc`, `false` otherwise
46154 ecbb2fc9418c copies-rust: rename Oracle.is_ancestor to Oracle.is_overwrite Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46153 diff changeset	307 fn is_overwrite(&mut self, anc: Revision, desc: Revision) -> bool {
45972 8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	308 if anc > desc {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	309 false
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	310 } else if anc == desc {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	311 true
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	312 } else {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	313 if let Some(b) = self.pairs.get(&(anc, desc)) {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	314 *b
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	315 } else {
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	316 let b = (self.inner)(anc, desc);
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	317 self.pairs.insert((anc, desc), b);
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	318 b
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	319 }
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	320 }
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	321 }
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	322 }
8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	323
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	324 struct ActionsIterator<'a> {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	325 changes: &'a ChangedFiles<'a>,
46058 12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	326 parent: Parent,
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	327 current: u32,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	328 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	329
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	330 impl<'a> Iterator for ActionsIterator<'a> {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	331 type Item = Action<'a>;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	332
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	333 fn next(&mut self) -> Option<Action<'a>> {
46058 12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	334 let copy_flag = match self.parent {
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	335 Parent::FirstParent => P1_COPY,
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	336 Parent::SecondParent => P2_COPY,
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	337 };
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	338 while self.current < self.changes.nb_items {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	339 let (flags, file, source) = self.changes.entry(self.current);
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	340 self.current += 1;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	341 if (flags & ACTION_MASK) == REMOVED {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	342 return Some(Action::Removed(file));
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	343 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	344 let copy = flags & COPY_MASK;
46058 12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	345 if copy == copy_flag {
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	346 return Some(Action::Copied(file, source));
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	347 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	348 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	349 return None;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	350 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	351 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	352
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	353 /// A small struct whose purpose is to ensure lifetime of bytes referenced in
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	354 /// ChangedFiles
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	355 ///
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	356 /// It is passed to the RevInfoMaker callback who can assign any necessary
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	357 /// content to the `data` attribute. The copy tracing code is responsible for
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	358 /// keeping the DataHolder alive at least as long as the ChangedFiles object.
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	359 pub struct DataHolder<D> {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	360 /// RevInfoMaker callback should assign data referenced by the
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	361 /// ChangedFiles struct it return to this attribute. The DataHolder
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	362 /// lifetime will be at least as long as the ChangedFiles one.
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	363 pub data: Option<D>,
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	364 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	365
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	366 pub type RevInfoMaker<'a, D> =
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	367 Box<dyn for<'r> Fn(Revision, &'r mut DataHolder<D>) -> RevInfo<'r> + 'a>;
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	368
46058 12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	369 /// enum used to carry information about the parent → child currently processed
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	370 #[derive(Copy, Clone, Debug)]
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	371 enum Parent {
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	372 /// The `p1(x) → x` edge
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	373 FirstParent,
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	374 /// The `p2(x) → x` edge
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	375 SecondParent,
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	376 }
12192fdbf3ac copies-rust: move the parent token to an enum Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46057 diff changeset	377
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	378 /// A small "tokenizer" responsible of turning full HgPath into lighter
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	379 /// PathToken
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	380 ///
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	381 /// Dealing with small object, like integer is much faster, so HgPath input are
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	382 /// turned into integer "PathToken" and converted back in the end.
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	383 #[derive(Clone, Debug, Default)]
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	384 struct TwoWayPathMap {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	385 token: HashMap<HgPathBuf, PathToken>,
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	386 path: Vec<HgPathBuf>,
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	387 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	388
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	389 impl TwoWayPathMap {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	390 fn tokenize(&mut self, path: &HgPath) -> PathToken {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	391 match self.token.get(path) {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	392 Some(a) => *a,
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	393 None => {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	394 let a = self.token.len();
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	395 let buf = path.to_owned();
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	396 self.path.push(buf.clone());
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	397 self.token.insert(buf, a);
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	398 a
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	399 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	400 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	401 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	402
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	403 fn untokenize(&self, token: PathToken) -> &HgPathBuf {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	404 assert!(token < self.path.len(), format!("Unknown token: {}", token));
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	405 &self.path[token]
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	406 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	407 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	408
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	409 /// Same as mercurial.copies._combine_changeset_copies, but in Rust.
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	410 ///
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	411 /// Arguments are:
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	412 ///
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	413 /// revs: all revisions to be considered
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	414 /// children: a {parent ? [childrens]} mapping
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	415 /// target_rev: the final revision we are combining copies to
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	416 /// rev_info(rev): callback to get revision information:
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	417 /// * first parent
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	418 /// * second parent
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	419 /// * ChangedFiles
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	420 /// isancestors(low_rev, high_rev): callback to check if a revision is an
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	421 /// ancestor of another
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	422 pub fn combine_changeset_copies<A: Fn(Revision, Revision) -> bool, D>(
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	423 revs: Vec<Revision>,
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	424 mut children_count: HashMap<Revision, usize>,
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	425 target_rev: Revision,
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	426 rev_info: RevInfoMaker<D>,
45972 8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	427 is_ancestor: &A,
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	428 ) -> PathCopies {
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	429 let mut all_copies = HashMap::new();
45972 8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	430 let mut oracle = AncestorOracle::new(is_ancestor);
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	431
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	432 let mut path_map = TwoWayPathMap::default();
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	433
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	434 for rev in revs {
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	435 let mut d: DataHolder<D> = DataHolder { data: None };
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	436 let (p1, p2, changes) = rev_info(rev, &mut d);
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	437
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	438 // We will chain the copies information accumulated for the parent with
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	439 // the individual copies information the curent revision. Creating a
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	440 // new TimeStampedPath for each `rev` → `children` vertex.
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	441 let mut copies: Option<InternalPathCopies> = None;
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	442 if p1 != NULL_REVISION {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	443 // Retrieve data computed in a previous iteration
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	444 let parent_copies = get_and_clean_parent_copies(
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	445 &mut all_copies,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	446 &mut children_count,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	447 p1,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	448 );
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	449 if let Some(parent_copies) = parent_copies {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	450 // combine it with data for that revision
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	451 let vertex_copies = add_from_changes(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	452 &mut path_map,
46155 fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	453 &mut oracle,
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	454 &parent_copies,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	455 &changes,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	456 Parent::FirstParent,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	457 rev,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	458 );
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	459 // keep that data around for potential later combination
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	460 copies = Some(vertex_copies);
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	461 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	462 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	463 if p2 != NULL_REVISION {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	464 // Retrieve data computed in a previous iteration
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	465 let parent_copies = get_and_clean_parent_copies(
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	466 &mut all_copies,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	467 &mut children_count,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	468 p2,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	469 );
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	470 if let Some(parent_copies) = parent_copies {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	471 // combine it with data for that revision
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	472 let vertex_copies = add_from_changes(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	473 &mut path_map,
46155 fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	474 &mut oracle,
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	475 &parent_copies,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	476 &changes,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	477 Parent::SecondParent,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	478 rev,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	479 );
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	480
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	481 copies = match copies {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	482 None => Some(vertex_copies),
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	483 // Merge has two parents needs to combines their copy
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	484 // information.
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	485 //
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	486 // If we got data from both parents, We need to combine
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	487 // them.
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	488 Some(copies) => Some(merge_copies_dict(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	489 &path_map,
46156 7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	490 rev,
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	491 vertex_copies,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	492 copies,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	493 &changes,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	494 &mut oracle,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	495 )),
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	496 };
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	497 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	498 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	499 match copies {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	500 Some(copies) => {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	501 all_copies.insert(rev, copies);
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	502 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	503 _ => {}
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	504 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	505 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	506
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	507 // Drop internal information (like the timestamp) and return the final
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	508 // mapping.
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	509 let tt_result = all_copies
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	510 .remove(&target_rev)
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	511 .expect("target revision was not processed");
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	512 let mut result = PathCopies::default();
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	513 for (dest, tt_source) in tt_result {
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	514 if let Some(path) = tt_source.path {
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	515 let path_dest = path_map.untokenize(dest).to_owned();
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	516 let path_path = path_map.untokenize(path).to_owned();
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	517 result.insert(path_dest, path_path);
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	518 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	519 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	520 result
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	521 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	522
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	523 /// fetch previous computed information
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	524 ///
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	525 /// If no other children are expected to need this information, we drop it from
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	526 /// the cache.
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	527 ///
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	528 /// If parent is not part of the set we are expected to walk, return None.
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	529 fn get_and_clean_parent_copies(
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	530 all_copies: &mut HashMap<Revision, InternalPathCopies>,
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	531 children_count: &mut HashMap<Revision, usize>,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	532 parent_rev: Revision,
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	533 ) -> Option<InternalPathCopies> {
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	534 let count = children_count.get_mut(&parent_rev)?;
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	535 *count -= 1;
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	536 if *count == 0 {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	537 match all_copies.remove(&parent_rev) {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	538 Some(c) => Some(c),
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	539 None => Some(InternalPathCopies::default()),
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	540 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	541 } else {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	542 match all_copies.get(&parent_rev) {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	543 Some(c) => Some(c.clone()),
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	544 None => Some(InternalPathCopies::default()),
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	545 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	546 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	547 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	548
46059 dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	549 /// Combine ChangedFiles with some existing PathCopies information and return
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	550 /// the result
46155 fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	551 fn add_from_changes<A: Fn(Revision, Revision) -> bool>(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	552 path_map: &mut TwoWayPathMap,
46155 fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	553 oracle: &mut AncestorOracle<A>,
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	554 base_copies: &InternalPathCopies,
46059 dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	555 changes: &ChangedFiles,
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	556 parent: Parent,
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	557 current_rev: Revision,
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	558 ) -> InternalPathCopies {
46059 dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	559 let mut copies = base_copies.clone();
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	560 for action in changes.iter_actions(parent) {
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	561 match action {
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	562 Action::Copied(path_dest, path_source) => {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	563 let dest = path_map.tokenize(path_dest);
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	564 let source = path_map.tokenize(path_source);
46059 dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	565 let entry;
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	566 if let Some(v) = base_copies.get(&source) {
46059 dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	567 entry = match &v.path {
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	568 Some(path) => Some((*(path)).to_owned()),
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	569 None => Some(source.to_owned()),
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	570 }
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	571 } else {
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	572 entry = Some(source.to_owned());
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	573 }
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	574 // Each new entry is introduced by the children, we
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	575 // record this information as we will need it to take
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	576 // the right decision when merging conflicting copy
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	577 // information. See merge_copies_dict for details.
46153 0a721fc457bf copies-rust: use the `entry` API for copy information too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46152 diff changeset	578 match copies.entry(dest) {
0a721fc457bf copies-rust: use the `entry` API for copy information too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46152 diff changeset	579 Entry::Vacant(slot) => {
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	580 let ttpc = CopySource::new(current_rev, entry);
46153 0a721fc457bf copies-rust: use the `entry` API for copy information too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46152 diff changeset	581 slot.insert(ttpc);
0a721fc457bf copies-rust: use the `entry` API for copy information too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46152 diff changeset	582 }
0a721fc457bf copies-rust: use the `entry` API for copy information too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46152 diff changeset	583 Entry::Occupied(mut slot) => {
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	584 let ttpc = slot.get_mut();
46155 fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	585 oracle.record_overwrite(ttpc.rev, current_rev);
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	586 ttpc.overwrite(current_rev, entry);
46153 0a721fc457bf copies-rust: use the `entry` API for copy information too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46152 diff changeset	587 }
0a721fc457bf copies-rust: use the `entry` API for copy information too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46152 diff changeset	588 }
46059 dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	589 }
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	590 Action::Removed(deleted_path) => {
46059 dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	591 // We must drop copy information for removed file.
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	592 //
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	593 // We need to explicitly record them as dropped to
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	594 // propagate this information when merging two
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	595 // InternalPathCopies object.
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	596 let deleted = path_map.tokenize(deleted_path);
46152 e166e8a035a7 copies-rust: use the entry API to overwrite deleted entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46151 diff changeset	597 copies.entry(deleted).and_modify(\|old\| {
46155 fce2f20a54ce copies-rust: start recording overwrite as they happens Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46154 diff changeset	598 oracle.record_overwrite(old.rev, current_rev);
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	599 old.mark_delete(current_rev);
46152 e166e8a035a7 copies-rust: use the entry API to overwrite deleted entry Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46151 diff changeset	600 });
46059 dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	601 }
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	602 }
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	603 }
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	604 copies
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	605 }
dacb771f6dd2 copies-rust: extract the processing of a ChangedFiles in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46058 diff changeset	606
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	607 /// merge two copies-mapping together, minor and major
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	608 ///
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	609 /// In case of conflict, value from "major" will be picked, unless in some
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	610 /// cases. See inline documentation for details.
45972 8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	611 fn merge_copies_dict<A: Fn(Revision, Revision) -> bool>(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	612 path_map: &TwoWayPathMap,
46156 7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	613 current_merge: Revision,
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	614 mut minor: InternalPathCopies,
313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	615 mut major: InternalPathCopies,
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	616 changes: &ChangedFiles,
45972 8b99c473aae2 copies-rust: move is_ancestor caching within the rust code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45971 diff changeset	617 oracle: &mut AncestorOracle<A>,
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	618 ) -> InternalPathCopies {
46127 c58c8f1d63b1 copies-rust: hide most of the comparison details inside a closure Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46126 diff changeset	619 // This closure exist as temporary help while multiple developper are
c58c8f1d63b1 copies-rust: hide most of the comparison details inside a closure Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46126 diff changeset	620 // actively working on this code. Feel free to re-inline it once this
c58c8f1d63b1 copies-rust: hide most of the comparison details inside a closure Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46126 diff changeset	621 // code is more settled.
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	622 let cmp_value = \|oracle: &mut AncestorOracle<A>,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	623 dest: &PathToken,
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	624 src_minor: &CopySource,
2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	625 src_major: &CopySource\| {
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	626 compare_value(
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	627 path_map,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	628 current_merge,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	629 changes,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	630 oracle,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	631 dest,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	632 src_minor,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	633 src_major,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	634 )
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	635 };
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	636 if minor.is_empty() {
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	637 major
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	638 } else if major.is_empty() {
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	639 minor
46128 c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	640 } else if minor.len() * 2 < major.len() {
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	641 // Lets says we are merging two InternalPathCopies instance A and B.
46128 c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	642 //
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	643 // If A contains N items, the merge result will never contains more
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	644 // than N values differents than the one in A
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	645 //
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	646 // If B contains M items, with M > N, the merge result will always
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	647 // result in a minimum of M - N value differents than the on in
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	648 // A
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	649 //
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	650 // As a result, if N < (M-N), we know that simply iterating over A will
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	651 // yield less difference than iterating over the difference
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	652 // between A and B.
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	653 //
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	654 // This help performance a lot in case were a tiny
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	655 // InternalPathCopies is merged with a much larger one.
46128 c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	656 for (dest, src_minor) in minor {
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	657 let src_major = major.get(&dest);
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	658 match src_major {
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	659 None => {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	660 major.insert(dest, src_minor);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	661 }
46128 c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	662 Some(src_major) => {
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	663 let (pick, overwrite) =
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	664 cmp_value(oracle, &dest, &src_minor, src_major);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	665 if overwrite {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	666 oracle.record_overwrite(src_minor.rev, current_merge);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	667 oracle.record_overwrite(src_major.rev, current_merge);
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	668 let src = match pick {
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	669 MergePick::Major => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	670 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	671 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	672 &src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	673 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	674 MergePick::Minor => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	675 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	676 &src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	677 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	678 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	679 MergePick::Any => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	680 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	681 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	682 &src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	683 ),
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	684 };
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	685 major.insert(dest, src);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	686 } else {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	687 match pick {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	688 MergePick::Any \| MergePick::Major => None,
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	689 MergePick::Minor => major.insert(dest, src_minor),
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	690 };
46128 c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	691 }
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	692 }
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	693 };
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	694 }
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	695 major
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	696 } else if major.len() * 2 < minor.len() {
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	697 // This use the same rational than the previous block.
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	698 // (Check previous block documentation for details.)
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	699 for (dest, src_major) in major {
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	700 let src_minor = minor.get(&dest);
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	701 match src_minor {
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	702 None => {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	703 minor.insert(dest, src_major);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	704 }
46128 c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	705 Some(src_minor) => {
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	706 let (pick, overwrite) =
46566 3c5a8b13206a copies-rust: fix reverted argument when merging tiny minor or major Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46565 diff changeset	707 cmp_value(oracle, &dest, src_minor, &src_major);
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	708 if overwrite {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	709 oracle.record_overwrite(src_minor.rev, current_merge);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	710 oracle.record_overwrite(src_major.rev, current_merge);
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	711 let src = match pick {
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	712 MergePick::Major => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	713 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	714 &src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	715 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	716 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	717 MergePick::Minor => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	718 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	719 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	720 &src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	721 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	722 MergePick::Any => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	723 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	724 &src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	725 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	726 ),
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	727 };
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	728 minor.insert(dest, src);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	729 } else {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	730 match pick {
46566 3c5a8b13206a copies-rust: fix reverted argument when merging tiny minor or major Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46565 diff changeset	731 MergePick::Any \| MergePick::Minor => None,
3c5a8b13206a copies-rust: fix reverted argument when merging tiny minor or major Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46565 diff changeset	732 MergePick::Major => minor.insert(dest, src_major),
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	733 };
46128 c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	734 }
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	735 }
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	736 };
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	737 }
c94d013e2299 copies-rust: add smarter approach for merging small mapping with large mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46127 diff changeset	738 minor
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	739 } else {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	740 let mut override_minor = Vec::new();
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	741 let mut override_major = Vec::new();
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	742
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	743 let mut to_major = \|k: &PathToken, v: &CopySource\| {
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	744 override_major.push((k.clone(), v.clone()))
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	745 };
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	746 let mut to_minor = \|k: &PathToken, v: &CopySource\| {
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	747 override_minor.push((k.clone(), v.clone()))
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	748 };
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	749
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	750 // The diff function leverage detection of the identical subpart if
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	751 // minor and major has some common ancestors. This make it very
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	752 // fast is most case.
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	753 //
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	754 // In case where the two map are vastly different in size, the current
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	755 // approach is still slowish because the iteration will iterate over
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	756 // all the "exclusive" content of the larger on. This situation can be
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	757 // frequent when the subgraph of revision we are processing has a lot
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	758 // of roots. Each roots adding they own fully new map to the mix (and
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	759 // likely a small map, if the path from the root to the "main path" is
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	760 // small.
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	761 //
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	762 // We could do better by detecting such situation and processing them
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	763 // differently.
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	764 for d in minor.diff(&major) {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	765 match d {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	766 DiffItem::Add(k, v) => to_minor(k, v),
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	767 DiffItem::Remove(k, v) => to_major(k, v),
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	768 DiffItem::Update { old, new } => {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	769 let (dest, src_major) = new;
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	770 let (_, src_minor) = old;
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	771 let (pick, overwrite) =
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	772 cmp_value(oracle, dest, src_minor, src_major);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	773 if overwrite {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	774 oracle.record_overwrite(src_minor.rev, current_merge);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	775 oracle.record_overwrite(src_major.rev, current_merge);
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	776 let src = match pick {
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	777 MergePick::Major => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	778 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	779 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	780 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	781 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	782 MergePick::Minor => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	783 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	784 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	785 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	786 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	787 MergePick::Any => CopySource::new_from_merge(
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	788 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	789 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	790 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	791 ),
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	792 };
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	793 to_minor(dest, &src);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	794 to_major(dest, &src);
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	795 } else {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	796 match pick {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	797 MergePick::Major => to_minor(dest, src_major),
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	798 MergePick::Minor => to_major(dest, src_minor),
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	799 // If the two entry are identical, no need to do
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	800 // anything (but diff should not have yield them)
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	801 MergePick::Any => unreachable!(),
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	802 }
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	803 }
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	804 }
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	805 };
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	806 }
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	807
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	808 let updates;
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	809 let mut result;
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	810 if override_major.is_empty() {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	811 result = major
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	812 } else if override_minor.is_empty() {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	813 result = minor
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	814 } else {
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	815 if override_minor.len() < override_major.len() {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	816 updates = override_minor;
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	817 result = minor;
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	818 } else {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	819 updates = override_major;
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	820 result = major;
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	821 }
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	822 for (k, v) in updates {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	823 result.insert(k, v);
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	824 }
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	825 }
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	826 result
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	827 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	828 }
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	829
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	830 /// represent the side that should prevail when merging two
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	831 /// InternalPathCopies
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	832 enum MergePick {
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	833 /// The "major" (p1) side prevails
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	834 Major,
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	835 /// The "minor" (p2) side prevails
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	836 Minor,
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	837 /// Any side could be used (because they are the same)
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	838 Any,
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	839 }
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	840
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	841 /// decide which side prevails in case of conflicting values
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	842 #[allow(clippy::if_same_then_else)]
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	843 fn compare_value<A: Fn(Revision, Revision) -> bool>(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	844 path_map: &TwoWayPathMap,
46156 7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	845 current_merge: Revision,
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	846 changes: &ChangedFiles,
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	847 oracle: &mut AncestorOracle<A>,
46129 818502d2f5e3 copies-rust: pre-introduce a PathToken type and use it where applicable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46128 diff changeset	848 dest: &PathToken,
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	849 src_minor: &CopySource,
2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	850 src_major: &CopySource,
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	851 ) -> (MergePick, bool) {
46156 7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	852 if src_major.rev == current_merge {
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	853 if src_minor.rev == current_merge {
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	854 if src_major.path.is_none() {
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	855 // We cannot get different copy information for both p1 and p2
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	856 // from the same revision. Unless this was a
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	857 // deletion.
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	858 //
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	859 // However the deletion might come over different data on each
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	860 // branch.
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	861 let need_over = src_major.overwritten != src_minor.overwritten;
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	862 (MergePick::Any, need_over)
46156 7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	863 } else {
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	864 unreachable!();
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	865 }
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	866 } else {
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	867 // The last value comes the current merge, this value -will- win
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	868 // eventually.
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	869 (MergePick::Major, true)
46156 7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	870 }
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	871 } else if src_minor.rev == current_merge {
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	872 // The last value comes the current merge, this value -will- win
7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	873 // eventually.
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	874 (MergePick::Minor, true)
46156 7d99614b7b77 copies-rust: make the comparison aware of the revision being current merged Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46155 diff changeset	875 } else if src_major.path == src_minor.path {
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	876 // we have the same value, but from other source;
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	877 if src_major.rev == src_minor.rev {
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	878 // If the two entry are identical, they are both valid
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	879 debug_assert!(src_minor.overwritten == src_minor.overwritten);
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	880 (MergePick::Any, false)
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	881 } else if src_major.is_overwritten_by(src_minor) {
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	882 (MergePick::Minor, false)
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	883 } else if src_minor.is_overwritten_by(src_major) {
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	884 (MergePick::Major, false)
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	885 } else {
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	886 (MergePick::Any, true)
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	887 }
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	888 } else if src_major.rev == src_minor.rev {
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	889 // We cannot get copy information for both p1 and p2 in the
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	890 // same rev. So this is the same value.
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	891 unreachable!(
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	892 "conflicting information from p1 and p2 in the same revision"
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	893 );
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	894 } else {
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	895 let dest_path = path_map.untokenize(*dest);
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	896 let action = changes.get_merge_case(dest_path);
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	897 if src_minor.path.is_some()
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	898 && src_major.path.is_none()
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	899 && action == MergeCase::Salvaged
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	900 {
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	901 // If the file is "deleted" in the major side but was
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	902 // salvaged by the merge, we keep the minor side alive
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	903 (MergePick::Minor, true)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	904 } else if src_major.path.is_some()
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	905 && src_minor.path.is_none()
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	906 && action == MergeCase::Salvaged
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	907 {
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	908 // If the file is "deleted" in the minor side but was
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	909 // salvaged by the merge, unconditionnaly preserve the
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	910 // major side.
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	911 (MergePick::Major, true)
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	912 } else if src_minor.is_overwritten_by(src_major) {
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	913 // The information from the minor version are strictly older than
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	914 // the major version
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	915 if action == MergeCase::Merged {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	916 // If the file was actively merged, its means some non-copy
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	917 // activity happened on the other branch. It
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	918 // mean the older copy information are still relevant.
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	919 //
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	920 // The major side wins such conflict.
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	921 (MergePick::Major, true)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	922 } else {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	923 // No activity on the minor branch, pick the newer one.
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	924 (MergePick::Major, false)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	925 }
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	926 } else if src_major.is_overwritten_by(src_minor) {
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	927 if action == MergeCase::Merged {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	928 // If the file was actively merged, its means some non-copy
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	929 // activity happened on the other branch. It
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	930 // mean the older copy information are still relevant.
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	931 //
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	932 // The major side wins such conflict.
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	933 (MergePick::Major, true)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	934 } else {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	935 // No activity on the minor branch, pick the newer one.
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	936 (MergePick::Minor, false)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	937 }
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	938 } else if src_minor.path.is_none() {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	939 // the minor side has no relevant information, pick the alive one
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	940 (MergePick::Major, true)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	941 } else if src_major.path.is_none() {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	942 // the major side has no relevant information, pick the alive one
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	943 (MergePick::Minor, true)
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	944 } else {
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	945 // by default the major side wins
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	946 (MergePick::Major, true)
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	947 }
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	948 }
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	949 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/copy_tracing.rs @ 46568:0d840b9d200d