From 588cd526fd78b3a0e0ec1dfb9fc194ca385de902 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 23 Aug 2020 17:41:37 +0200 Subject: Suggestion.diff_command: Diff an index instead of a file This will enable us to use the `git diff` command with more than one suggestion at the same time. We compare the commit of the suggestion with the new index's tree. And as I write this, I'm realising that we can't diff multiple suggestions using the same commit because each suggestion has its own commit. Need to work out a different way to do this. --- github-suggestion/src/suggestion.rs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'github-suggestion') diff --git a/github-suggestion/src/suggestion.rs b/github-suggestion/src/suggestion.rs index 21591b1..29fab04 100644 --- a/github-suggestion/src/suggestion.rs +++ b/github-suggestion/src/suggestion.rs @@ -157,7 +157,27 @@ impl Suggestion { message: "unable to read right side of patch".to_owned(), })?; - Ok(repo.blob(&new_buffer)?) + let mut index = repo.index()?; + index.add_frombuffer( + &git2::IndexEntry { + ctime: git2::IndexTime::new(0, 0), + mtime: git2::IndexTime::new(0, 0), + dev: 0, + ino: 0, + mode: 0o100644, + uid: 0, + gid: 0, + file_size: new_buffer.len() as u32, + id: git2::Oid::zero(), + flags: 0, + flags_extended: 0, + path: self.path.as_bytes().to_vec(), + }, + &new_buffer, + )?; + let tree = index.write_tree()?; + + Ok(tree) } /// Extract suggestion code from a comment body. -- cgit v1.2.3