Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git: Reduce amount of git commands when checking for pushed commits (#59069)

Lukas Geiger5e514f462413
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
index d899c53af2c..3d164af6a07 100644
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -2646,52 +2646,29 @@ impl GitRepository for RealGitRepository {
let git = self.git_binary_in_worktree();
self.executor
.spawn(async move {
- let git = git?;
- let git_cmd = async |args: &[&str]| -> Result<String> {
- let output = git.build_command(args).output().await?;
- anyhow::ensure!(
- output.status.success(),
- String::from_utf8_lossy(&output.stderr).to_string()
- );
- Ok(String::from_utf8(output.stdout)?)
- };
-
- let head = git_cmd(&["rev-parse", "HEAD"])
+ // This command outputs a list of remote tracking refs, e.g.:
+ // refs/remotes/origin/HEAD
+ // refs/remotes/origin/main
+ let Ok(output) = git?
+ .run(&[
+ "for-each-ref",
+ "--format=%(refname)",
+ "--contains",
+ "HEAD",
+ "refs/remotes/",
+ ])
.await
- .context("Failed to get HEAD")?
- .trim()
- .to_owned();
-
- let mut remote_branches = vec![];
- let mut add_if_matching = async |remote_head: &str| {
- if let Ok(merge_base) = git_cmd(&["merge-base", &head, remote_head]).await
- && merge_base.trim() == head
- && let Some(s) = remote_head.strip_prefix("refs/remotes/")
- {
- remote_branches.push(s.to_owned().into());
- }
+ else {
+ return Ok(Vec::new());
};
- // check the main branch of each remote
- let remotes = git_cmd(&["remote"])
- .await
- .context("Failed to get remotes")?;
- for remote in remotes.lines() {
- if let Ok(remote_head) =
- git_cmd(&["symbolic-ref", &format!("refs/remotes/{remote}/HEAD")]).await
- {
- add_if_matching(remote_head.trim()).await;
- }
- }
-
- // ... and the remote branch that the checked-out one is tracking
- if let Ok(remote_head) =
- git_cmd(&["rev-parse", "--symbolic-full-name", "@{u}"]).await
- {
- add_if_matching(remote_head.trim()).await;
- }
-
- Ok(remote_branches)
+ Ok(output
+ .lines()
+ .map(|line| line.trim())
+ .filter(|line| !line.ends_with("/HEAD"))
+ .filter_map(|line| line.strip_prefix("refs/remotes/"))
+ .map(SharedString::from)
+ .collect())
})
.boxed()
}
@@ -5163,6 +5140,59 @@ mod tests {
assert!(graph.contains(&hidden_sha));
}
+ #[gpui::test]
+ async fn test_check_for_pushed_commit(cx: &mut TestAppContext) {
+ disable_git_global_config();
+ cx.executor().allow_parking();
+
+ let temp_dir = tempfile::tempdir().unwrap();
+ let repo_dir = temp_dir.path().join("repo");
+ git_init_repo(&repo_dir);
+
+ let repo = RealGitRepository::new(
+ &repo_dir.join(".git"),
+ None,
+ Some("git".into()),
+ cx.executor(),
+ )
+ .unwrap();
+
+ // New repo doesn't have any commits yet
+ assert!(repo.check_for_pushed_commit().await.unwrap().is_empty());
+
+ git_command(
+ &repo_dir,
+ ["commit", "--allow-empty", "-m", "Initial commit"],
+ );
+
+ // No remote branches exist yet
+ assert!(repo.check_for_pushed_commit().await.unwrap().is_empty());
+
+ // Create simulated remote branches
+ git_command(
+ &repo_dir,
+ ["update-ref", "refs/remotes/origin/main", "HEAD"],
+ );
+ git_command(
+ &repo_dir,
+ ["update-ref", "refs/remotes/origin/other-branch", "HEAD"],
+ );
+ assert_eq!(
+ repo.check_for_pushed_commit().await.unwrap(),
+ vec![
+ SharedString::from("origin/main"),
+ SharedString::from("origin/other-branch")
+ ]
+ );
+
+ // Switch to a new branch, commit but do not push
+ git_command(&repo_dir, ["switch", "-c", "local-feature"]);
+ git_command(&repo_dir, ["commit", "--allow-empty", "-m", "Local commit"]);
+
+ // New commit has not been pushed
+ assert!(repo.check_for_pushed_commit().await.unwrap().is_empty());
+ }
+
#[test]
fn test_original_repo_path_from_common_dir() {
// Normal repo: common_dir is <work_dir>/.git