( )⚙ D10069 copies-rust: pass `PathToken` around by value

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10069

copies-rust: pass `PathToken` around by value
ClosedPublic

Authored by SimonSapin on Feb 25 2021, 5:42 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1fce35fcb4db: copies-rust: pass `PathToken` around by value
Summary

It’s just a usize.

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

SimonSapin created this revision.Feb 25 2021, 5:42 AM
pulkit accepted this revision.Feb 27 2021, 12:17 PM
This revision is now accepted and ready to land.Feb 27 2021, 12:17 PM
SimonSapin added a commit: rHG1fce35fcb4db: copies-rust: pass `PathToken` around by value.Feb 27 2021, 1:31 PM
Closed by commit rHG1fce35fcb4db: copies-rust: pass `PathToken` around by value (authored by SimonSapin). · 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 25981

rust/hg-core/src/copy_tracing.rs

path_map: &TwoWayPathMap, path_map: &TwoWayPathMap,
current_merge: Revision, current_merge: Revision,
minor: InternalPathCopies, minor: InternalPathCopies,
major: InternalPathCopies, major: InternalPathCopies,
changes: &ChangedFiles, changes: &ChangedFiles,
) -> InternalPathCopies { ) -> InternalPathCopies {
use crate::utils::{ordmap_union_with_merge, MergeResult}; use crate::utils::{ordmap_union_with_merge, MergeResult};
ordmap_union_with_merge(minor, major, |dest, src_minor, src_major| { ordmap_union_with_merge(minor, major, |&dest, src_minor, src_major| {
let (pick, overwrite) = compare_value( let (pick, overwrite) = compare_value(
path_map, path_map,
current_merge, current_merge,
changes, changes,
dest, dest,
src_minor, src_minor,
src_major, src_major,
); );
} }
/// decide which side prevails in case of conflicting values /// decide which side prevails in case of conflicting values
#[allow(clippy::if_same_then_else)] #[allow(clippy::if_same_then_else)]
fn compare_value( fn compare_value(
path_map: &TwoWayPathMap, path_map: &TwoWayPathMap,
current_merge: Revision, current_merge: Revision,
changes: &ChangedFiles, changes: &ChangedFiles,
dest: &PathToken, dest: PathToken,
src_minor: &CopySource, src_minor: &CopySource,
src_major: &CopySource, src_major: &CopySource,
) -> (MergePick, bool) { ) -> (MergePick, bool) {
if src_major == src_minor { if src_major == src_minor {
(MergePick::Any, false) (MergePick::Any, false)
} else if src_major.rev == current_merge { } else if src_major.rev == current_merge {
// minor is different according to per minor == major check earlier // minor is different according to per minor == major check earlier
debug_assert!(src_minor.rev != current_merge); debug_assert!(src_minor.rev != current_merge);
(MergePick::Minor, false) (MergePick::Minor, false)
} else if src_minor.is_overwritten_by(src_major) { } else if src_minor.is_overwritten_by(src_major) {
(MergePick::Major, false) (MergePick::Major, false)
} else { } else {
(MergePick::Any, true) (MergePick::Any, true)
} }
} else { } else {
debug_assert!(src_major.rev != src_major.rev); debug_assert!(src_major.rev != src_major.rev);
let dest_path = path_map.untokenize(*dest); let dest_path = path_map.untokenize(dest);
let action = changes.get_merge_case(dest_path); let action = changes.get_merge_case(dest_path);
if src_minor.path.is_some() if src_minor.path.is_some()
&& src_major.path.is_none() && src_major.path.is_none()
&& action == MergeCase::Salvaged && action == MergeCase::Salvaged
{ {
// If the file is "deleted" in the major side but was // If the file is "deleted" in the major side but was
// salvaged by the merge, we keep the minor side alive // salvaged by the merge, we keep the minor side alive
(MergePick::Minor, true) (MergePick::Minor, true)