Remove revspec workaround

Author: cruessler

asyncgit/src/error.rs

@@ -54,6 +54,10 @@ pub enum GixError {
 		#[from] gix::reference::find::existing::Error,
 	),
 
+	///
+	#[error("gix::reference::head_tree::Error error: {0}")]
+	ReferenceHeadTree(#[from] gix::reference::head_tree::Error),
+
 	///
 	#[error("gix::reference::head_tree_id::Error error: {0}")]
 	ReferenceHeadTreeId(#[from] gix::reference::head_tree_id::Error),
@@ -296,6 +300,12 @@ impl From<gix::reference::find::existing::Error> for Error {
 	}
 }
 
+impl From<gix::reference::head_tree::Error> for Error {
+	fn from(error: gix::reference::head_tree::Error) -> Self {
+		Self::Gix(GixError::from(error))
+	}
+}
+
 impl From<gix::reference::head_tree_id::Error> for Error {
 	fn from(error: gix::reference::head_tree_id::Error) -> Self {
 		Self::Gix(GixError::from(error))

asyncgit/src/sync/diff.rs

@@ -319,26 +319,6 @@ impl ConsumeHunk for FileDiff {
 	}
 }
 
-fn resolve_revspec(
-	gix_repo: &gix::Repository,
-	revspec: &str,
-) -> (ObjectId, Option<std::path::PathBuf>) {
-	gix_repo.rev_parse(revspec).map_or_else(
-		|_| {
-			(
-				ObjectId::null(gix::hash::Kind::Sha1),
-				gix_repo.workdir().map(ToOwned::to_owned),
-			)
-		},
-		|resolved_revspec| {
-			resolved_revspec.single().map_or_else(
-				|| (ObjectId::null(gix::hash::Kind::Sha1), None),
-				|id| (id.into(), None),
-			)
-		},
-	)
-}
-
 /// returns diff of a specific file either in `stage` or workdir
 pub fn get_diff(
 	repo_path: &RepoPath,
@@ -356,18 +336,42 @@ pub fn get_diff(
 	);
 
 	// TODO:
-	// Make sure that the revspec logic is correct, i. e. uses the correct syntax for all the
-	// relevant cases.
-	let (old_revspec, new_revspec) = if stage {
-		(format!("HEAD:{p}"), format!(":{p}"))
+	// The lower tree is `stage == true`, the upper tree is `stage == false`.
+	let (old_blob_id, old_root) = if stage {
+		(
+			gix_repo
+				.head_tree()?
+				.lookup_entry_by_path(p)
+				.expect("TODO")
+				.expect("TODO")
+				.object_id(),
+			None,
+		)
 	} else {
-		(format!(":{p}"), p.to_string())
+		(
+			gix_repo
+				.index()?
+				.entry_by_path(p.into())
+				.expect("TODO")
+				.id,
+			None,
+		)
+	};
+	let (new_blob_id, new_root) = if stage {
+		(
+			gix_repo
+				.index()?
+				.entry_by_path(p.into())
+				.expect("TODO")
+				.id,
+			None,
+		)
+	} else {
+		(
+			ObjectId::null(gix::hash::Kind::Sha1),
+			gix_repo.workdir().map(ToOwned::to_owned),
+		)
 	};
-
-	let (old_blob_id, old_root) =
-		resolve_revspec(&gix_repo, &old_revspec);
-	let (new_blob_id, new_root) =
-		resolve_revspec(&gix_repo, &new_revspec);
 
 	let worktree_roots = gix::diff::blob::pipeline::WorktreeRoots {
 		old_root,