diff --git a/rust/hg-core/src/copy_tracing.rs b/rust/hg-core/src/copy_tracing.rs --- a/rust/hg-core/src/copy_tracing.rs +++ b/rust/hg-core/src/copy_tracing.rs @@ -16,7 +16,7 @@ pub type PathCopies = HashMap; +type InternalPathCopies = OrdMap; /// hold parent 1, parent 2 and relevant files actions. pub type RevInfo<'a> = (Revision, Revision, ChangedFiles<'a>); @@ -521,7 +521,7 @@ fn add_from_changes { - let ttpc = TimeStampedPathCopy { + let ttpc = CopySource { rev: current_rev, path: entry, }; @@ -570,8 +570,8 @@ fn merge_copies_dict, dest: &PathToken, - src_minor: &TimeStampedPathCopy, - src_major: &TimeStampedPathCopy| { + src_minor: &CopySource, + src_major: &CopySource| { compare_value( path_map, current_merge, @@ -619,7 +619,7 @@ fn merge_copies_dict src_minor.path, MergePick::Any => src_major.path, }; - let src = TimeStampedPathCopy { + let src = CopySource { rev: current_merge, path, }; @@ -654,7 +654,7 @@ fn merge_copies_dict src_major.path, MergePick::Any => src_major.path, }; - let src = TimeStampedPathCopy { + let src = CopySource { rev: current_merge, path, }; @@ -673,10 +673,10 @@ fn merge_copies_dict src_major.path, }; - let src = TimeStampedPathCopy { + let src = CopySource { rev: current_merge, path, }; @@ -773,8 +773,8 @@ fn compare_value, dest: &PathToken, - src_minor: &TimeStampedPathCopy, - src_major: &TimeStampedPathCopy, + src_minor: &CopySource, + src_major: &CopySource, ) -> (MergePick, bool) { if src_major.rev == current_merge { if src_minor.rev == current_merge {