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

annotate rust/hg-core/src/copy_tracing.rs @ 46580:2076df13d00f

copies-rust: refactor the "deletion" case We rearrange the code to single out the case where information need to be overwritten on both side of the merge. This open the way to better dealing with this case. Differential Revision: https://phab.mercurial-scm.org/D9651

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Wed, 16 Dec 2020 10:59:00 +0100
parents	600f8d510ab6
children	d6d57bfc1a1b

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)
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	110 CopiedFromP1(&'a HgPath, &'a HgPath),
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	111 CopiedFromP2(&'a HgPath, &'a HgPath),
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	112 }
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	113
45975 2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	114 /// 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	115 ///
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	116 /// 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	117 #[derive(PartialEq)]
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	118 enum MergeCase {
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	119 /// 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	120 Merged,
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	121 /// 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	122 Salvaged,
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	123 /// 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	124 Normal,
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	125 }
2367937982ba copies-rust: encapsulate internal sets on `changes` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45974 diff changeset	126
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	127 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	128
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 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	130 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	131 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	132 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	133 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	134 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	135 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	136 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	137
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	138 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	139 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	140 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	141 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	142 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	143
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	144 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	145 assert!(
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.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	147 "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	148 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	149 );
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	150 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	151 .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	152 .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	153 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	154
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_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	156 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	157
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	158 assert!(
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.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	160 "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	161 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	162 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	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
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	165 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	166 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	167 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	168 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	169 };
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	170 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	171 assert!(
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	172 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	173 "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	174 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	175 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	176 );
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	177 ret
45944 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
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	180 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	181 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	182 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	183 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	184 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	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
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	188 /// 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	189 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	190 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	191 panic!(
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	192 "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	193 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	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 }
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 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	197 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	198 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	199 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	200 (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	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
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	203 /// 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	204 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	205 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	206 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	207 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	208 } else {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	209 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	210 }
46057 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_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	212 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	213 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	214 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	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
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	217 /// 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	218 /// index
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	219 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	220 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	221 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	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
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	224 /// 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	225 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	226 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	227 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	228 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	229 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	230 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	231 .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	232 .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	233 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	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
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	236 /// 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	237 /// 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	238 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	239 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	240 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	241 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	242 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	243 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	244 .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	245 .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	246 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	247 }
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	248
ed0e1339e4a8 copies-rust: combine the iteration over remove and copies into one Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45972 diff changeset	249 /// Return an iterator over all the `Action` in this instance.
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	250 fn iter_actions(&self) -> 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	251 ActionsIterator {
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	252 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	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
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	284 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	285 changes: &'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	286 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	287 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	288
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	289 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	290 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	291
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	292 fn next(&mut self) -> Option<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	293 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	294 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	295 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	296 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	297 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	298 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	299 let copy = flags & COPY_MASK;
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	300 if copy == P1_COPY {
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	301 return Some(Action::CopiedFromP1(file, source));
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	302 } else if copy == P2_COPY {
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	303 return Some(Action::CopiedFromP2(file, source));
46057 e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	304 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	305 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	306 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	307 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	308 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	309
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	310 /// 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	311 /// ChangedFiles
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	312 ///
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	313 /// 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	314 /// 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	315 /// 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	316 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	317 /// 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	318 /// 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	319 /// 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	320 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	321 }
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	322
e0313b0a6f7e copies-rust: parse the changed-file sidedata directly in rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45975 diff changeset	323 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	324 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	325
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	326 /// 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	327 /// PathToken
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	328 ///
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	329 /// 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	330 /// 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	331 #[derive(Clone, Debug, Default)]
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	332 struct TwoWayPathMap {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	333 token: HashMap<HgPathBuf, PathToken>,
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	334 path: Vec<HgPathBuf>,
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	335 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	336
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	337 impl TwoWayPathMap {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	338 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	339 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	340 Some(a) => *a,
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	341 None => {
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	342 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	343 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	344 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	345 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	346 a
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	347 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	348 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	349 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	350
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	351 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	352 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	353 &self.path[token]
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	354 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	355 }
c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	356
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	357 /// 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	358 ///
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	359 /// Arguments are:
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	360 ///
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	361 /// 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	362 /// 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	363 /// 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	364 /// 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	365 /// * first parent
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	366 /// * second parent
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	367 /// * ChangedFiles
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	368 /// 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	369 /// ancestor of another
46569 34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	370 pub fn combine_changeset_copies<D>(
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	371 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	372 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	373 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	374 rev_info: RevInfoMaker<D>,
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	375 ) -> PathCopies {
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	376 let mut all_copies = HashMap::new();
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 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 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	379
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	380 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	381 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	382 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	383
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	384 // 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	385 // 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	386 // new TimeStampedPath for each `rev` → `children` vertex.
46575 389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	387 // Retrieve data computed in a previous iteration
389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	388 let p1_copies = match p1 {
389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	389 NULL_REVISION => None,
389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	390 _ => get_and_clean_parent_copies(
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	391 &mut all_copies,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	392 &mut children_count,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	393 p1,
46575 389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	394 ), // will be None if the vertex is not to be traversed
389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	395 };
389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	396 let p2_copies = match p2 {
389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	397 NULL_REVISION => None,
389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	398 _ => get_and_clean_parent_copies(
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	399 &mut all_copies,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	400 &mut children_count,
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	401 p2,
46575 389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	402 ), // will be None if the vertex is not to be traversed
389b0328b789 copies-rust: get the parents' copies earlier Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46569 diff changeset	403 };
46576 f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	404 // combine it with data for that revision
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	405 let (p1_copies, p2_copies) =
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	406 chain_changes(&mut path_map, p1_copies, p2_copies, &changes, rev);
46576 f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	407 let copies = match (p1_copies, p2_copies) {
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	408 (None, None) => None,
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	409 (c, None) => c,
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	410 (None, c) => c,
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	411 (Some(p1_copies), Some(p2_copies)) => Some(merge_copies_dict(
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	412 &path_map, rev, p2_copies, p1_copies, &changes,
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	413 )),
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	414 };
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	415 if let Some(c) = copies {
f8bdc8329d77 copies-rust: use matching to select the final copies information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46575 diff changeset	416 all_copies.insert(rev, c);
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	417 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	418 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	419
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	420 // 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	421 // mapping.
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	422 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	423 .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	424 .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	425 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	426 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	427 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	428 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	429 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	430 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	431 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	432 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	433 result
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	434 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	435
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	436 /// 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	437 ///
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	438 /// 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	439 /// the cache.
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	440 ///
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	441 /// 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	442 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	443 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	444 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	445 parent_rev: Revision,
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	446 ) -> Option<InternalPathCopies> {
46149 294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	447 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	448 *count -= 1;
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	449 if *count == 0 {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	450 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	451 Some(c) => Some(c),
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	452 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	453 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	454 } else {
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	455 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	456 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	457 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	458 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	459 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	460 }
294d5aca4ff5 copies: iterate over children directly (instead of parents) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46129 diff changeset	461
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	462 /// 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	463 /// the result
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	464 fn chain_changes(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	465 path_map: &mut TwoWayPathMap,
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	466 base_p1_copies: Option<InternalPathCopies>,
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	467 base_p2_copies: Option<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	468 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	469 current_rev: Revision,
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	470 ) -> (Option<InternalPathCopies>, Option<InternalPathCopies>) {
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	471 // Fast path the "nothing to do" case.
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	472 if let (None, None) = (&base_p1_copies, &base_p2_copies) {
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	473 return (None, None);
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	474 }
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	475
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	476 let mut p1_copies = base_p1_copies.clone();
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	477 let mut p2_copies = base_p2_copies.clone();
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	478 for action in changes.iter_actions() {
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	479 match action {
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	480 Action::CopiedFromP1(path_dest, path_source) => {
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	481 match &mut p1_copies {
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	482 None => (), // This is not a vertex we should proceed.
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	483 Some(copies) => add_one_copy(
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	484 current_rev,
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	485 path_map,
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	486 copies,
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	487 base_p1_copies.as_ref().unwrap(),
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	488 path_dest,
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	489 path_source,
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	490 ),
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	491 }
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	492 }
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	493 Action::CopiedFromP2(path_dest, path_source) => {
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	494 match &mut p2_copies {
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	495 None => (), // This is not a vertex we should proceed.
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	496 Some(copies) => add_one_copy(
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	497 current_rev,
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	498 path_map,
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	499 copies,
600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	500 base_p2_copies.as_ref().unwrap(),
46578 a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	501 path_dest,
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	502 path_source,
a34cd9aa3323 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46577 diff changeset	503 ),
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	504 }
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	505 }
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	506 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	507 // 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	508 //
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	509 // 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	510 // 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	511 // InternalPathCopies object.
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	512 let deleted = path_map.tokenize(deleted_path);
46580 2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	513
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	514 let p1_entry = match &mut p1_copies {
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	515 None => None,
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	516 Some(copies) => match copies.entry(deleted) {
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	517 Entry::Occupied(e) => Some(e),
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	518 Entry::Vacant(_) => None,
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	519 },
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	520 };
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	521 let p2_entry = match &mut p2_copies {
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	522 None => None,
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	523 Some(copies) => match copies.entry(deleted) {
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	524 Entry::Occupied(e) => Some(e),
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	525 Entry::Vacant(_) => None,
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	526 },
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	527 };
46580 2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	528
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	529 match (p1_entry, p2_entry) {
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	530 (None, None) => (),
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	531 (Some(mut e), None) => {
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	532 e.get_mut().mark_delete(current_rev)
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	533 }
46580 2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	534 (None, Some(mut e)) => {
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	535 e.get_mut().mark_delete(current_rev)
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	536 }
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	537 (Some(mut e1), Some(mut e2)) => {
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	538 e1.get_mut().mark_delete(current_rev);
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	539 e2.get_mut().mark_delete(current_rev);
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	540 }
2076df13d00f copies-rust: refactor the "deletion" case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46579 diff changeset	541 }
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	542 }
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	543 }
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	544 }
46579 600f8d510ab6 copies-rust: process copy information of both parent at the same time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46578 diff changeset	545 (p1_copies, p2_copies)
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	546 }
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	547
46577 d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	548 // insert one new copy information in an InternalPathCopies
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	549 //
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	550 // This deal with chaining and overwrite.
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	551 fn add_one_copy(
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	552 current_rev: Revision,
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	553 path_map: &mut TwoWayPathMap,
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	554 copies: &mut InternalPathCopies,
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	555 base_copies: &InternalPathCopies,
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	556 path_dest: &HgPath,
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	557 path_source: &HgPath,
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	558 ) {
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	559 let dest = path_map.tokenize(path_dest);
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	560 let source = path_map.tokenize(path_source);
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	561 let entry;
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	562 if let Some(v) = base_copies.get(&source) {
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	563 entry = match &v.path {
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	564 Some(path) => Some((*(path)).to_owned()),
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	565 None => Some(source.to_owned()),
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	566 }
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	567 } else {
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	568 entry = Some(source.to_owned());
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	569 }
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	570 // Each new entry is introduced by the children, we
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	571 // record this information as we will need it to take
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	572 // the right decision when merging conflicting copy
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	573 // information. See merge_copies_dict for details.
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	574 match copies.entry(dest) {
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	575 Entry::Vacant(slot) => {
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	576 let ttpc = CopySource::new(current_rev, entry);
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	577 slot.insert(ttpc);
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	578 }
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	579 Entry::Occupied(mut slot) => {
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	580 let ttpc = slot.get_mut();
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	581 ttpc.overwrite(current_rev, entry);
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	582 }
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	583 }
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	584 }
d2ad44b8ef6a copies-rust: extract the processing of a single copy information Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46576 diff changeset	585
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	586 /// 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	587 ///
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	588 /// 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	589 /// cases. See inline documentation for details.
46569 34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	590 fn merge_copies_dict(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	591 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	592 current_merge: Revision,
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	593 mut minor: InternalPathCopies,
313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	594 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	595 changes: &ChangedFiles,
46564 313610be4147 copies-rust: rename TimeStampedPathCopies to InternalPathCopies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46563 diff changeset	596 ) -> 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	597 // 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	598 // 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	599 // code is more settled.
46569 34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	600 let cmp_value =
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	601 \|dest: &PathToken, src_minor: &CopySource, src_major: &CopySource\| {
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	602 compare_value(
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	603 path_map,
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	604 current_merge,
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	605 changes,
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	606 dest,
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	607 src_minor,
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	608 src_major,
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	609 )
34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	610 };
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	611 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	612 major
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	613 } 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	614 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	615 } 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	616 // 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	617 //
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	618 // 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	619 // 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	620 //
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	621 // 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	622 // 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	623 // 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	624 //
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	625 // 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	626 // 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	627 // 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	628 //
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	629 // 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	630 // 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	631 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	632 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	633 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	634 None => {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	635 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	636 }
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	637 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	638 let (pick, overwrite) =
46569 34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	639 cmp_value(&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	640 if overwrite {
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	641 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	642 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	643 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	644 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	645 &src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	646 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	647 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	648 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	649 &src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	650 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	651 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	652 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	653 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	654 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	655 &src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	656 ),
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	657 };
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	658 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	659 } else {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	660 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	661 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	662 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	663 };
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	664 }
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	665 }
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	666 };
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	667 }
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	668 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	669 } 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	670 // 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	671 // (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	672 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	673 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	674 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	675 None => {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	676 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	677 }
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	678 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	679 let (pick, overwrite) =
46569 34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	680 cmp_value(&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	681 if overwrite {
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	682 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	683 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	684 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	685 &src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	686 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	687 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	688 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	689 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	690 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	691 &src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	692 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	693 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	694 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	695 &src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	696 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	697 ),
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	698 };
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	699 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	700 } else {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	701 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	702 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	703 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	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 }
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	706 }
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	707 };
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	708 }
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	709 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	710 } else {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	711 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	712 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	713
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	714 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	715 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	716 };
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	717 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	718 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	719 };
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	720
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	721 // 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	722 // 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	723 // 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	724 //
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	725 // 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	726 // 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	727 // 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	728 // 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	729 // 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	730 // 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	731 // small.
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	732 //
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	733 // 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	734 // differently.
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	735 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	736 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	737 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	738 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	739 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	740 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	741 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	742 let (pick, overwrite) =
46569 34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	743 cmp_value(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	744 if overwrite {
46567 b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	745 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	746 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	747 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	748 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	749 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	750 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	751 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	752 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	753 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	754 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	755 ),
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	756 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	757 current_merge,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	758 src_major,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	759 src_minor,
b6f65d90e8af copies-rust: add methods to build and update CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46566 diff changeset	760 ),
46563 c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	761 };
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	762 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	763 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	764 } else {
c19c662097e1 copies: detect case when a merge decision overwrite previous data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46562 diff changeset	765 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	766 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	767 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	768 // 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	769 // 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	770 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	771 }
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	772 }
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	773 }
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	774 };
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	775 }
45971 cc759d3db1e8 copies-rust: leverage the immutability for efficient update Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45964 diff changeset	776
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	777 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	778 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	779 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	780 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	781 } 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	782 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	783 } 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	784 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	785 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	786 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	787 } else {
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	788 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	789 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	790 }
94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	791 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	792 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	793 }
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	794 }
46126 94300498491e copies-rust: move the mapping merging into a else clause Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46125 diff changeset	795 result
45944 595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	796 }
595979dc924e copies: introduce a basic Rust function for `combine_changeset_copies` Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	797 }
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	798
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	799 /// 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	800 /// 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	801 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	802 /// 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	803 Major,
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	804 /// 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	805 Minor,
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	806 /// 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	807 Any,
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	808 }
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	809
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	810 /// 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	811 #[allow(clippy::if_same_then_else)]
46569 34827c95092c copies-rust: remove the ancestor Oracle logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46568 diff changeset	812 fn compare_value(
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	813 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	814 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	815 changes: &ChangedFiles,
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	816 dest: &PathToken,
46565 2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	817 src_minor: &CopySource,
2bd069788367 copies-rust: rename TimeStampedPathCopy to CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46564 diff changeset	818 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	819 ) -> (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	820 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	821 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	822 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	823 // 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	824 // 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	825 // deletion.
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	826 //
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	827 // 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	828 // branch.
0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	829 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	830 (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	831 } 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	832 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	833 }
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	834 } 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	835 // 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	836 // 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	837 (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	838 }
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	839 } 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	840 // 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	841 // 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	842 (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	843 } 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	844 // 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	845 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	846 // 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	847 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	848 (MergePick::Any, false)
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	849 } 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	850 (MergePick::Minor, false)
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	851 } 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	852 (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	853 } 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	854 (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	855 }
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	856 } 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	857 // 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	858 // 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	859 unreachable!(
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	860 "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	861 );
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	862 } else {
46151 c6bc77f7e593 copies-rust: tokenize all paths into integer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46149 diff changeset	863 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	864 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	865 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	866 && src_major.path.is_none()
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	867 && action == MergeCase::Salvaged
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	868 {
46125 61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	869 // 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	870 // 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	871 (MergePick::Minor, true)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	872 } 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	873 && src_minor.path.is_none()
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	874 && action == MergeCase::Salvaged
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	875 {
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 // 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	877 // 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	878 // 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	879 (MergePick::Major, true)
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	880 } 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	881 // 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	882 // the major version
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	883 if action == MergeCase::Merged {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	884 // 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	885 // 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	886 // 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	887 //
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	888 // 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	889 (MergePick::Major, true)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	890 } else {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	891 // 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	892 (MergePick::Major, false)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	893 }
46568 0d840b9d200d copies-rust: track "overwrites" directly within CopySource Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46567 diff changeset	894 } 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	895 if action == MergeCase::Merged {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	896 // 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	897 // 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	898 // 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	899 //
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	900 // 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	901 (MergePick::Major, true)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	902 } else {
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	903 // 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	904 (MergePick::Minor, false)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	905 }
c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	906 } 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	907 // 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	908 (MergePick::Major, true)
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	909 } 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	910 // 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	911 (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	912 } else {
46562 c692384bb559 copies: rearrange all value comparison conditional Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46157 diff changeset	913 // 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	914 (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	915 }
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	916 }
61afe6215aef copies-rust: extract conflicting value comparison in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46059 diff changeset	917 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/copy_tracing.rs @ 46580:2076df13d00f