This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9657

copies-rust: fix reverted argument when merging tiny minor or major
ClosedPublic

Authored by marmoute on Dec 22 2020, 9:11 PM.

Details

Reviewers
SimonSapin
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3c5a8b13206a: copies-rust: fix reverted argument when merging tiny minor or major
rHG1e99d09cc03f: copies-rust: fix reverted argument when merging tiny minor or major
Summary

The argument where not passed in the right other. This is not caught by the test
(yet) because it is a sub case of a special case. Am I adding this to my list of
things to test. Using test directly in Rust would be appropriate here. However
we don't have the ability to test this code that way yet, and I am focussing on
other part of that work right now.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 22 2020, 9:11 PM
SimonSapin accepted this revision.Dec 28 2020, 8:38 AM
SimonSapin added a subscriber: SimonSapin.

This makes the else if major.len() * 2 < minor.len() block the same as else if minor.len() * 2 < major.len() block above but with major and minor swapped, as it should be.

baymax updated this revision to Diff 24576.Jan 5 2021, 3:52 AM

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

baymax updated this revision to Diff 24598.Jan 5 2021, 9:17 AM

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

Alphare accepted this revision.Jan 8 2021, 6:13 AM
baymax updated this revision to Diff 24639.Jan 8 2021, 10:26 AM

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

baymax updated this revision to Diff 25687.Feb 22 2021, 9:04 AM

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

baymax updated this revision to Diff 25746.Feb 22 2021, 11:17 AM

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

baymax updated this revision to Diff 25781.Feb 22 2021, 3:16 PM

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

marmoute added a commit: rHG1e99d09cc03f: copies-rust: fix reverted argument when merging tiny minor or major.Feb 24 2021, 11:01 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1e99d09cc03f: copies-rust: fix reverted argument when merging tiny minor or major (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 25846

rust/hg-core/src/copy_tracing.rs

for (dest, src_major) in major { for (dest, src_major) in major {
let src_minor = minor.get(&dest); let src_minor = minor.get(&dest);
match src_minor { match src_minor {
None => { None => {
minor.insert(dest, src_major); minor.insert(dest, src_major);
} }
Some(src_minor) => { Some(src_minor) => {
let (pick, overwrite) = let (pick, overwrite) =
cmp_value(oracle, &dest, &src_major, src_minor); cmp_value(oracle, &dest, src_minor, &src_major);
if overwrite { if overwrite {
oracle.record_overwrite(src_minor.rev, current_merge); oracle.record_overwrite(src_minor.rev, current_merge);
oracle.record_overwrite(src_major.rev, current_merge); oracle.record_overwrite(src_major.rev, current_merge);
let path = match pick { let path = match pick {
MergePick::Major => src_minor.path, MergePick::Major => src_minor.path,
MergePick::Minor => src_major.path, MergePick::Minor => src_major.path,
MergePick::Any => src_major.path, MergePick::Any => src_major.path,
}; };
let src = CopySource { let src = CopySource {
rev: current_merge, rev: current_merge,
path, path,
}; };
minor.insert(dest, src); minor.insert(dest, src);
} else { } else {
match pick { match pick {
MergePick::Any | MergePick::Major => None, MergePick::Any | MergePick::Minor => None,
MergePick::Minor => minor.insert(dest, src_major), MergePick::Major => minor.insert(dest, src_major),
}; };
} }
} }
}; };
} }
minor minor
} else { } else {
let mut override_minor = Vec::new(); let mut override_minor = Vec::new();