This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9426

copies-rust: hide most of the comparison details inside a closure
ClosedPublic

Authored by marmoute on Nov 27 2020, 11:12 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc58c8f1d63b1: copies-rust: hide most of the comparison details inside a closure
Summary

The function that compares values needs various supporting elements that are
the same for each call. We are about to both make change to these element and
change to call sites in our upcoming work. So abstracting most of the details
will help to avoid conflict while these works happen in parallel.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Nov 27 2020, 11:12 AM
marmoute updated this revision to Diff 23824.Nov 29 2020, 6:14 AM
marmoute updated this revision to Diff 23872.Nov 29 2020, 3:29 PM
marmoute added a reviewer: Alphare.Dec 8 2020, 5:48 AM
marmoute commandeered this revision.
baymax updated this revision to Diff 24119.Dec 8 2020, 6:04 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 24132.Dec 8 2020, 9:58 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Dec 12 2020, 3:25 AM
This revision is now accepted and ready to land.Dec 12 2020, 3:25 AM
Alphare accepted this revision.Dec 14 2020, 4:40 AM
marmoute updated this revision to Diff 24213.Dec 14 2020, 6:16 AM
baymax updated this revision to Diff 24237.Dec 14 2020, 7:06 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/copy_tracing.rs (13 lines)

Diff 23742

rust/hg-core/src/copy_tracing.rs

/// In case of conflict, value from "major" will be picked, unless in some /// In case of conflict, value from "major" will be picked, unless in some
/// cases. See inline documentation for details. /// cases. See inline documentation for details.
fn merge_copies_dict<A: Fn(Revision, Revision) -> bool>( fn merge_copies_dict<A: Fn(Revision, Revision) -> bool>(
minor: TimeStampedPathCopies, minor: TimeStampedPathCopies,
major: TimeStampedPathCopies, major: TimeStampedPathCopies,
changes: &ChangedFiles, changes: &ChangedFiles,
oracle: &mut AncestorOracle<A>, oracle: &mut AncestorOracle<A>,
) -> TimeStampedPathCopies { ) -> TimeStampedPathCopies {
// This closure exist as temporary help while multiple developper are
// actively working on this code. Feel free to re-inline it once this
// code is more settled.
let mut cmp_value =
|dest: &HgPathBuf,
src_minor: &TimeStampedPathCopy,
src_major: &TimeStampedPathCopy| {
compare_value(changes, oracle, dest, src_minor, src_major)
};
if minor.is_empty() { if minor.is_empty() {
major major
} else if major.is_empty() { } else if major.is_empty() {
minor minor
} else { } else {
let mut override_minor = Vec::new(); let mut override_minor = Vec::new();
let mut override_major = Vec::new(); let mut override_major = Vec::new();
// differently. // differently.
for d in minor.diff(&major) { for d in minor.diff(&major) {
match d { match d {
DiffItem::Add(k, v) => to_minor(k, v), DiffItem::Add(k, v) => to_minor(k, v),
DiffItem::Remove(k, v) => to_major(k, v), DiffItem::Remove(k, v) => to_major(k, v),
DiffItem::Update { old, new } => { DiffItem::Update { old, new } => {
let (dest, src_major) = new; let (dest, src_major) = new;
let (_, src_minor) = old; let (_, src_minor) = old;
match compare_value( match cmp_value(dest, src_minor, src_major) {
changes, oracle, dest, src_minor, src_major,
) {
MergePick::Major => to_minor(dest, src_major), MergePick::Major => to_minor(dest, src_major),
MergePick::Minor => to_major(dest, src_minor), MergePick::Minor => to_major(dest, src_minor),
// If the two entry are identical, no need to do // If the two entry are identical, no need to do
// anything (but diff should not have yield them) // anything (but diff should not have yield them)
MergePick::Any => unreachable!(), MergePick::Any => unreachable!(),
} }
} }
}; };