##// END OF EJS Templates
copies-rust: track "overwrites" directly within CopySource...
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

File last commit:

r47315:0d840b9d default
r47315:0d840b9d default
Show More
copy_tracing.rs
949 lines | 33.5 KiB | application/rls-services+xml | RustLexer
copies-rust: combine the iteration over remove and copies into one...
r46587 use crate::utils::hg_path::HgPath;
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 use crate::utils::hg_path::HgPathBuf;
use crate::Revision;
copies: iterate over children directly (instead of parents)...
r46764 use crate::NULL_REVISION;
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556
copies-rust: leverage the immutability for efficient update...
r46585 use im_rc::ordmap::DiffItem;
copies-rust: use the `entry` API for copy information too...
r46768 use im_rc::ordmap::Entry;
copies-rust: use immutable "OrdMap" to store copies information...
r46577 use im_rc::ordmap::OrdMap;
copies-rust: parse the changed-file sidedata directly in rust...
r46674 use std::cmp::Ordering;
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 use std::collections::HashMap;
copies-rust: track "overwrites" directly within CopySource...
r47315 use std::collections::HashSet;
copies-rust: parse the changed-file sidedata directly in rust...
r46674 use std::convert::TryInto;
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556
pub type PathCopies = HashMap<HgPathBuf, HgPathBuf>;
copies-rust: tokenize all paths into integer...
r46766 type PathToken = usize;
copies-rust: pre-introduce a PathToken type and use it where applicable...
r46745
copies-rust: add methods to build and update CopySource...
r47314 #[derive(Clone, Debug, PartialEq)]
copies-rust: rename TimeStampedPathCopy to CopySource...
r47312 struct CopySource {
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 /// revision at which the copy information was added
rev: Revision,
/// the copy source, (Set to None in case of deletion of the associated
/// key)
copies-rust: pre-introduce a PathToken type and use it where applicable...
r46745 path: Option<PathToken>,
copies-rust: track "overwrites" directly within CopySource...
r47315 /// a set of previous `CopySource.rev` value directly or indirectly
/// overwritten by this one.
overwritten: HashSet<Revision>,
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
copies-rust: add methods to build and update CopySource...
r47314 impl CopySource {
/// create a new CopySource
///
/// Use this when no previous copy source existed.
fn new(rev: Revision, path: Option<PathToken>) -> Self {
copies-rust: track "overwrites" directly within CopySource...
r47315 Self {
rev,
path,
overwritten: HashSet::new(),
}
copies-rust: add methods to build and update CopySource...
r47314 }
/// create a new CopySource from merging two others
///
/// Use this when merging two InternalPathCopies requires active merging of
/// some entries.
fn new_from_merge(rev: Revision, winner: &Self, loser: &Self) -> Self {
copies-rust: track "overwrites" directly within CopySource...
r47315 let mut overwritten = HashSet::new();
overwritten.extend(winner.overwritten.iter().copied());
overwritten.extend(loser.overwritten.iter().copied());
overwritten.insert(winner.rev);
overwritten.insert(loser.rev);
copies-rust: add methods to build and update CopySource...
r47314 Self {
rev,
path: winner.path,
copies-rust: track "overwrites" directly within CopySource...
r47315 overwritten: overwritten,
copies-rust: add methods to build and update CopySource...
r47314 }
}
/// Update the value of a pre-existing CopySource
///
/// Use this when recording copy information from parent → child edges
fn overwrite(&mut self, rev: Revision, path: Option<PathToken>) {
copies-rust: track "overwrites" directly within CopySource...
r47315 self.overwritten.insert(self.rev);
copies-rust: add methods to build and update CopySource...
r47314 self.rev = rev;
self.path = path;
}
/// Mark pre-existing copy information as "dropped" by a file deletion
///
/// Use this when recording copy information from parent → child edges
fn mark_delete(&mut self, rev: Revision) {
copies-rust: track "overwrites" directly within CopySource...
r47315 self.overwritten.insert(self.rev);
copies-rust: add methods to build and update CopySource...
r47314 self.rev = rev;
self.path = None;
}
copies-rust: track "overwrites" directly within CopySource...
r47315
fn is_overwritten_by(&self, other: &Self) -> bool {
other.overwritten.contains(&self.rev)
}
copies-rust: add methods to build and update CopySource...
r47314 }
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 /// maps CopyDestination to Copy Source (+ a "timestamp" for the operation)
copies-rust: rename TimeStampedPathCopy to CopySource...
r47312 type InternalPathCopies = OrdMap<PathToken, CopySource>;
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556
/// hold parent 1, parent 2 and relevant files actions.
copies-rust: parse the changed-file sidedata directly in rust...
r46674 pub type RevInfo<'a> = (Revision, Revision, ChangedFiles<'a>);
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556
/// represent the files affected by a changesets
///
/// This hold a subset of mercurial.metadata.ChangingFiles as we do not need
/// all the data categories tracked by it.
copies-rust: parse the changed-file sidedata directly in rust...
r46674 /// This hold a subset of mercurial.metadata.ChangingFiles as we do not need
/// all the data categories tracked by it.
pub struct ChangedFiles<'a> {
nb_items: u32,
index: &'a [u8],
data: &'a [u8],
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
copies-rust: combine the iteration over remove and copies into one...
r46587 /// Represent active changes that affect the copy tracing.
enum Action<'a> {
/// The parent ? children edge is removing a file
///
/// (actually, this could be the edge from the other parent, but it does
/// not matters)
Removed(&'a HgPath),
/// The parent ? children edge introduce copy information between (dest,
/// source)
Copied(&'a HgPath, &'a HgPath),
}
copies-rust: encapsulate internal sets on `changes`...
r46589 /// This express the possible "special" case we can get in a merge
///
/// See mercurial/metadata.py for details on these values.
#[derive(PartialEq)]
enum MergeCase {
/// Merged: file had history on both side that needed to be merged
Merged,
/// Salvaged: file was candidate for deletion, but survived the merge
Salvaged,
/// Normal: Not one of the two cases above
Normal,
}
copies-rust: parse the changed-file sidedata directly in rust...
r46674 type FileChange<'a> = (u8, &'a HgPath, &'a HgPath);
const EMPTY: &[u8] = b"";
const COPY_MASK: u8 = 3;
const P1_COPY: u8 = 2;
const P2_COPY: u8 = 3;
const ACTION_MASK: u8 = 28;
const REMOVED: u8 = 12;
const MERGED: u8 = 8;
const SALVAGED: u8 = 16;
impl<'a> ChangedFiles<'a> {
const INDEX_START: usize = 4;
const ENTRY_SIZE: u32 = 9;
const FILENAME_START: u32 = 1;
const COPY_SOURCE_START: u32 = 5;
pub fn new(data: &'a [u8]) -> Self {
assert!(
data.len() >= 4,
"data size ({}) is too small to contain the header (4)",
data.len()
);
let nb_items_raw: [u8; 4] = (&data[0..=3])
.try_into()
.expect("failed to turn 4 bytes into 4 bytes");
let nb_items = u32::from_be_bytes(nb_items_raw);
let index_size = (nb_items * Self::ENTRY_SIZE) as usize;
let index_end = Self::INDEX_START + index_size;
assert!(
data.len() >= index_end,
"data size ({}) is too small to fit the index_data ({})",
data.len(),
index_end
);
let ret = ChangedFiles {
nb_items,
index: &data[Self::INDEX_START..index_end],
data: &data[index_end..],
};
let max_data = ret.filename_end(nb_items - 1) as usize;
assert!(
ret.data.len() >= max_data,
"data size ({}) is too small to fit all data ({})",
data.len(),
index_end + max_data
);
ret
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
pub fn new_empty() -> Self {
ChangedFiles {
copies-rust: parse the changed-file sidedata directly in rust...
r46674 nb_items: 0,
index: EMPTY,
data: EMPTY,
}
}
/// internal function to return an individual entry at a given index
fn entry(&'a self, idx: u32) -> FileChange<'a> {
if idx >= self.nb_items {
panic!(
"index for entry is higher that the number of file {} >= {}",
idx, self.nb_items
)
}
let flags = self.flags(idx);
let filename = self.filename(idx);
let copy_idx = self.copy_idx(idx);
let copy_source = self.filename(copy_idx);
(flags, filename, copy_source)
}
/// internal function to return the filename of the entry at a given index
fn filename(&self, idx: u32) -> &HgPath {
let filename_start;
if idx == 0 {
filename_start = 0;
} else {
filename_start = self.filename_end(idx - 1)
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
copies-rust: parse the changed-file sidedata directly in rust...
r46674 let filename_end = self.filename_end(idx);
let filename_start = filename_start as usize;
let filename_end = filename_end as usize;
HgPath::new(&self.data[filename_start..filename_end])
}
/// internal function to return the flag field of the entry at a given
/// index
fn flags(&self, idx: u32) -> u8 {
let idx = idx as usize;
self.index[idx * (Self::ENTRY_SIZE as usize)]
}
/// internal function to return the end of a filename part at a given index
fn filename_end(&self, idx: u32) -> u32 {
let start = (idx * Self::ENTRY_SIZE) + Self::FILENAME_START;
let end = (idx * Self::ENTRY_SIZE) + Self::COPY_SOURCE_START;
let start = start as usize;
let end = end as usize;
let raw = (&self.index[start..end])
.try_into()
.expect("failed to turn 4 bytes into 4 bytes");
u32::from_be_bytes(raw)
}
/// internal function to return index of the copy source of the entry at a
/// given index
fn copy_idx(&self, idx: u32) -> u32 {
let start = (idx * Self::ENTRY_SIZE) + Self::COPY_SOURCE_START;
let end = (idx + 1) * Self::ENTRY_SIZE;
let start = start as usize;
let end = end as usize;
let raw = (&self.index[start..end])
.try_into()
.expect("failed to turn 4 bytes into 4 bytes");
u32::from_be_bytes(raw)
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
copies-rust: combine the iteration over remove and copies into one...
r46587
/// Return an iterator over all the `Action` in this instance.
copies-rust: move the parent token to an enum...
r46675 fn iter_actions(&self, parent: Parent) -> ActionsIterator {
copies-rust: parse the changed-file sidedata directly in rust...
r46674 ActionsIterator {
changes: &self,
parent: parent,
current: 0,
}
copies-rust: combine the iteration over remove and copies into one...
r46587 }
copies-rust: encapsulate internal sets on `changes`...
r46589
/// return the MergeCase value associated with a filename
fn get_merge_case(&self, path: &HgPath) -> MergeCase {
copies-rust: parse the changed-file sidedata directly in rust...
r46674 if self.nb_items == 0 {
copies-rust: encapsulate internal sets on `changes`...
r46589 return MergeCase::Normal;
}
copies-rust: parse the changed-file sidedata directly in rust...
r46674 let mut low_part = 0;
let mut high_part = self.nb_items;
while low_part < high_part {
let cursor = (low_part + high_part - 1) / 2;
let (flags, filename, _source) = self.entry(cursor);
match path.cmp(filename) {
Ordering::Less => low_part = cursor + 1,
Ordering::Greater => high_part = cursor,
Ordering::Equal => {
return match flags & ACTION_MASK {
MERGED => MergeCase::Merged,
SALVAGED => MergeCase::Salvaged,
_ => MergeCase::Normal,
};
}
}
}
MergeCase::Normal
copies-rust: encapsulate internal sets on `changes`...
r46589 }
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
copies-rust: move is_ancestor caching within the rust code...
r46586 /// A struct responsible for answering "is X ancestors of Y" quickly
///
/// The structure will delegate ancestors call to a callback, and cache the
/// result.
#[derive(Debug)]
struct AncestorOracle<'a, A: Fn(Revision, Revision) -> bool> {
inner: &'a A,
pairs: HashMap<(Revision, Revision), bool>,
}
impl<'a, A: Fn(Revision, Revision) -> bool> AncestorOracle<'a, A> {
fn new(func: &'a A) -> Self {
Self {
inner: func,
pairs: HashMap::default(),
}
}
copies-rust: start recording overwrite as they happens...
r46770 fn record_overwrite(&mut self, anc: Revision, desc: Revision) {
self.pairs.insert((anc, desc), true);
}
copies-rust: move is_ancestor caching within the rust code...
r46586 /// returns `true` if `anc` is an ancestors of `desc`, `false` otherwise
copies-rust: rename Oracle.is_ancestor to Oracle.is_overwrite...
r46769 fn is_overwrite(&mut self, anc: Revision, desc: Revision) -> bool {
copies-rust: move is_ancestor caching within the rust code...
r46586 if anc > desc {
false
} else if anc == desc {
true
} else {
if let Some(b) = self.pairs.get(&(anc, desc)) {
*b
} else {
let b = (self.inner)(anc, desc);
self.pairs.insert((anc, desc), b);
b
}
}
}
}
copies-rust: parse the changed-file sidedata directly in rust...
r46674 struct ActionsIterator<'a> {
changes: &'a ChangedFiles<'a>,
copies-rust: move the parent token to an enum...
r46675 parent: Parent,
copies-rust: parse the changed-file sidedata directly in rust...
r46674 current: u32,
}
impl<'a> Iterator for ActionsIterator<'a> {
type Item = Action<'a>;
fn next(&mut self) -> Option<Action<'a>> {
copies-rust: move the parent token to an enum...
r46675 let copy_flag = match self.parent {
Parent::FirstParent => P1_COPY,
Parent::SecondParent => P2_COPY,
};
copies-rust: parse the changed-file sidedata directly in rust...
r46674 while self.current < self.changes.nb_items {
let (flags, file, source) = self.changes.entry(self.current);
self.current += 1;
if (flags & ACTION_MASK) == REMOVED {
return Some(Action::Removed(file));
}
let copy = flags & COPY_MASK;
copies-rust: move the parent token to an enum...
r46675 if copy == copy_flag {
copies-rust: parse the changed-file sidedata directly in rust...
r46674 return Some(Action::Copied(file, source));
}
}
return None;
}
}
/// A small struct whose purpose is to ensure lifetime of bytes referenced in
/// ChangedFiles
///
/// It is passed to the RevInfoMaker callback who can assign any necessary
/// content to the `data` attribute. The copy tracing code is responsible for
/// keeping the DataHolder alive at least as long as the ChangedFiles object.
pub struct DataHolder<D> {
/// RevInfoMaker callback should assign data referenced by the
/// ChangedFiles struct it return to this attribute. The DataHolder
/// lifetime will be at least as long as the ChangedFiles one.
pub data: Option<D>,
}
pub type RevInfoMaker<'a, D> =
Box<dyn for<'r> Fn(Revision, &'r mut DataHolder<D>) -> RevInfo<'r> + 'a>;
copies-rust: move the parent token to an enum...
r46675 /// enum used to carry information about the parent → child currently processed
#[derive(Copy, Clone, Debug)]
enum Parent {
/// The `p1(x) → x` edge
FirstParent,
/// The `p2(x) → x` edge
SecondParent,
}
copies-rust: tokenize all paths into integer...
r46766 /// A small "tokenizer" responsible of turning full HgPath into lighter
/// PathToken
///
/// Dealing with small object, like integer is much faster, so HgPath input are
/// turned into integer "PathToken" and converted back in the end.
#[derive(Clone, Debug, Default)]
struct TwoWayPathMap {
token: HashMap<HgPathBuf, PathToken>,
path: Vec<HgPathBuf>,
}
impl TwoWayPathMap {
fn tokenize(&mut self, path: &HgPath) -> PathToken {
match self.token.get(path) {
Some(a) => *a,
None => {
let a = self.token.len();
let buf = path.to_owned();
self.path.push(buf.clone());
self.token.insert(buf, a);
a
}
}
}
fn untokenize(&self, token: PathToken) -> &HgPathBuf {
assert!(token < self.path.len(), format!("Unknown token: {}", token));
&self.path[token]
}
}
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 /// Same as mercurial.copies._combine_changeset_copies, but in Rust.
///
/// Arguments are:
///
/// revs: all revisions to be considered
/// children: a {parent ? [childrens]} mapping
/// target_rev: the final revision we are combining copies to
/// rev_info(rev): callback to get revision information:
/// * first parent
/// * second parent
/// * ChangedFiles
/// isancestors(low_rev, high_rev): callback to check if a revision is an
/// ancestor of another
copies-rust: parse the changed-file sidedata directly in rust...
r46674 pub fn combine_changeset_copies<A: Fn(Revision, Revision) -> bool, D>(
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 revs: Vec<Revision>,
copies: iterate over children directly (instead of parents)...
r46764 mut children_count: HashMap<Revision, usize>,
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 target_rev: Revision,
copies-rust: parse the changed-file sidedata directly in rust...
r46674 rev_info: RevInfoMaker<D>,
copies-rust: move is_ancestor caching within the rust code...
r46586 is_ancestor: &A,
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 ) -> PathCopies {
let mut all_copies = HashMap::new();
copies-rust: move is_ancestor caching within the rust code...
r46586 let mut oracle = AncestorOracle::new(is_ancestor);
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556
copies-rust: tokenize all paths into integer...
r46766 let mut path_map = TwoWayPathMap::default();
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 for rev in revs {
copies: iterate over children directly (instead of parents)...
r46764 let mut d: DataHolder<D> = DataHolder { data: None };
let (p1, p2, changes) = rev_info(rev, &mut d);
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556
copies: iterate over children directly (instead of parents)...
r46764 // We will chain the copies information accumulated for the parent with
// the individual copies information the curent revision. Creating a
// new TimeStampedPath for each `rev` → `children` vertex.
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 let mut copies: Option<InternalPathCopies> = None;
copies: iterate over children directly (instead of parents)...
r46764 if p1 != NULL_REVISION {
// Retrieve data computed in a previous iteration
let parent_copies = get_and_clean_parent_copies(
&mut all_copies,
&mut children_count,
p1,
);
if let Some(parent_copies) = parent_copies {
// combine it with data for that revision
let vertex_copies = add_from_changes(
copies-rust: tokenize all paths into integer...
r46766 &mut path_map,
copies-rust: start recording overwrite as they happens...
r46770 &mut oracle,
copies: iterate over children directly (instead of parents)...
r46764 &parent_copies,
&changes,
Parent::FirstParent,
rev,
);
// keep that data around for potential later combination
copies = Some(vertex_copies);
}
}
if p2 != NULL_REVISION {
// Retrieve data computed in a previous iteration
let parent_copies = get_and_clean_parent_copies(
&mut all_copies,
&mut children_count,
p2,
);
if let Some(parent_copies) = parent_copies {
// combine it with data for that revision
let vertex_copies = add_from_changes(
copies-rust: tokenize all paths into integer...
r46766 &mut path_map,
copies-rust: start recording overwrite as they happens...
r46770 &mut oracle,
copies: iterate over children directly (instead of parents)...
r46764 &parent_copies,
&changes,
Parent::SecondParent,
rev,
);
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556
copies: iterate over children directly (instead of parents)...
r46764 copies = match copies {
None => Some(vertex_copies),
// Merge has two parents needs to combines their copy
// information.
//
// If we got data from both parents, We need to combine
// them.
Some(copies) => Some(merge_copies_dict(
copies-rust: tokenize all paths into integer...
r46766 &path_map,
copies-rust: make the comparison aware of the revision being current merged...
r46771 rev,
copies: iterate over children directly (instead of parents)...
r46764 vertex_copies,
copies,
&changes,
&mut oracle,
)),
};
}
}
match copies {
Some(copies) => {
all_copies.insert(rev, copies);
}
_ => {}
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
}
// Drop internal information (like the timestamp) and return the final
// mapping.
let tt_result = all_copies
.remove(&target_rev)
.expect("target revision was not processed");
let mut result = PathCopies::default();
for (dest, tt_source) in tt_result {
if let Some(path) = tt_source.path {
copies-rust: tokenize all paths into integer...
r46766 let path_dest = path_map.untokenize(dest).to_owned();
let path_path = path_map.untokenize(path).to_owned();
result.insert(path_dest, path_path);
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
}
result
}
copies: iterate over children directly (instead of parents)...
r46764 /// fetch previous computed information
///
/// If no other children are expected to need this information, we drop it from
/// the cache.
///
/// If parent is not part of the set we are expected to walk, return None.
fn get_and_clean_parent_copies(
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 all_copies: &mut HashMap<Revision, InternalPathCopies>,
copies: iterate over children directly (instead of parents)...
r46764 children_count: &mut HashMap<Revision, usize>,
parent_rev: Revision,
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 ) -> Option<InternalPathCopies> {
copies: iterate over children directly (instead of parents)...
r46764 let count = children_count.get_mut(&parent_rev)?;
*count -= 1;
if *count == 0 {
match all_copies.remove(&parent_rev) {
Some(c) => Some(c),
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 None => Some(InternalPathCopies::default()),
copies: iterate over children directly (instead of parents)...
r46764 }
} else {
match all_copies.get(&parent_rev) {
Some(c) => Some(c.clone()),
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 None => Some(InternalPathCopies::default()),
copies: iterate over children directly (instead of parents)...
r46764 }
}
}
copies-rust: extract the processing of a ChangedFiles in its own function...
r46676 /// Combine ChangedFiles with some existing PathCopies information and return
/// the result
copies-rust: start recording overwrite as they happens...
r46770 fn add_from_changes<A: Fn(Revision, Revision) -> bool>(
copies-rust: tokenize all paths into integer...
r46766 path_map: &mut TwoWayPathMap,
copies-rust: start recording overwrite as they happens...
r46770 oracle: &mut AncestorOracle<A>,
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 base_copies: &InternalPathCopies,
copies-rust: extract the processing of a ChangedFiles in its own function...
r46676 changes: &ChangedFiles,
parent: Parent,
current_rev: Revision,
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 ) -> InternalPathCopies {
copies-rust: extract the processing of a ChangedFiles in its own function...
r46676 let mut copies = base_copies.clone();
for action in changes.iter_actions(parent) {
match action {
copies-rust: tokenize all paths into integer...
r46766 Action::Copied(path_dest, path_source) => {
let dest = path_map.tokenize(path_dest);
let source = path_map.tokenize(path_source);
copies-rust: extract the processing of a ChangedFiles in its own function...
r46676 let entry;
copies-rust: tokenize all paths into integer...
r46766 if let Some(v) = base_copies.get(&source) {
copies-rust: extract the processing of a ChangedFiles in its own function...
r46676 entry = match &v.path {
Some(path) => Some((*(path)).to_owned()),
None => Some(source.to_owned()),
}
} else {
entry = Some(source.to_owned());
}
// Each new entry is introduced by the children, we
// record this information as we will need it to take
// the right decision when merging conflicting copy
// information. See merge_copies_dict for details.
copies-rust: use the `entry` API for copy information too...
r46768 match copies.entry(dest) {
Entry::Vacant(slot) => {
copies-rust: add methods to build and update CopySource...
r47314 let ttpc = CopySource::new(current_rev, entry);
copies-rust: use the `entry` API for copy information too...
r46768 slot.insert(ttpc);
}
Entry::Occupied(mut slot) => {
copies-rust: add methods to build and update CopySource...
r47314 let ttpc = slot.get_mut();
copies-rust: start recording overwrite as they happens...
r46770 oracle.record_overwrite(ttpc.rev, current_rev);
copies-rust: add methods to build and update CopySource...
r47314 ttpc.overwrite(current_rev, entry);
copies-rust: use the `entry` API for copy information too...
r46768 }
}
copies-rust: extract the processing of a ChangedFiles in its own function...
r46676 }
copies-rust: tokenize all paths into integer...
r46766 Action::Removed(deleted_path) => {
copies-rust: extract the processing of a ChangedFiles in its own function...
r46676 // We must drop copy information for removed file.
//
// We need to explicitly record them as dropped to
// propagate this information when merging two
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 // InternalPathCopies object.
copies-rust: tokenize all paths into integer...
r46766 let deleted = path_map.tokenize(deleted_path);
copies-rust: use the entry API to overwrite deleted entry...
r46767 copies.entry(deleted).and_modify(|old| {
copies-rust: start recording overwrite as they happens...
r46770 oracle.record_overwrite(old.rev, current_rev);
copies-rust: add methods to build and update CopySource...
r47314 old.mark_delete(current_rev);
copies-rust: use the entry API to overwrite deleted entry...
r46767 });
copies-rust: extract the processing of a ChangedFiles in its own function...
r46676 }
}
}
copies
}
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 /// merge two copies-mapping together, minor and major
///
/// In case of conflict, value from "major" will be picked, unless in some
/// cases. See inline documentation for details.
copies-rust: move is_ancestor caching within the rust code...
r46586 fn merge_copies_dict<A: Fn(Revision, Revision) -> bool>(
copies-rust: tokenize all paths into integer...
r46766 path_map: &TwoWayPathMap,
copies-rust: make the comparison aware of the revision being current merged...
r46771 current_merge: Revision,
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 mut minor: InternalPathCopies,
mut major: InternalPathCopies,
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 changes: &ChangedFiles,
copies-rust: move is_ancestor caching within the rust code...
r46586 oracle: &mut AncestorOracle<A>,
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 ) -> InternalPathCopies {
copies-rust: hide most of the comparison details inside a closure...
r46743 // This closure exist as temporary help while multiple developper are
// actively working on this code. Feel free to re-inline it once this
// code is more settled.
copies: detect case when a merge decision overwrite previous data...
r47310 let cmp_value = |oracle: &mut AncestorOracle<A>,
dest: &PathToken,
copies-rust: rename TimeStampedPathCopy to CopySource...
r47312 src_minor: &CopySource,
src_major: &CopySource| {
copies: detect case when a merge decision overwrite previous data...
r47310 compare_value(
path_map,
current_merge,
changes,
oracle,
dest,
src_minor,
src_major,
)
};
copies-rust: leverage the immutability for efficient update...
r46585 if minor.is_empty() {
copies-rust: move the mapping merging into a else clause...
r46742 major
copies-rust: leverage the immutability for efficient update...
r46585 } else if major.is_empty() {
copies-rust: move the mapping merging into a else clause...
r46742 minor
copies-rust: add smarter approach for merging small mapping with large mapping...
r46744 } else if minor.len() * 2 < major.len() {
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 // Lets says we are merging two InternalPathCopies instance A and B.
copies-rust: add smarter approach for merging small mapping with large mapping...
r46744 //
// If A contains N items, the merge result will never contains more
// than N values differents than the one in A
//
// If B contains M items, with M > N, the merge result will always
// result in a minimum of M - N value differents than the on in
// A
//
// As a result, if N < (M-N), we know that simply iterating over A will
// yield less difference than iterating over the difference
// between A and B.
//
// This help performance a lot in case were a tiny
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 // InternalPathCopies is merged with a much larger one.
copies-rust: add smarter approach for merging small mapping with large mapping...
r46744 for (dest, src_minor) in minor {
let src_major = major.get(&dest);
match src_major {
copies: detect case when a merge decision overwrite previous data...
r47310 None => {
major.insert(dest, src_minor);
}
copies-rust: add smarter approach for merging small mapping with large mapping...
r46744 Some(src_major) => {
copies: detect case when a merge decision overwrite previous data...
r47310 let (pick, overwrite) =
cmp_value(oracle, &dest, &src_minor, src_major);
if overwrite {
oracle.record_overwrite(src_minor.rev, current_merge);
oracle.record_overwrite(src_major.rev, current_merge);
copies-rust: add methods to build and update CopySource...
r47314 let src = match pick {
MergePick::Major => CopySource::new_from_merge(
current_merge,
src_major,
&src_minor,
),
MergePick::Minor => CopySource::new_from_merge(
current_merge,
&src_minor,
src_major,
),
MergePick::Any => CopySource::new_from_merge(
current_merge,
src_major,
&src_minor,
),
copies: detect case when a merge decision overwrite previous data...
r47310 };
major.insert(dest, src);
} else {
match pick {
MergePick::Any | MergePick::Major => None,
MergePick::Minor => major.insert(dest, src_minor),
};
copies-rust: add smarter approach for merging small mapping with large mapping...
r46744 }
}
};
}
major
} else if major.len() * 2 < minor.len() {
// This use the same rational than the previous block.
// (Check previous block documentation for details.)
for (dest, src_major) in major {
let src_minor = minor.get(&dest);
match src_minor {
copies: detect case when a merge decision overwrite previous data...
r47310 None => {
minor.insert(dest, src_major);
}
copies-rust: add smarter approach for merging small mapping with large mapping...
r46744 Some(src_minor) => {
copies: detect case when a merge decision overwrite previous data...
r47310 let (pick, overwrite) =
copies-rust: fix reverted argument when merging tiny minor or major...
r47313 cmp_value(oracle, &dest, src_minor, &src_major);
copies: detect case when a merge decision overwrite previous data...
r47310 if overwrite {
oracle.record_overwrite(src_minor.rev, current_merge);
oracle.record_overwrite(src_major.rev, current_merge);
copies-rust: add methods to build and update CopySource...
r47314 let src = match pick {
MergePick::Major => CopySource::new_from_merge(
current_merge,
&src_major,
src_minor,
),
MergePick::Minor => CopySource::new_from_merge(
current_merge,
src_minor,
&src_major,
),
MergePick::Any => CopySource::new_from_merge(
current_merge,
&src_major,
src_minor,
),
copies: detect case when a merge decision overwrite previous data...
r47310 };
minor.insert(dest, src);
} else {
match pick {
copies-rust: fix reverted argument when merging tiny minor or major...
r47313 MergePick::Any | MergePick::Minor => None,
MergePick::Major => minor.insert(dest, src_major),
copies: detect case when a merge decision overwrite previous data...
r47310 };
copies-rust: add smarter approach for merging small mapping with large mapping...
r46744 }
}
};
}
minor
copies-rust: move the mapping merging into a else clause...
r46742 } else {
let mut override_minor = Vec::new();
let mut override_major = Vec::new();
copies-rust: leverage the immutability for efficient update...
r46585
copies-rust: rename TimeStampedPathCopy to CopySource...
r47312 let mut to_major = |k: &PathToken, v: &CopySource| {
copies-rust: move the mapping merging into a else clause...
r46742 override_major.push((k.clone(), v.clone()))
};
copies-rust: rename TimeStampedPathCopy to CopySource...
r47312 let mut to_minor = |k: &PathToken, v: &CopySource| {
copies-rust: move the mapping merging into a else clause...
r46742 override_minor.push((k.clone(), v.clone()))
};
copies-rust: leverage the immutability for efficient update...
r46585
copies-rust: move the mapping merging into a else clause...
r46742 // The diff function leverage detection of the identical subpart if
// minor and major has some common ancestors. This make it very
// fast is most case.
//
// In case where the two map are vastly different in size, the current
// approach is still slowish because the iteration will iterate over
// all the "exclusive" content of the larger on. This situation can be
// frequent when the subgraph of revision we are processing has a lot
// of roots. Each roots adding they own fully new map to the mix (and
// likely a small map, if the path from the root to the "main path" is
// small.
//
// We could do better by detecting such situation and processing them
// differently.
for d in minor.diff(&major) {
match d {
DiffItem::Add(k, v) => to_minor(k, v),
DiffItem::Remove(k, v) => to_major(k, v),
DiffItem::Update { old, new } => {
let (dest, src_major) = new;
let (_, src_minor) = old;
copies: detect case when a merge decision overwrite previous data...
r47310 let (pick, overwrite) =
cmp_value(oracle, dest, src_minor, src_major);
if overwrite {
oracle.record_overwrite(src_minor.rev, current_merge);
oracle.record_overwrite(src_major.rev, current_merge);
copies-rust: add methods to build and update CopySource...
r47314 let src = match pick {
MergePick::Major => CopySource::new_from_merge(
current_merge,
src_major,
src_minor,
),
MergePick::Minor => CopySource::new_from_merge(
current_merge,
src_minor,
src_major,
),
MergePick::Any => CopySource::new_from_merge(
current_merge,
src_major,
src_minor,
),
copies: detect case when a merge decision overwrite previous data...
r47310 };
to_minor(dest, &src);
to_major(dest, &src);
} else {
match pick {
MergePick::Major => to_minor(dest, src_major),
MergePick::Minor => to_major(dest, src_minor),
// If the two entry are identical, no need to do
// anything (but diff should not have yield them)
MergePick::Any => unreachable!(),
}
copies-rust: move the mapping merging into a else clause...
r46742 }
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
copies-rust: move the mapping merging into a else clause...
r46742 };
}
copies-rust: leverage the immutability for efficient update...
r46585
copies-rust: move the mapping merging into a else clause...
r46742 let updates;
let mut result;
if override_major.is_empty() {
result = major
} else if override_minor.is_empty() {
result = minor
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 } else {
copies-rust: move the mapping merging into a else clause...
r46742 if override_minor.len() < override_major.len() {
updates = override_minor;
result = minor;
} else {
updates = override_major;
result = major;
}
for (k, v) in updates {
result.insert(k, v);
}
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
copies-rust: move the mapping merging into a else clause...
r46742 result
copies: introduce a basic Rust function for `combine_changeset_copies`...
r46556 }
}
copies-rust: extract conflicting value comparison in its own function...
r46741
/// represent the side that should prevail when merging two
copies-rust: rename TimeStampedPathCopies to InternalPathCopies...
r47311 /// InternalPathCopies
copies-rust: extract conflicting value comparison in its own function...
r46741 enum MergePick {
/// The "major" (p1) side prevails
Major,
/// The "minor" (p2) side prevails
Minor,
/// Any side could be used (because they are the same)
Any,
}
/// decide which side prevails in case of conflicting values
#[allow(clippy::if_same_then_else)]
fn compare_value<A: Fn(Revision, Revision) -> bool>(
copies-rust: tokenize all paths into integer...
r46766 path_map: &TwoWayPathMap,
copies-rust: make the comparison aware of the revision being current merged...
r46771 current_merge: Revision,
copies-rust: extract conflicting value comparison in its own function...
r46741 changes: &ChangedFiles,
oracle: &mut AncestorOracle<A>,
copies-rust: pre-introduce a PathToken type and use it where applicable...
r46745 dest: &PathToken,
copies-rust: rename TimeStampedPathCopy to CopySource...
r47312 src_minor: &CopySource,
src_major: &CopySource,
copies: detect case when a merge decision overwrite previous data...
r47310 ) -> (MergePick, bool) {
copies-rust: make the comparison aware of the revision being current merged...
r46771 if src_major.rev == current_merge {
if src_minor.rev == current_merge {
if src_major.path.is_none() {
// We cannot get different copy information for both p1 and p2
// from the same revision. Unless this was a
copies-rust: track "overwrites" directly within CopySource...
r47315 // deletion.
//
// However the deletion might come over different data on each
// branch.
let need_over = src_major.overwritten != src_minor.overwritten;
(MergePick::Any, need_over)
copies-rust: make the comparison aware of the revision being current merged...
r46771 } else {
unreachable!();
}
} else {
// The last value comes the current merge, this value -will- win
// eventually.
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Major, true)
copies-rust: make the comparison aware of the revision being current merged...
r46771 }
} else if src_minor.rev == current_merge {
// The last value comes the current merge, this value -will- win
// eventually.
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Minor, true)
copies-rust: make the comparison aware of the revision being current merged...
r46771 } else if src_major.path == src_minor.path {
copies-rust: extract conflicting value comparison in its own function...
r46741 // we have the same value, but from other source;
if src_major.rev == src_minor.rev {
// If the two entry are identical, they are both valid
copies-rust: track "overwrites" directly within CopySource...
r47315 debug_assert!(src_minor.overwritten == src_minor.overwritten);
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Any, false)
copies-rust: track "overwrites" directly within CopySource...
r47315 } else if src_major.is_overwritten_by(src_minor) {
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Minor, false)
copies-rust: track "overwrites" directly within CopySource...
r47315 } else if src_minor.is_overwritten_by(src_major) {
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Major, false)
copies-rust: extract conflicting value comparison in its own function...
r46741 } else {
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Any, true)
copies-rust: extract conflicting value comparison in its own function...
r46741 }
} else if src_major.rev == src_minor.rev {
// We cannot get copy information for both p1 and p2 in the
// same rev. So this is the same value.
unreachable!(
copies: rearrange all value comparison conditional...
r47309 "conflicting information from p1 and p2 in the same revision"
copies-rust: extract conflicting value comparison in its own function...
r46741 );
} else {
copies-rust: tokenize all paths into integer...
r46766 let dest_path = path_map.untokenize(*dest);
let action = changes.get_merge_case(dest_path);
copies: rearrange all value comparison conditional...
r47309 if src_minor.path.is_some()
&& src_major.path.is_none()
&& action == MergeCase::Salvaged
{
copies-rust: extract conflicting value comparison in its own function...
r46741 // If the file is "deleted" in the major side but was
// salvaged by the merge, we keep the minor side alive
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Minor, true)
copies: rearrange all value comparison conditional...
r47309 } else if src_major.path.is_some()
&& src_minor.path.is_none()
&& action == MergeCase::Salvaged
{
copies-rust: extract conflicting value comparison in its own function...
r46741 // If the file is "deleted" in the minor side but was
// salvaged by the merge, unconditionnaly preserve the
// major side.
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Major, true)
copies-rust: track "overwrites" directly within CopySource...
r47315 } else if src_minor.is_overwritten_by(src_major) {
copies: rearrange all value comparison conditional...
r47309 // The information from the minor version are strictly older than
// the major version
if action == MergeCase::Merged {
// If the file was actively merged, its means some non-copy
// activity happened on the other branch. It
// mean the older copy information are still relevant.
//
// The major side wins such conflict.
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Major, true)
copies: rearrange all value comparison conditional...
r47309 } else {
// No activity on the minor branch, pick the newer one.
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Major, false)
copies: rearrange all value comparison conditional...
r47309 }
copies-rust: track "overwrites" directly within CopySource...
r47315 } else if src_major.is_overwritten_by(src_minor) {
copies: rearrange all value comparison conditional...
r47309 if action == MergeCase::Merged {
// If the file was actively merged, its means some non-copy
// activity happened on the other branch. It
// mean the older copy information are still relevant.
//
// The major side wins such conflict.
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Major, true)
copies: rearrange all value comparison conditional...
r47309 } else {
// No activity on the minor branch, pick the newer one.
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Minor, false)
copies: rearrange all value comparison conditional...
r47309 }
} else if src_minor.path.is_none() {
// the minor side has no relevant information, pick the alive one
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Major, true)
copies: rearrange all value comparison conditional...
r47309 } else if src_major.path.is_none() {
// the major side has no relevant information, pick the alive one
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Minor, true)
copies-rust: extract conflicting value comparison in its own function...
r46741 } else {
copies: rearrange all value comparison conditional...
r47309 // by default the major side wins
copies: detect case when a merge decision overwrite previous data...
r47310 (MergePick::Major, true)
copies-rust: extract conflicting value comparison in its own function...
r46741 }
}
}