Skip to content

chore(git): remove dead DiffDelta::similarity and simplify parse_diff_raw #1336

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
jwiegley wants to merge 1 commit into
base: dc/git-rewrite-log-cleanup
Choose a base branch
from
+1 −22
Open

chore(git): remove dead DiffDelta::similarity and simplify parse_diff_raw #1336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 1 addition & 22 deletions src/git/diff_tree_to_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::git::status::MAX_PATHSPEC_ARGS;
use std::collections::HashSet;
use std::path::{Path, PathBuf};

#[allow(dead_code)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum DiffStatus {
Added,
Expand Down Expand Up @@ -32,7 +31,6 @@ impl DiffStatus {
}
}

#[allow(dead_code)]
#[derive(Debug, Clone)]
pub struct DiffFile {
path: Option<PathBuf>,
Expand All @@ -45,18 +43,15 @@ impl DiffFile {
self.path.as_deref()
}

#[allow(dead_code)]
pub fn mode(&self) -> &str {
&self.mode
}

#[allow(dead_code)]
pub fn id(&self) -> &str {
&self.oid
}
}

#[allow(dead_code)]
#[derive(Debug, Clone)]
pub struct DiffDelta {
status: DiffStatus,
Expand All @@ -75,15 +70,9 @@ impl DiffDelta {
&self.new_file
}

#[allow(dead_code)]
pub fn status(&self) -> DiffStatus {
self.status
}

#[allow(dead_code)]
pub fn similarity(&self) -> u32 {
self.similarity
}
}

pub struct Diff {
Expand All @@ -95,12 +84,10 @@ impl Diff {
self.deltas.iter()
}

#[allow(dead_code)]
pub fn len(&self) -> usize {
self.deltas.len()
}

#[allow(dead_code)]
pub fn is_empty(&self) -> bool {
self.deltas.is_empty()
}
Expand Down Expand Up @@ -273,15 +260,7 @@ fn parse_diff_raw(data: &[u8]) -> Result<Vec<DiffDelta>, GitAiError> {
// Construct the old_file and new_file
let old_file = DiffFile {
path: old_path
.or_else(|| {
// For deletions, the old file path is the path
#[allow(clippy::if_same_then_else)]
if matches!(status, DiffStatus::Deleted) {
Some(new_path.clone())
} else {
Some(new_path.clone())
}
})
.or_else(|| Some(new_path.clone()))
.map(PathBuf::from),
mode: old_mode.to_string(),
oid: old_hash.to_string(),
Expand Down
Loading