Skip to content

copy-tracking: refactor async stream for classifying diff entries #9087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ilyagr wants to merge 2 commits into
base: main
Choose a base branch
from
+114 −147
Open

copy-tracking: refactor async stream for classifying diff entries #9087

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
417f0da
copy-tracking: refactor async stream for classifying diff entries
ilyagr Mar 8, 2026
3c078a0
copy-tracking: minor rearrangement of match arms for didactic reasons
ilyagr Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
copy-tracking: minor rearrangement of match arms for didactic reasons 
This could be squashed into parent, but the parent commit's diff seems
easier to review without this change.
  • Loading branch information
@ilyagr
ilyagr committed Mar 18, 2026
commit 3c078a05b1f855a6fd0ecceb98e76958e8dd9e90
18 changes: 9 additions & 9 deletions lib/src/copies.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,15 @@ async fn resolve_diff_entry_copies(
Some(TreeValue::File { copy_id: id2, .. }),
) if id1 == id2 => vec![CopyHistoryTreeDiffEntry::normal(diff_entry)],

// New file with copy history — needs copy-tracing.
(None, Some(f @ TreeValue::File { .. })) => {
let f = f.clone();
vec![CopyHistoryTreeDiffEntry {
target_path: diff_entry.path,
diffs: diffs_from_copies(before_tree, after_tree, f).await,
}]
}

// For files with non-matching copy-ids, or for a non-file that changes to a
// file, mark the first as deleted and do copy-tracing on the second.
//
Expand Down Expand Up @@ -456,15 +465,6 @@ async fn resolve_diff_entry_copies(
]
}

// New file with copy history — needs copy-tracing.
(None, Some(f @ TreeValue::File { .. })) => {
let f = f.clone();
vec![CopyHistoryTreeDiffEntry {
target_path: diff_entry.path,
diffs: diffs_from_copies(before_tree, after_tree, f).await,
}]
}

// Anything else (e.g. file => non-file non-tree), issue a simple diff entry.
//
// NOTE[deletion-diff-entry2]: this is another point where a spurious deletion entry
Expand Down