This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9301

copies-rust: pre-indent some code to clarify the next changeset
ClosedPublic

Authored by marmoute on Nov 12 2020, 10:16 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG46a16b2c082d: copies-rust: pre-indent some code to clarify the next changeset
Summary

The next changeset will massively rewrite the next function. However having a
clear diff on the core semantic of the function will help making the next
changesets clearer. So we do most of the churn beforehand.

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.Nov 12 2020, 10:16 AM
Alphare accepted this revision.Nov 13 2020, 6:27 AM
marmoute updated this revision to Diff 23495.Nov 13 2020, 7:05 PM
Alphare updated this revision to Diff 23724.Nov 27 2020, 11:11 AM
pulkit accepted this revision.Nov 28 2020, 4:46 AM
This revision is now accepted and ready to land.Nov 28 2020, 4:46 AM
marmoute updated this revision to Diff 23797.Nov 28 2020, 6:15 PM

Revision Contents
Changeset List

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

Diff 23849

rust/hg-core/src/copy_tracing.rs

major: TimeStampedPathCopies, major: TimeStampedPathCopies,
changes: &ChangedFiles, changes: &ChangedFiles,
is_ancestor: &impl Fn(Revision, Revision) -> bool, is_ancestor: &impl Fn(Revision, Revision) -> bool,
) -> TimeStampedPathCopies { ) -> TimeStampedPathCopies {
let mut result = minor.clone(); let mut result = minor.clone();
for (dest, src_major) in major { for (dest, src_major) in major {
let overwrite; let overwrite;
if let Some(src_minor) = minor.get(&dest) { if let Some(src_minor) = minor.get(&dest) {
{
if src_major.path == src_minor.path { if src_major.path == src_minor.path {
// we have the same value, but from other source; // we have the same value, no need to battle;
if src_major.rev == src_minor.rev { if src_major.rev == src_minor.rev {
// If the two entry are identical, no need to do anything // If the two entry are identical, no need to do
// anything
overwrite = false; overwrite = false;
} else if is_ancestor(src_major.rev, src_minor.rev) { } else if is_ancestor(src_major.rev, src_minor.rev) {
overwrite = false; overwrite = false;
} else { } else {
overwrite = true; overwrite = true;
} }
} else if src_major.rev == src_minor.rev { } else if src_major.rev == src_minor.rev {
// We cannot get copy information for both p1 and p2 in the // We cannot get copy information for both p1 and p2 in the
// same rev. So this is the same value. // same rev. So this is the same value.
overwrite = false; overwrite = false;
} else if src_major.path.is_none() } else if src_major.path.is_none()
&& changes.salvaged.contains(&dest) && changes.salvaged.contains(&dest)
{ {
// If the file is "deleted" in the major side but was salvaged // If the file is "deleted" in the major side but was
// by the merge, we keep the minor side alive // salvaged by the merge, we keep the minor side alive
overwrite = false; overwrite = false;
} else if src_minor.path.is_none() } else if src_minor.path.is_none()
&& changes.salvaged.contains(&dest) && changes.salvaged.contains(&dest)
{ {
// If the file is "deleted" in the minor side but was salvaged // If the file is "deleted" in the minor side but was
// by the merge, unconditionnaly preserve the major side. // salvaged by the merge, unconditionnaly preserve the
// major side.
overwrite = true; overwrite = true;
} else if changes.merged.contains(&dest) { } else if changes.merged.contains(&dest) {
// If the file was actively merged, copy information from each // If the file was actively merged, copy information from
// side might conflict. The major side will win such conflict. // each side might conflict. The major side will win such
// conflict.
overwrite = true; overwrite = true;
} else if is_ancestor(src_major.rev, src_minor.rev) { } else if is_ancestor(src_major.rev, src_minor.rev) {
// If the minor side is strictly newer than the major side, it // If the minor side is strictly newer than the major side,
// should be kept. // it should be kept.
overwrite = false; overwrite = false;
} else if src_major.path.is_some() { } else if src_major.path.is_some() {
// without any special case, the "major" value win other the // without any special case, the "major" value win other
// "minor" one. // the "minor" one.
overwrite = true; overwrite = true;
} else if is_ancestor(src_minor.rev, src_major.rev) { } else if is_ancestor(src_minor.rev, src_major.rev) {
// the "major" rev is a direct ancestors of "minor", any // the "major" rev is a direct ancestors of "minor", any
// different value should overwrite // different value should overwrite
overwrite = true; overwrite = true;
} else { } else {
// major version is None (so the file was deleted on that // major version is None (so the file was deleted on that
// branch) annd that branch is independant (neither minor nor // branch) and that branch is independant (neither minor
// major is an ancestors of the other one.) We preserve the new // nor major is an ancestors of the other one.) We preserve
// information about the new file. // the new information about the new file.
overwrite = false; overwrite = false;
} }
}
} else { } else {
// minor had no value // minor had no value
overwrite = true; overwrite = true;
} }
if overwrite { if overwrite {
result.insert(dest, src_major); result.insert(dest, src_major);
} }
} }
result result
} }