1use crate::commit::parse_git_diff_name_status;
2use crate::status::{GitStatus, StatusCode};
3use crate::{Oid, SHORT_SHA_LENGTH};
4use anyhow::{Context as _, Result, anyhow, bail};
5use collections::HashMap;
6use futures::future::BoxFuture;
7use futures::{AsyncWriteExt, FutureExt as _, select_biased};
8use git2::BranchType;
9use gpui::{AppContext as _, AsyncApp, BackgroundExecutor, SharedString, Task};
10use parking_lot::Mutex;
11use rope::Rope;
12use schemars::JsonSchema;
13use serde::Deserialize;
14use std::borrow::{Borrow, Cow};
15use std::ffi::{OsStr, OsString};
16use std::io::prelude::*;
17use std::path::Component;
18use std::process::{ExitStatus, Stdio};
19use std::sync::LazyLock;
20use std::{
21 cmp::Ordering,
22 future,
23 io::{BufRead, BufReader, BufWriter, Read},
24 path::{Path, PathBuf},
25 sync::Arc,
26};
27use sum_tree::MapSeekTarget;
28use thiserror::Error;
29use util::command::{new_smol_command, new_std_command};
30use util::{ResultExt, paths};
31use uuid::Uuid;
32
33pub use askpass::{AskPassDelegate, AskPassResult, AskPassSession};
34
35pub const REMOTE_CANCELLED_BY_USER: &str = "Operation cancelled by user";
36
37#[derive(Clone, Debug, Hash, PartialEq, Eq)]
38pub struct Branch {
39 pub is_head: bool,
40 pub ref_name: SharedString,
41 pub upstream: Option<Upstream>,
42 pub most_recent_commit: Option<CommitSummary>,
43}
44
45impl Branch {
46 pub fn name(&self) -> &str {
47 self.ref_name
48 .as_ref()
49 .strip_prefix("refs/heads/")
50 .or_else(|| self.ref_name.as_ref().strip_prefix("refs/remotes/"))
51 .unwrap_or(self.ref_name.as_ref())
52 }
53
54 pub fn is_remote(&self) -> bool {
55 self.ref_name.starts_with("refs/remotes/")
56 }
57
58 pub fn tracking_status(&self) -> Option<UpstreamTrackingStatus> {
59 self.upstream
60 .as_ref()
61 .and_then(|upstream| upstream.tracking.status())
62 }
63
64 pub fn priority_key(&self) -> (bool, Option<i64>) {
65 (
66 self.is_head,
67 self.most_recent_commit
68 .as_ref()
69 .map(|commit| commit.commit_timestamp),
70 )
71 }
72}
73
74#[derive(Clone, Debug, Hash, PartialEq, Eq)]
75pub struct Upstream {
76 pub ref_name: SharedString,
77 pub tracking: UpstreamTracking,
78}
79
80impl Upstream {
81 pub fn is_remote(&self) -> bool {
82 self.remote_name().is_some()
83 }
84
85 pub fn remote_name(&self) -> Option<&str> {
86 self.ref_name
87 .strip_prefix("refs/remotes/")
88 .and_then(|stripped| stripped.split("/").next())
89 }
90
91 pub fn stripped_ref_name(&self) -> Option<&str> {
92 self.ref_name.strip_prefix("refs/remotes/")
93 }
94}
95
96#[derive(Clone, Copy, Default)]
97pub struct CommitOptions {
98 pub amend: bool,
99 pub signoff: bool,
100}
101
102#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
103pub enum UpstreamTracking {
104 /// Remote ref not present in local repository.
105 Gone,
106 /// Remote ref present in local repository (fetched from remote).
107 Tracked(UpstreamTrackingStatus),
108}
109
110impl From<UpstreamTrackingStatus> for UpstreamTracking {
111 fn from(status: UpstreamTrackingStatus) -> Self {
112 UpstreamTracking::Tracked(status)
113 }
114}
115
116impl UpstreamTracking {
117 pub fn is_gone(&self) -> bool {
118 matches!(self, UpstreamTracking::Gone)
119 }
120
121 pub fn status(&self) -> Option<UpstreamTrackingStatus> {
122 match self {
123 UpstreamTracking::Gone => None,
124 UpstreamTracking::Tracked(status) => Some(*status),
125 }
126 }
127}
128
129#[derive(Debug, Clone)]
130pub struct RemoteCommandOutput {
131 pub stdout: String,
132 pub stderr: String,
133}
134
135impl RemoteCommandOutput {
136 pub fn is_empty(&self) -> bool {
137 self.stdout.is_empty() && self.stderr.is_empty()
138 }
139}
140
141#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
142pub struct UpstreamTrackingStatus {
143 pub ahead: u32,
144 pub behind: u32,
145}
146
147#[derive(Clone, Debug, Hash, PartialEq, Eq)]
148pub struct CommitSummary {
149 pub sha: SharedString,
150 pub subject: SharedString,
151 /// This is a unix timestamp
152 pub commit_timestamp: i64,
153 pub has_parent: bool,
154}
155
156#[derive(Clone, Debug, Default, Hash, PartialEq, Eq)]
157pub struct CommitDetails {
158 pub sha: SharedString,
159 pub message: SharedString,
160 pub commit_timestamp: i64,
161 pub author_email: SharedString,
162 pub author_name: SharedString,
163}
164
165#[derive(Debug)]
166pub struct CommitDiff {
167 pub files: Vec<CommitFile>,
168}
169
170#[derive(Debug)]
171pub struct CommitFile {
172 pub path: RepoPath,
173 pub old_text: Option<String>,
174 pub new_text: Option<String>,
175}
176
177impl CommitDetails {
178 pub fn short_sha(&self) -> SharedString {
179 self.sha[..SHORT_SHA_LENGTH].to_string().into()
180 }
181}
182
183#[derive(Debug, Clone, Hash, PartialEq, Eq)]
184pub struct Remote {
185 pub name: SharedString,
186}
187
188pub enum ResetMode {
189 /// Reset the branch pointer, leave index and worktree unchanged (this will make it look like things that were
190 /// committed are now staged).
191 Soft,
192 /// Reset the branch pointer and index, leave worktree unchanged (this makes it look as though things that were
193 /// committed are now unstaged).
194 Mixed,
195}
196
197#[derive(Debug, Clone, Hash, PartialEq, Eq)]
198pub enum FetchOptions {
199 All,
200 Remote(Remote),
201}
202
203impl FetchOptions {
204 pub fn to_proto(&self) -> Option<String> {
205 match self {
206 FetchOptions::All => None,
207 FetchOptions::Remote(remote) => Some(remote.clone().name.into()),
208 }
209 }
210
211 pub fn from_proto(remote_name: Option<String>) -> Self {
212 match remote_name {
213 Some(name) => FetchOptions::Remote(Remote { name: name.into() }),
214 None => FetchOptions::All,
215 }
216 }
217
218 pub fn name(&self) -> SharedString {
219 match self {
220 Self::All => "Fetch all remotes".into(),
221 Self::Remote(remote) => remote.name.clone(),
222 }
223 }
224}
225
226impl std::fmt::Display for FetchOptions {
227 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
228 match self {
229 FetchOptions::All => write!(f, "--all"),
230 FetchOptions::Remote(remote) => write!(f, "{}", remote.name),
231 }
232 }
233}
234
235/// Modifies .git/info/exclude temporarily
236pub struct GitExcludeOverride {
237 git_exclude_path: PathBuf,
238 original_excludes: Option<String>,
239 added_excludes: Option<String>,
240}
241
242impl GitExcludeOverride {
243 pub async fn new(git_exclude_path: PathBuf) -> Result<Self> {
244 let original_excludes = smol::fs::read_to_string(&git_exclude_path).await.ok();
245
246 Ok(GitExcludeOverride {
247 git_exclude_path,
248 original_excludes,
249 added_excludes: None,
250 })
251 }
252
253 pub async fn add_excludes(&mut self, excludes: &str) -> Result<()> {
254 self.added_excludes = Some(if let Some(ref already_added) = self.added_excludes {
255 format!("{already_added}\n{excludes}")
256 } else {
257 excludes.to_string()
258 });
259
260 let mut content = self.original_excludes.clone().unwrap_or_default();
261 content.push_str("\n\n# ====== Auto-added by Zed: =======\n");
262 content.push_str(self.added_excludes.as_ref().unwrap());
263 content.push('\n');
264
265 smol::fs::write(&self.git_exclude_path, content).await?;
266 Ok(())
267 }
268
269 pub async fn restore_original(&mut self) -> Result<()> {
270 if let Some(ref original) = self.original_excludes {
271 smol::fs::write(&self.git_exclude_path, original).await?;
272 } else if self.git_exclude_path.exists() {
273 smol::fs::remove_file(&self.git_exclude_path).await?;
274 }
275
276 self.added_excludes = None;
277
278 Ok(())
279 }
280}
281
282impl Drop for GitExcludeOverride {
283 fn drop(&mut self) {
284 if self.added_excludes.is_some() {
285 let git_exclude_path = self.git_exclude_path.clone();
286 let original_excludes = self.original_excludes.clone();
287 smol::spawn(async move {
288 if let Some(original) = original_excludes {
289 smol::fs::write(&git_exclude_path, original).await
290 } else {
291 smol::fs::remove_file(&git_exclude_path).await
292 }
293 })
294 .detach();
295 }
296 }
297}
298
299pub trait GitRepository: Send + Sync {
300 fn reload_index(&self);
301
302 /// Returns the contents of an entry in the repository's index, or None if there is no entry for the given path.
303 ///
304 /// Also returns `None` for symlinks.
305 fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>>;
306
307 /// Returns the contents of an entry in the repository's HEAD, or None if HEAD does not exist or has no entry for the given path.
308 ///
309 /// Also returns `None` for symlinks.
310 fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>>;
311
312 fn set_index_text(
313 &self,
314 path: RepoPath,
315 content: Option<String>,
316 env: Arc<HashMap<String, String>>,
317 ) -> BoxFuture<'_, anyhow::Result<()>>;
318
319 /// Returns the URL of the remote with the given name.
320 fn remote_url(&self, name: &str) -> Option<String>;
321
322 /// Resolve a list of refs to SHAs.
323 fn revparse_batch(&self, revs: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>>;
324
325 fn head_sha(&self) -> BoxFuture<'_, Option<String>> {
326 async move {
327 self.revparse_batch(vec!["HEAD".into()])
328 .await
329 .unwrap_or_default()
330 .into_iter()
331 .next()
332 .flatten()
333 }
334 .boxed()
335 }
336
337 fn merge_message(&self) -> BoxFuture<'_, Option<String>>;
338
339 fn status(&self, path_prefixes: &[RepoPath]) -> Task<Result<GitStatus>>;
340
341 fn branches(&self) -> BoxFuture<'_, Result<Vec<Branch>>>;
342
343 fn change_branch(&self, name: String) -> BoxFuture<'_, Result<()>>;
344 fn create_branch(&self, name: String) -> BoxFuture<'_, Result<()>>;
345
346 fn reset(
347 &self,
348 commit: String,
349 mode: ResetMode,
350 env: Arc<HashMap<String, String>>,
351 ) -> BoxFuture<'_, Result<()>>;
352
353 fn checkout_files(
354 &self,
355 commit: String,
356 paths: Vec<RepoPath>,
357 env: Arc<HashMap<String, String>>,
358 ) -> BoxFuture<'_, Result<()>>;
359
360 fn show(&self, commit: String) -> BoxFuture<'_, Result<CommitDetails>>;
361
362 fn load_commit(&self, commit: String, cx: AsyncApp) -> BoxFuture<'_, Result<CommitDiff>>;
363 fn blame(&self, path: RepoPath, content: Rope) -> BoxFuture<'_, Result<crate::blame::Blame>>;
364
365 /// Returns the absolute path to the repository. For worktrees, this will be the path to the
366 /// worktree's gitdir within the main repository (typically `.git/worktrees/<name>`).
367 fn path(&self) -> PathBuf;
368
369 fn main_repository_path(&self) -> PathBuf;
370
371 /// Updates the index to match the worktree at the given paths.
372 ///
373 /// If any of the paths have been deleted from the worktree, they will be removed from the index if found there.
374 fn stage_paths(
375 &self,
376 paths: Vec<RepoPath>,
377 env: Arc<HashMap<String, String>>,
378 ) -> BoxFuture<'_, Result<()>>;
379 /// Updates the index to match HEAD at the given paths.
380 ///
381 /// If any of the paths were previously staged but do not exist in HEAD, they will be removed from the index.
382 fn unstage_paths(
383 &self,
384 paths: Vec<RepoPath>,
385 env: Arc<HashMap<String, String>>,
386 ) -> BoxFuture<'_, Result<()>>;
387
388 fn commit(
389 &self,
390 message: SharedString,
391 name_and_email: Option<(SharedString, SharedString)>,
392 options: CommitOptions,
393 env: Arc<HashMap<String, String>>,
394 ) -> BoxFuture<'_, Result<()>>;
395
396 fn stash_paths(
397 &self,
398 paths: Vec<RepoPath>,
399 env: Arc<HashMap<String, String>>,
400 ) -> BoxFuture<'_, Result<()>>;
401
402 fn stash_pop(&self, env: Arc<HashMap<String, String>>) -> BoxFuture<'_, Result<()>>;
403
404 fn push(
405 &self,
406 branch_name: String,
407 upstream_name: String,
408 options: Option<PushOptions>,
409 askpass: AskPassDelegate,
410 env: Arc<HashMap<String, String>>,
411 // This method takes an AsyncApp to ensure it's invoked on the main thread,
412 // otherwise git-credentials-manager won't work.
413 cx: AsyncApp,
414 ) -> BoxFuture<'_, Result<RemoteCommandOutput>>;
415
416 fn pull(
417 &self,
418 branch_name: String,
419 upstream_name: String,
420 askpass: AskPassDelegate,
421 env: Arc<HashMap<String, String>>,
422 // This method takes an AsyncApp to ensure it's invoked on the main thread,
423 // otherwise git-credentials-manager won't work.
424 cx: AsyncApp,
425 ) -> BoxFuture<'_, Result<RemoteCommandOutput>>;
426
427 fn fetch(
428 &self,
429 fetch_options: FetchOptions,
430 askpass: AskPassDelegate,
431 env: Arc<HashMap<String, String>>,
432 // This method takes an AsyncApp to ensure it's invoked on the main thread,
433 // otherwise git-credentials-manager won't work.
434 cx: AsyncApp,
435 ) -> BoxFuture<'_, Result<RemoteCommandOutput>>;
436
437 fn get_remotes(&self, branch_name: Option<String>) -> BoxFuture<'_, Result<Vec<Remote>>>;
438
439 /// returns a list of remote branches that contain HEAD
440 fn check_for_pushed_commit(&self) -> BoxFuture<'_, Result<Vec<SharedString>>>;
441
442 /// Run git diff
443 fn diff(&self, diff: DiffType) -> BoxFuture<'_, Result<String>>;
444
445 /// Creates a checkpoint for the repository.
446 fn checkpoint(&self) -> BoxFuture<'static, Result<GitRepositoryCheckpoint>>;
447
448 /// Resets to a previously-created checkpoint.
449 fn restore_checkpoint(&self, checkpoint: GitRepositoryCheckpoint) -> BoxFuture<'_, Result<()>>;
450
451 /// Compares two checkpoints, returning true if they are equal
452 fn compare_checkpoints(
453 &self,
454 left: GitRepositoryCheckpoint,
455 right: GitRepositoryCheckpoint,
456 ) -> BoxFuture<'_, Result<bool>>;
457
458 /// Computes a diff between two checkpoints.
459 fn diff_checkpoints(
460 &self,
461 base_checkpoint: GitRepositoryCheckpoint,
462 target_checkpoint: GitRepositoryCheckpoint,
463 ) -> BoxFuture<'_, Result<String>>;
464
465 fn default_branch(&self) -> BoxFuture<'_, Result<Option<SharedString>>>;
466}
467
468pub enum DiffType {
469 HeadToIndex,
470 HeadToWorktree,
471}
472
473#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, JsonSchema)]
474pub enum PushOptions {
475 SetUpstream,
476 Force,
477}
478
479impl std::fmt::Debug for dyn GitRepository {
480 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
481 f.debug_struct("dyn GitRepository<...>").finish()
482 }
483}
484
485pub struct RealGitRepository {
486 pub repository: Arc<Mutex<git2::Repository>>,
487 pub git_binary_path: PathBuf,
488 executor: BackgroundExecutor,
489}
490
491impl RealGitRepository {
492 pub fn new(
493 dotgit_path: &Path,
494 git_binary_path: Option<PathBuf>,
495 executor: BackgroundExecutor,
496 ) -> Option<Self> {
497 let workdir_root = dotgit_path.parent()?;
498 let repository = git2::Repository::open(workdir_root).log_err()?;
499 Some(Self {
500 repository: Arc::new(Mutex::new(repository)),
501 git_binary_path: git_binary_path.unwrap_or_else(|| PathBuf::from("git")),
502 executor,
503 })
504 }
505
506 fn working_directory(&self) -> Result<PathBuf> {
507 self.repository
508 .lock()
509 .workdir()
510 .context("failed to read git work directory")
511 .map(Path::to_path_buf)
512 }
513}
514
515#[derive(Clone, Debug)]
516pub struct GitRepositoryCheckpoint {
517 pub commit_sha: Oid,
518}
519
520#[derive(Debug)]
521pub struct GitCommitter {
522 pub name: Option<String>,
523 pub email: Option<String>,
524}
525
526pub async fn get_git_committer(cx: &AsyncApp) -> GitCommitter {
527 if cfg!(any(feature = "test-support", test)) {
528 return GitCommitter {
529 name: None,
530 email: None,
531 };
532 }
533
534 let git_binary_path =
535 if cfg!(target_os = "macos") && option_env!("ZED_BUNDLE").as_deref() == Some("true") {
536 cx.update(|cx| {
537 cx.path_for_auxiliary_executable("git")
538 .context("could not find git binary path")
539 .log_err()
540 })
541 .ok()
542 .flatten()
543 } else {
544 None
545 };
546
547 let git = GitBinary::new(
548 git_binary_path.unwrap_or(PathBuf::from("git")),
549 paths::home_dir().clone(),
550 cx.background_executor().clone(),
551 );
552
553 cx.background_spawn(async move {
554 let name = git.run(["config", "--global", "user.name"]).await.log_err();
555 let email = git
556 .run(["config", "--global", "user.email"])
557 .await
558 .log_err();
559 GitCommitter { name, email }
560 })
561 .await
562}
563
564impl GitRepository for RealGitRepository {
565 fn reload_index(&self) {
566 if let Ok(mut index) = self.repository.lock().index() {
567 _ = index.read(false);
568 }
569 }
570
571 fn path(&self) -> PathBuf {
572 let repo = self.repository.lock();
573 repo.path().into()
574 }
575
576 fn main_repository_path(&self) -> PathBuf {
577 let repo = self.repository.lock();
578 repo.commondir().into()
579 }
580
581 fn show(&self, commit: String) -> BoxFuture<'_, Result<CommitDetails>> {
582 let working_directory = self.working_directory();
583 self.executor
584 .spawn(async move {
585 let working_directory = working_directory?;
586 let output = new_std_command("git")
587 .current_dir(&working_directory)
588 .args([
589 "--no-optional-locks",
590 "show",
591 "--no-patch",
592 "--format=%H%x00%B%x00%at%x00%ae%x00%an%x00",
593 &commit,
594 ])
595 .output()?;
596 let output = std::str::from_utf8(&output.stdout)?;
597 let fields = output.split('\0').collect::<Vec<_>>();
598 if fields.len() != 6 {
599 bail!("unexpected git-show output for {commit:?}: {output:?}")
600 }
601 let sha = fields[0].to_string().into();
602 let message = fields[1].to_string().into();
603 let commit_timestamp = fields[2].parse()?;
604 let author_email = fields[3].to_string().into();
605 let author_name = fields[4].to_string().into();
606 Ok(CommitDetails {
607 sha,
608 message,
609 commit_timestamp,
610 author_email,
611 author_name,
612 })
613 })
614 .boxed()
615 }
616
617 fn load_commit(&self, commit: String, cx: AsyncApp) -> BoxFuture<'_, Result<CommitDiff>> {
618 let Some(working_directory) = self.repository.lock().workdir().map(ToOwned::to_owned)
619 else {
620 return future::ready(Err(anyhow!("no working directory"))).boxed();
621 };
622 cx.background_spawn(async move {
623 let show_output = util::command::new_std_command("git")
624 .current_dir(&working_directory)
625 .args([
626 "--no-optional-locks",
627 "show",
628 "--format=%P",
629 "-z",
630 "--no-renames",
631 "--name-status",
632 ])
633 .arg(&commit)
634 .stdin(Stdio::null())
635 .stdout(Stdio::piped())
636 .stderr(Stdio::piped())
637 .output()
638 .context("starting git show process")?;
639
640 let show_stdout = String::from_utf8_lossy(&show_output.stdout);
641 let mut lines = show_stdout.split('\n');
642 let parent_sha = lines.next().unwrap().trim().trim_end_matches('\0');
643 let changes = parse_git_diff_name_status(lines.next().unwrap_or(""));
644
645 let mut cat_file_process = util::command::new_std_command("git")
646 .current_dir(&working_directory)
647 .args(["--no-optional-locks", "cat-file", "--batch=%(objectsize)"])
648 .stdin(Stdio::piped())
649 .stdout(Stdio::piped())
650 .stderr(Stdio::piped())
651 .spawn()
652 .context("starting git cat-file process")?;
653
654 use std::io::Write as _;
655 let mut files = Vec::<CommitFile>::new();
656 let mut stdin = BufWriter::with_capacity(512, cat_file_process.stdin.take().unwrap());
657 let mut stdout = BufReader::new(cat_file_process.stdout.take().unwrap());
658 let mut info_line = String::new();
659 let mut newline = [b'\0'];
660 for (path, status_code) in changes {
661 match status_code {
662 StatusCode::Modified => {
663 writeln!(&mut stdin, "{commit}:{}", path.display())?;
664 writeln!(&mut stdin, "{parent_sha}:{}", path.display())?;
665 }
666 StatusCode::Added => {
667 writeln!(&mut stdin, "{commit}:{}", path.display())?;
668 }
669 StatusCode::Deleted => {
670 writeln!(&mut stdin, "{parent_sha}:{}", path.display())?;
671 }
672 _ => continue,
673 }
674 stdin.flush()?;
675
676 info_line.clear();
677 stdout.read_line(&mut info_line)?;
678
679 let len = info_line.trim_end().parse().with_context(|| {
680 format!("invalid object size output from cat-file {info_line}")
681 })?;
682 let mut text = vec![0; len];
683 stdout.read_exact(&mut text)?;
684 stdout.read_exact(&mut newline)?;
685 let text = String::from_utf8_lossy(&text).to_string();
686
687 let mut old_text = None;
688 let mut new_text = None;
689 match status_code {
690 StatusCode::Modified => {
691 info_line.clear();
692 stdout.read_line(&mut info_line)?;
693 let len = info_line.trim_end().parse().with_context(|| {
694 format!("invalid object size output from cat-file {}", info_line)
695 })?;
696 let mut parent_text = vec![0; len];
697 stdout.read_exact(&mut parent_text)?;
698 stdout.read_exact(&mut newline)?;
699 old_text = Some(String::from_utf8_lossy(&parent_text).to_string());
700 new_text = Some(text);
701 }
702 StatusCode::Added => new_text = Some(text),
703 StatusCode::Deleted => old_text = Some(text),
704 _ => continue,
705 }
706
707 files.push(CommitFile {
708 path: path.into(),
709 old_text,
710 new_text,
711 })
712 }
713
714 Ok(CommitDiff { files })
715 })
716 .boxed()
717 }
718
719 fn reset(
720 &self,
721 commit: String,
722 mode: ResetMode,
723 env: Arc<HashMap<String, String>>,
724 ) -> BoxFuture<'_, Result<()>> {
725 async move {
726 let working_directory = self.working_directory();
727
728 let mode_flag = match mode {
729 ResetMode::Mixed => "--mixed",
730 ResetMode::Soft => "--soft",
731 };
732
733 let output = new_smol_command(&self.git_binary_path)
734 .envs(env.iter())
735 .current_dir(&working_directory?)
736 .args(["reset", mode_flag, &commit])
737 .output()
738 .await?;
739 anyhow::ensure!(
740 output.status.success(),
741 "Failed to reset:\n{}",
742 String::from_utf8_lossy(&output.stderr),
743 );
744 Ok(())
745 }
746 .boxed()
747 }
748
749 fn checkout_files(
750 &self,
751 commit: String,
752 paths: Vec<RepoPath>,
753 env: Arc<HashMap<String, String>>,
754 ) -> BoxFuture<'_, Result<()>> {
755 let working_directory = self.working_directory();
756 let git_binary_path = self.git_binary_path.clone();
757 async move {
758 if paths.is_empty() {
759 return Ok(());
760 }
761
762 let output = new_smol_command(&git_binary_path)
763 .current_dir(&working_directory?)
764 .envs(env.iter())
765 .args(["checkout", &commit, "--"])
766 .args(paths.iter().map(|path| path.as_ref()))
767 .output()
768 .await?;
769 anyhow::ensure!(
770 output.status.success(),
771 "Failed to checkout files:\n{}",
772 String::from_utf8_lossy(&output.stderr),
773 );
774 Ok(())
775 }
776 .boxed()
777 }
778
779 fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
780 // https://git-scm.com/book/en/v2/Git-Internals-Git-Objects
781 const GIT_MODE_SYMLINK: u32 = 0o120000;
782
783 let repo = self.repository.clone();
784 self.executor
785 .spawn(async move {
786 fn logic(repo: &git2::Repository, path: &RepoPath) -> Result<Option<String>> {
787 // This check is required because index.get_path() unwraps internally :(
788 check_path_to_repo_path_errors(path)?;
789
790 let mut index = repo.index()?;
791 index.read(false)?;
792
793 const STAGE_NORMAL: i32 = 0;
794 let oid = match index.get_path(path, STAGE_NORMAL) {
795 Some(entry) if entry.mode != GIT_MODE_SYMLINK => entry.id,
796 _ => return Ok(None),
797 };
798
799 let content = repo.find_blob(oid)?.content().to_owned();
800 Ok(String::from_utf8(content).ok())
801 }
802
803 match logic(&repo.lock(), &path) {
804 Ok(value) => return value,
805 Err(err) => log::error!("Error loading index text: {:?}", err),
806 }
807 None
808 })
809 .boxed()
810 }
811
812 fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
813 let repo = self.repository.clone();
814 self.executor
815 .spawn(async move {
816 let repo = repo.lock();
817 let head = repo.head().ok()?.peel_to_tree().log_err()?;
818 let entry = head.get_path(&path).ok()?;
819 if entry.filemode() == i32::from(git2::FileMode::Link) {
820 return None;
821 }
822 let content = repo.find_blob(entry.id()).log_err()?.content().to_owned();
823 String::from_utf8(content).ok()
824 })
825 .boxed()
826 }
827
828 fn set_index_text(
829 &self,
830 path: RepoPath,
831 content: Option<String>,
832 env: Arc<HashMap<String, String>>,
833 ) -> BoxFuture<'_, anyhow::Result<()>> {
834 let working_directory = self.working_directory();
835 let git_binary_path = self.git_binary_path.clone();
836 self.executor
837 .spawn(async move {
838 let working_directory = working_directory?;
839 if let Some(content) = content {
840 let mut child = new_smol_command(&git_binary_path)
841 .current_dir(&working_directory)
842 .envs(env.iter())
843 .args(["hash-object", "-w", "--stdin"])
844 .stdin(Stdio::piped())
845 .stdout(Stdio::piped())
846 .spawn()?;
847 let mut stdin = child.stdin.take().unwrap();
848 stdin.write_all(content.as_bytes()).await?;
849 stdin.flush().await?;
850 drop(stdin);
851 let output = child.output().await?.stdout;
852 let sha = str::from_utf8(&output)?.trim();
853
854 log::debug!("indexing SHA: {sha}, path {path:?}");
855
856 let output = new_smol_command(&git_binary_path)
857 .current_dir(&working_directory)
858 .envs(env.iter())
859 .args(["update-index", "--add", "--cacheinfo", "100644", sha])
860 .arg(path.to_unix_style())
861 .output()
862 .await?;
863
864 anyhow::ensure!(
865 output.status.success(),
866 "Failed to stage:\n{}",
867 String::from_utf8_lossy(&output.stderr)
868 );
869 } else {
870 log::debug!("removing path {path:?} from the index");
871 let output = new_smol_command(&git_binary_path)
872 .current_dir(&working_directory)
873 .envs(env.iter())
874 .args(["update-index", "--force-remove"])
875 .arg(path.to_unix_style())
876 .output()
877 .await?;
878 anyhow::ensure!(
879 output.status.success(),
880 "Failed to unstage:\n{}",
881 String::from_utf8_lossy(&output.stderr)
882 );
883 }
884
885 Ok(())
886 })
887 .boxed()
888 }
889
890 fn remote_url(&self, name: &str) -> Option<String> {
891 let repo = self.repository.lock();
892 let remote = repo.find_remote(name).ok()?;
893 remote.url().map(|url| url.to_string())
894 }
895
896 fn revparse_batch(&self, revs: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>> {
897 let working_directory = self.working_directory();
898 self.executor
899 .spawn(async move {
900 let working_directory = working_directory?;
901 let mut process = new_std_command("git")
902 .current_dir(&working_directory)
903 .args([
904 "--no-optional-locks",
905 "cat-file",
906 "--batch-check=%(objectname)",
907 ])
908 .stdin(Stdio::piped())
909 .stdout(Stdio::piped())
910 .stderr(Stdio::piped())
911 .spawn()?;
912
913 let stdin = process
914 .stdin
915 .take()
916 .context("no stdin for git cat-file subprocess")?;
917 let mut stdin = BufWriter::new(stdin);
918 for rev in &revs {
919 writeln!(&mut stdin, "{rev}")?;
920 }
921 stdin.flush()?;
922 drop(stdin);
923
924 let output = process.wait_with_output()?;
925 let output = std::str::from_utf8(&output.stdout)?;
926 let shas = output
927 .lines()
928 .map(|line| {
929 if line.ends_with("missing") {
930 None
931 } else {
932 Some(line.to_string())
933 }
934 })
935 .collect::<Vec<_>>();
936
937 if shas.len() != revs.len() {
938 // In an octopus merge, git cat-file still only outputs the first sha from MERGE_HEAD.
939 bail!("unexpected number of shas")
940 }
941
942 Ok(shas)
943 })
944 .boxed()
945 }
946
947 fn merge_message(&self) -> BoxFuture<'_, Option<String>> {
948 let path = self.path().join("MERGE_MSG");
949 self.executor
950 .spawn(async move { std::fs::read_to_string(&path).ok() })
951 .boxed()
952 }
953
954 fn status(&self, path_prefixes: &[RepoPath]) -> Task<Result<GitStatus>> {
955 let git_binary_path = self.git_binary_path.clone();
956 let working_directory = match self.working_directory() {
957 Ok(working_directory) => working_directory,
958 Err(e) => return Task::ready(Err(e)),
959 };
960 let args = git_status_args(path_prefixes);
961 log::debug!("Checking for git status in {path_prefixes:?}");
962 self.executor.spawn(async move {
963 let output = new_std_command(&git_binary_path)
964 .current_dir(working_directory)
965 .args(args)
966 .output()?;
967 if output.status.success() {
968 let stdout = String::from_utf8_lossy(&output.stdout);
969 stdout.parse()
970 } else {
971 let stderr = String::from_utf8_lossy(&output.stderr);
972 anyhow::bail!("git status failed: {stderr}");
973 }
974 })
975 }
976
977 fn branches(&self) -> BoxFuture<'_, Result<Vec<Branch>>> {
978 let working_directory = self.working_directory();
979 let git_binary_path = self.git_binary_path.clone();
980 self.executor
981 .spawn(async move {
982 let fields = [
983 "%(HEAD)",
984 "%(objectname)",
985 "%(parent)",
986 "%(refname)",
987 "%(upstream)",
988 "%(upstream:track)",
989 "%(committerdate:unix)",
990 "%(contents:subject)",
991 ]
992 .join("%00");
993 let args = vec![
994 "for-each-ref",
995 "refs/heads/**/*",
996 "refs/remotes/**/*",
997 "--format",
998 &fields,
999 ];
1000 let working_directory = working_directory?;
1001 let output = new_smol_command(&git_binary_path)
1002 .current_dir(&working_directory)
1003 .args(args)
1004 .output()
1005 .await?;
1006
1007 anyhow::ensure!(
1008 output.status.success(),
1009 "Failed to git git branches:\n{}",
1010 String::from_utf8_lossy(&output.stderr)
1011 );
1012
1013 let input = String::from_utf8_lossy(&output.stdout);
1014
1015 let mut branches = parse_branch_input(&input)?;
1016 if branches.is_empty() {
1017 let args = vec!["symbolic-ref", "--quiet", "HEAD"];
1018
1019 let output = new_smol_command(&git_binary_path)
1020 .current_dir(&working_directory)
1021 .args(args)
1022 .output()
1023 .await?;
1024
1025 // git symbolic-ref returns a non-0 exit code if HEAD points
1026 // to something other than a branch
1027 if output.status.success() {
1028 let name = String::from_utf8_lossy(&output.stdout).trim().to_string();
1029
1030 branches.push(Branch {
1031 ref_name: name.into(),
1032 is_head: true,
1033 upstream: None,
1034 most_recent_commit: None,
1035 });
1036 }
1037 }
1038
1039 Ok(branches)
1040 })
1041 .boxed()
1042 }
1043
1044 fn change_branch(&self, name: String) -> BoxFuture<'_, Result<()>> {
1045 let repo = self.repository.clone();
1046 let working_directory = self.working_directory();
1047 let git_binary_path = self.git_binary_path.clone();
1048 let executor = self.executor.clone();
1049 let branch = self.executor.spawn(async move {
1050 let repo = repo.lock();
1051 let branch = if let Ok(branch) = repo.find_branch(&name, BranchType::Local) {
1052 branch
1053 } else if let Ok(revision) = repo.find_branch(&name, BranchType::Remote) {
1054 let (_, branch_name) = name.split_once("/").context("Unexpected branch format")?;
1055 let revision = revision.get();
1056 let branch_commit = revision.peel_to_commit()?;
1057 let mut branch = repo.branch(branch_name, &branch_commit, false)?;
1058 branch.set_upstream(Some(&name))?;
1059 branch
1060 } else {
1061 anyhow::bail!("Branch not found");
1062 };
1063
1064 Ok(branch
1065 .name()?
1066 .context("cannot checkout anonymous branch")?
1067 .to_string())
1068 });
1069
1070 self.executor
1071 .spawn(async move {
1072 let branch = branch.await?;
1073
1074 GitBinary::new(git_binary_path, working_directory?, executor)
1075 .run(&["checkout", &branch])
1076 .await?;
1077
1078 anyhow::Ok(())
1079 })
1080 .boxed()
1081 }
1082
1083 fn create_branch(&self, name: String) -> BoxFuture<'_, Result<()>> {
1084 let repo = self.repository.clone();
1085 self.executor
1086 .spawn(async move {
1087 let repo = repo.lock();
1088 let current_commit = repo.head()?.peel_to_commit()?;
1089 repo.branch(&name, ¤t_commit, false)?;
1090 Ok(())
1091 })
1092 .boxed()
1093 }
1094
1095 fn blame(&self, path: RepoPath, content: Rope) -> BoxFuture<'_, Result<crate::blame::Blame>> {
1096 let working_directory = self.working_directory();
1097 let git_binary_path = self.git_binary_path.clone();
1098
1099 let remote_url = self
1100 .remote_url("upstream")
1101 .or_else(|| self.remote_url("origin"));
1102
1103 self.executor
1104 .spawn(async move {
1105 crate::blame::Blame::for_path(
1106 &git_binary_path,
1107 &working_directory?,
1108 &path,
1109 &content,
1110 remote_url,
1111 )
1112 .await
1113 })
1114 .boxed()
1115 }
1116
1117 fn diff(&self, diff: DiffType) -> BoxFuture<'_, Result<String>> {
1118 let working_directory = self.working_directory();
1119 let git_binary_path = self.git_binary_path.clone();
1120 self.executor
1121 .spawn(async move {
1122 let args = match diff {
1123 DiffType::HeadToIndex => Some("--staged"),
1124 DiffType::HeadToWorktree => None,
1125 };
1126
1127 let output = new_smol_command(&git_binary_path)
1128 .current_dir(&working_directory?)
1129 .args(["diff"])
1130 .args(args)
1131 .output()
1132 .await?;
1133
1134 anyhow::ensure!(
1135 output.status.success(),
1136 "Failed to run git diff:\n{}",
1137 String::from_utf8_lossy(&output.stderr)
1138 );
1139 Ok(String::from_utf8_lossy(&output.stdout).to_string())
1140 })
1141 .boxed()
1142 }
1143
1144 fn stage_paths(
1145 &self,
1146 paths: Vec<RepoPath>,
1147 env: Arc<HashMap<String, String>>,
1148 ) -> BoxFuture<'_, Result<()>> {
1149 let working_directory = self.working_directory();
1150 let git_binary_path = self.git_binary_path.clone();
1151 self.executor
1152 .spawn(async move {
1153 if !paths.is_empty() {
1154 let output = new_smol_command(&git_binary_path)
1155 .current_dir(&working_directory?)
1156 .envs(env.iter())
1157 .args(["update-index", "--add", "--remove", "--"])
1158 .args(paths.iter().map(|p| p.to_unix_style()))
1159 .output()
1160 .await?;
1161 anyhow::ensure!(
1162 output.status.success(),
1163 "Failed to stage paths:\n{}",
1164 String::from_utf8_lossy(&output.stderr),
1165 );
1166 }
1167 Ok(())
1168 })
1169 .boxed()
1170 }
1171
1172 fn unstage_paths(
1173 &self,
1174 paths: Vec<RepoPath>,
1175 env: Arc<HashMap<String, String>>,
1176 ) -> BoxFuture<'_, Result<()>> {
1177 let working_directory = self.working_directory();
1178 let git_binary_path = self.git_binary_path.clone();
1179
1180 self.executor
1181 .spawn(async move {
1182 if !paths.is_empty() {
1183 let output = new_smol_command(&git_binary_path)
1184 .current_dir(&working_directory?)
1185 .envs(env.iter())
1186 .args(["reset", "--quiet", "--"])
1187 .args(paths.iter().map(|p| p.as_ref()))
1188 .output()
1189 .await?;
1190
1191 anyhow::ensure!(
1192 output.status.success(),
1193 "Failed to unstage:\n{}",
1194 String::from_utf8_lossy(&output.stderr),
1195 );
1196 }
1197 Ok(())
1198 })
1199 .boxed()
1200 }
1201
1202 fn stash_paths(
1203 &self,
1204 paths: Vec<RepoPath>,
1205 env: Arc<HashMap<String, String>>,
1206 ) -> BoxFuture<'_, Result<()>> {
1207 let working_directory = self.working_directory();
1208 self.executor
1209 .spawn(async move {
1210 let mut cmd = new_smol_command("git");
1211 cmd.current_dir(&working_directory?)
1212 .envs(env.iter())
1213 .args(["stash", "push", "--quiet"])
1214 .arg("--include-untracked");
1215
1216 cmd.args(paths.iter().map(|p| p.as_ref()));
1217
1218 let output = cmd.output().await?;
1219
1220 anyhow::ensure!(
1221 output.status.success(),
1222 "Failed to stash:\n{}",
1223 String::from_utf8_lossy(&output.stderr)
1224 );
1225 Ok(())
1226 })
1227 .boxed()
1228 }
1229
1230 fn stash_pop(&self, env: Arc<HashMap<String, String>>) -> BoxFuture<'_, Result<()>> {
1231 let working_directory = self.working_directory();
1232 self.executor
1233 .spawn(async move {
1234 let mut cmd = new_smol_command("git");
1235 cmd.current_dir(&working_directory?)
1236 .envs(env.iter())
1237 .args(["stash", "pop"]);
1238
1239 let output = cmd.output().await?;
1240
1241 anyhow::ensure!(
1242 output.status.success(),
1243 "Failed to stash pop:\n{}",
1244 String::from_utf8_lossy(&output.stderr)
1245 );
1246 Ok(())
1247 })
1248 .boxed()
1249 }
1250
1251 fn commit(
1252 &self,
1253 message: SharedString,
1254 name_and_email: Option<(SharedString, SharedString)>,
1255 options: CommitOptions,
1256 env: Arc<HashMap<String, String>>,
1257 ) -> BoxFuture<'_, Result<()>> {
1258 let working_directory = self.working_directory();
1259 self.executor
1260 .spawn(async move {
1261 let mut cmd = new_smol_command("git");
1262 cmd.current_dir(&working_directory?)
1263 .envs(env.iter())
1264 .args(["commit", "--quiet", "-m"])
1265 .arg(&message.to_string())
1266 .arg("--cleanup=strip");
1267
1268 if options.amend {
1269 cmd.arg("--amend");
1270 }
1271
1272 if options.signoff {
1273 cmd.arg("--signoff");
1274 }
1275
1276 if let Some((name, email)) = name_and_email {
1277 cmd.arg("--author").arg(&format!("{name} <{email}>"));
1278 }
1279
1280 let output = cmd.output().await?;
1281
1282 anyhow::ensure!(
1283 output.status.success(),
1284 "Failed to commit:\n{}",
1285 String::from_utf8_lossy(&output.stderr)
1286 );
1287 Ok(())
1288 })
1289 .boxed()
1290 }
1291
1292 fn push(
1293 &self,
1294 branch_name: String,
1295 remote_name: String,
1296 options: Option<PushOptions>,
1297 ask_pass: AskPassDelegate,
1298 env: Arc<HashMap<String, String>>,
1299 cx: AsyncApp,
1300 ) -> BoxFuture<'_, Result<RemoteCommandOutput>> {
1301 let working_directory = self.working_directory();
1302 let executor = cx.background_executor().clone();
1303 async move {
1304 let working_directory = working_directory?;
1305 let mut command = new_smol_command("git");
1306 command
1307 .envs(env.iter())
1308 .current_dir(&working_directory)
1309 .args(["push"])
1310 .args(options.map(|option| match option {
1311 PushOptions::SetUpstream => "--set-upstream",
1312 PushOptions::Force => "--force-with-lease",
1313 }))
1314 .arg(remote_name)
1315 .arg(format!("{}:{}", branch_name, branch_name))
1316 .stdin(smol::process::Stdio::null())
1317 .stdout(smol::process::Stdio::piped())
1318 .stderr(smol::process::Stdio::piped());
1319
1320 run_git_command(env, ask_pass, command, &executor).await
1321 }
1322 .boxed()
1323 }
1324
1325 fn pull(
1326 &self,
1327 branch_name: String,
1328 remote_name: String,
1329 ask_pass: AskPassDelegate,
1330 env: Arc<HashMap<String, String>>,
1331 cx: AsyncApp,
1332 ) -> BoxFuture<'_, Result<RemoteCommandOutput>> {
1333 let working_directory = self.working_directory();
1334 let executor = cx.background_executor().clone();
1335 async move {
1336 let mut command = new_smol_command("git");
1337 command
1338 .envs(env.iter())
1339 .current_dir(&working_directory?)
1340 .args(["pull"])
1341 .arg(remote_name)
1342 .arg(branch_name)
1343 .stdout(smol::process::Stdio::piped())
1344 .stderr(smol::process::Stdio::piped());
1345
1346 run_git_command(env, ask_pass, command, &executor).await
1347 }
1348 .boxed()
1349 }
1350
1351 fn fetch(
1352 &self,
1353 fetch_options: FetchOptions,
1354 ask_pass: AskPassDelegate,
1355 env: Arc<HashMap<String, String>>,
1356 cx: AsyncApp,
1357 ) -> BoxFuture<'_, Result<RemoteCommandOutput>> {
1358 let working_directory = self.working_directory();
1359 let remote_name = format!("{}", fetch_options);
1360 let executor = cx.background_executor().clone();
1361 async move {
1362 let mut command = new_smol_command("git");
1363 command
1364 .envs(env.iter())
1365 .current_dir(&working_directory?)
1366 .args(["fetch", &remote_name])
1367 .stdout(smol::process::Stdio::piped())
1368 .stderr(smol::process::Stdio::piped());
1369
1370 run_git_command(env, ask_pass, command, &executor).await
1371 }
1372 .boxed()
1373 }
1374
1375 fn get_remotes(&self, branch_name: Option<String>) -> BoxFuture<'_, Result<Vec<Remote>>> {
1376 let working_directory = self.working_directory();
1377 let git_binary_path = self.git_binary_path.clone();
1378 self.executor
1379 .spawn(async move {
1380 let working_directory = working_directory?;
1381 if let Some(branch_name) = branch_name {
1382 let output = new_smol_command(&git_binary_path)
1383 .current_dir(&working_directory)
1384 .args(["config", "--get"])
1385 .arg(format!("branch.{}.remote", branch_name))
1386 .output()
1387 .await?;
1388
1389 if output.status.success() {
1390 let remote_name = String::from_utf8_lossy(&output.stdout);
1391
1392 return Ok(vec![Remote {
1393 name: remote_name.trim().to_string().into(),
1394 }]);
1395 }
1396 }
1397
1398 let output = new_smol_command(&git_binary_path)
1399 .current_dir(&working_directory)
1400 .args(["remote"])
1401 .output()
1402 .await?;
1403
1404 anyhow::ensure!(
1405 output.status.success(),
1406 "Failed to get remotes:\n{}",
1407 String::from_utf8_lossy(&output.stderr)
1408 );
1409 let remote_names = String::from_utf8_lossy(&output.stdout)
1410 .split('\n')
1411 .filter(|name| !name.is_empty())
1412 .map(|name| Remote {
1413 name: name.trim().to_string().into(),
1414 })
1415 .collect();
1416 Ok(remote_names)
1417 })
1418 .boxed()
1419 }
1420
1421 fn check_for_pushed_commit(&self) -> BoxFuture<'_, Result<Vec<SharedString>>> {
1422 let working_directory = self.working_directory();
1423 let git_binary_path = self.git_binary_path.clone();
1424 self.executor
1425 .spawn(async move {
1426 let working_directory = working_directory?;
1427 let git_cmd = async |args: &[&str]| -> Result<String> {
1428 let output = new_smol_command(&git_binary_path)
1429 .current_dir(&working_directory)
1430 .args(args)
1431 .output()
1432 .await?;
1433 anyhow::ensure!(
1434 output.status.success(),
1435 String::from_utf8_lossy(&output.stderr).to_string()
1436 );
1437 Ok(String::from_utf8(output.stdout)?)
1438 };
1439
1440 let head = git_cmd(&["rev-parse", "HEAD"])
1441 .await
1442 .context("Failed to get HEAD")?
1443 .trim()
1444 .to_owned();
1445
1446 let mut remote_branches = vec![];
1447 let mut add_if_matching = async |remote_head: &str| {
1448 if let Ok(merge_base) = git_cmd(&["merge-base", &head, remote_head]).await
1449 && merge_base.trim() == head
1450 && let Some(s) = remote_head.strip_prefix("refs/remotes/")
1451 {
1452 remote_branches.push(s.to_owned().into());
1453 }
1454 };
1455
1456 // check the main branch of each remote
1457 let remotes = git_cmd(&["remote"])
1458 .await
1459 .context("Failed to get remotes")?;
1460 for remote in remotes.lines() {
1461 if let Ok(remote_head) =
1462 git_cmd(&["symbolic-ref", &format!("refs/remotes/{remote}/HEAD")]).await
1463 {
1464 add_if_matching(remote_head.trim()).await;
1465 }
1466 }
1467
1468 // ... and the remote branch that the checked-out one is tracking
1469 if let Ok(remote_head) =
1470 git_cmd(&["rev-parse", "--symbolic-full-name", "@{u}"]).await
1471 {
1472 add_if_matching(remote_head.trim()).await;
1473 }
1474
1475 Ok(remote_branches)
1476 })
1477 .boxed()
1478 }
1479
1480 fn checkpoint(&self) -> BoxFuture<'static, Result<GitRepositoryCheckpoint>> {
1481 let working_directory = self.working_directory();
1482 let git_binary_path = self.git_binary_path.clone();
1483 let executor = self.executor.clone();
1484 self.executor
1485 .spawn(async move {
1486 let working_directory = working_directory?;
1487 let mut git = GitBinary::new(git_binary_path, working_directory.clone(), executor)
1488 .envs(checkpoint_author_envs());
1489 git.with_temp_index(async |git| {
1490 let head_sha = git.run(&["rev-parse", "HEAD"]).await.ok();
1491 let mut excludes = exclude_files(git).await?;
1492
1493 git.run(&["add", "--all"]).await?;
1494 let tree = git.run(&["write-tree"]).await?;
1495 let checkpoint_sha = if let Some(head_sha) = head_sha.as_deref() {
1496 git.run(&["commit-tree", &tree, "-p", head_sha, "-m", "Checkpoint"])
1497 .await?
1498 } else {
1499 git.run(&["commit-tree", &tree, "-m", "Checkpoint"]).await?
1500 };
1501
1502 excludes.restore_original().await?;
1503
1504 Ok(GitRepositoryCheckpoint {
1505 commit_sha: checkpoint_sha.parse()?,
1506 })
1507 })
1508 .await
1509 })
1510 .boxed()
1511 }
1512
1513 fn restore_checkpoint(&self, checkpoint: GitRepositoryCheckpoint) -> BoxFuture<'_, Result<()>> {
1514 let working_directory = self.working_directory();
1515 let git_binary_path = self.git_binary_path.clone();
1516
1517 let executor = self.executor.clone();
1518 self.executor
1519 .spawn(async move {
1520 let working_directory = working_directory?;
1521
1522 let git = GitBinary::new(git_binary_path, working_directory, executor);
1523 git.run(&[
1524 "restore",
1525 "--source",
1526 &checkpoint.commit_sha.to_string(),
1527 "--worktree",
1528 ".",
1529 ])
1530 .await?;
1531
1532 // TODO: We don't track binary and large files anymore,
1533 // so the following call would delete them.
1534 // Implement an alternative way to track files added by agent.
1535 //
1536 // git.with_temp_index(async move |git| {
1537 // git.run(&["read-tree", &checkpoint.commit_sha.to_string()])
1538 // .await?;
1539 // git.run(&["clean", "-d", "--force"]).await
1540 // })
1541 // .await?;
1542
1543 Ok(())
1544 })
1545 .boxed()
1546 }
1547
1548 fn compare_checkpoints(
1549 &self,
1550 left: GitRepositoryCheckpoint,
1551 right: GitRepositoryCheckpoint,
1552 ) -> BoxFuture<'_, Result<bool>> {
1553 let working_directory = self.working_directory();
1554 let git_binary_path = self.git_binary_path.clone();
1555
1556 let executor = self.executor.clone();
1557 self.executor
1558 .spawn(async move {
1559 let working_directory = working_directory?;
1560 let git = GitBinary::new(git_binary_path, working_directory, executor);
1561 let result = git
1562 .run(&[
1563 "diff-tree",
1564 "--quiet",
1565 &left.commit_sha.to_string(),
1566 &right.commit_sha.to_string(),
1567 ])
1568 .await;
1569 match result {
1570 Ok(_) => Ok(true),
1571 Err(error) => {
1572 if let Some(GitBinaryCommandError { status, .. }) =
1573 error.downcast_ref::<GitBinaryCommandError>()
1574 && status.code() == Some(1)
1575 {
1576 return Ok(false);
1577 }
1578
1579 Err(error)
1580 }
1581 }
1582 })
1583 .boxed()
1584 }
1585
1586 fn diff_checkpoints(
1587 &self,
1588 base_checkpoint: GitRepositoryCheckpoint,
1589 target_checkpoint: GitRepositoryCheckpoint,
1590 ) -> BoxFuture<'_, Result<String>> {
1591 let working_directory = self.working_directory();
1592 let git_binary_path = self.git_binary_path.clone();
1593
1594 let executor = self.executor.clone();
1595 self.executor
1596 .spawn(async move {
1597 let working_directory = working_directory?;
1598 let git = GitBinary::new(git_binary_path, working_directory, executor);
1599 git.run(&[
1600 "diff",
1601 "--find-renames",
1602 "--patch",
1603 &base_checkpoint.commit_sha.to_string(),
1604 &target_checkpoint.commit_sha.to_string(),
1605 ])
1606 .await
1607 })
1608 .boxed()
1609 }
1610
1611 fn default_branch(&self) -> BoxFuture<'_, Result<Option<SharedString>>> {
1612 let working_directory = self.working_directory();
1613 let git_binary_path = self.git_binary_path.clone();
1614
1615 let executor = self.executor.clone();
1616 self.executor
1617 .spawn(async move {
1618 let working_directory = working_directory?;
1619 let git = GitBinary::new(git_binary_path, working_directory, executor);
1620
1621 if let Ok(output) = git
1622 .run(&["symbolic-ref", "refs/remotes/upstream/HEAD"])
1623 .await
1624 {
1625 let output = output
1626 .strip_prefix("refs/remotes/upstream/")
1627 .map(|s| SharedString::from(s.to_owned()));
1628 return Ok(output);
1629 }
1630
1631 let output = git
1632 .run(&["symbolic-ref", "refs/remotes/origin/HEAD"])
1633 .await?;
1634
1635 Ok(output
1636 .strip_prefix("refs/remotes/origin/")
1637 .map(|s| SharedString::from(s.to_owned())))
1638 })
1639 .boxed()
1640 }
1641}
1642
1643fn git_status_args(path_prefixes: &[RepoPath]) -> Vec<OsString> {
1644 let mut args = vec![
1645 OsString::from("--no-optional-locks"),
1646 OsString::from("status"),
1647 OsString::from("--porcelain=v1"),
1648 OsString::from("--untracked-files=all"),
1649 OsString::from("--no-renames"),
1650 OsString::from("-z"),
1651 ];
1652 args.extend(path_prefixes.iter().map(|path_prefix| {
1653 if path_prefix.0.as_ref() == Path::new("") {
1654 Path::new(".").into()
1655 } else {
1656 path_prefix.as_os_str().into()
1657 }
1658 }));
1659 args
1660}
1661
1662/// Temporarily git-ignore commonly ignored files and files over 2MB
1663async fn exclude_files(git: &GitBinary) -> Result<GitExcludeOverride> {
1664 const MAX_SIZE: u64 = 2 * 1024 * 1024; // 2 MB
1665 let mut excludes = git.with_exclude_overrides().await?;
1666 excludes
1667 .add_excludes(include_str!("./checkpoint.gitignore"))
1668 .await?;
1669
1670 let working_directory = git.working_directory.clone();
1671 let untracked_files = git.list_untracked_files().await?;
1672 let excluded_paths = untracked_files.into_iter().map(|path| {
1673 let working_directory = working_directory.clone();
1674 smol::spawn(async move {
1675 let full_path = working_directory.join(path.clone());
1676 match smol::fs::metadata(&full_path).await {
1677 Ok(metadata) if metadata.is_file() && metadata.len() >= MAX_SIZE => {
1678 Some(PathBuf::from("/").join(path.clone()))
1679 }
1680 _ => None,
1681 }
1682 })
1683 });
1684
1685 let excluded_paths = futures::future::join_all(excluded_paths).await;
1686 let excluded_paths = excluded_paths.into_iter().flatten().collect::<Vec<_>>();
1687
1688 if !excluded_paths.is_empty() {
1689 let exclude_patterns = excluded_paths
1690 .into_iter()
1691 .map(|path| path.to_string_lossy().to_string())
1692 .collect::<Vec<_>>()
1693 .join("\n");
1694 excludes.add_excludes(&exclude_patterns).await?;
1695 }
1696
1697 Ok(excludes)
1698}
1699
1700struct GitBinary {
1701 git_binary_path: PathBuf,
1702 working_directory: PathBuf,
1703 executor: BackgroundExecutor,
1704 index_file_path: Option<PathBuf>,
1705 envs: HashMap<String, String>,
1706}
1707
1708impl GitBinary {
1709 fn new(
1710 git_binary_path: PathBuf,
1711 working_directory: PathBuf,
1712 executor: BackgroundExecutor,
1713 ) -> Self {
1714 Self {
1715 git_binary_path,
1716 working_directory,
1717 executor,
1718 index_file_path: None,
1719 envs: HashMap::default(),
1720 }
1721 }
1722
1723 async fn list_untracked_files(&self) -> Result<Vec<PathBuf>> {
1724 let status_output = self
1725 .run(&["status", "--porcelain=v1", "--untracked-files=all", "-z"])
1726 .await?;
1727
1728 let paths = status_output
1729 .split('\0')
1730 .filter(|entry| entry.len() >= 3 && entry.starts_with("?? "))
1731 .map(|entry| PathBuf::from(&entry[3..]))
1732 .collect::<Vec<_>>();
1733 Ok(paths)
1734 }
1735
1736 fn envs(mut self, envs: HashMap<String, String>) -> Self {
1737 self.envs = envs;
1738 self
1739 }
1740
1741 pub async fn with_temp_index<R>(
1742 &mut self,
1743 f: impl AsyncFnOnce(&Self) -> Result<R>,
1744 ) -> Result<R> {
1745 let index_file_path = self.path_for_index_id(Uuid::new_v4());
1746
1747 let delete_temp_index = util::defer({
1748 let index_file_path = index_file_path.clone();
1749 let executor = self.executor.clone();
1750 move || {
1751 executor
1752 .spawn(async move {
1753 smol::fs::remove_file(index_file_path).await.log_err();
1754 })
1755 .detach();
1756 }
1757 });
1758
1759 // Copy the default index file so that Git doesn't have to rebuild the
1760 // whole index from scratch. This might fail if this is an empty repository.
1761 smol::fs::copy(
1762 self.working_directory.join(".git").join("index"),
1763 &index_file_path,
1764 )
1765 .await
1766 .ok();
1767
1768 self.index_file_path = Some(index_file_path.clone());
1769 let result = f(self).await;
1770 self.index_file_path = None;
1771 let result = result?;
1772
1773 smol::fs::remove_file(index_file_path).await.ok();
1774 delete_temp_index.abort();
1775
1776 Ok(result)
1777 }
1778
1779 pub async fn with_exclude_overrides(&self) -> Result<GitExcludeOverride> {
1780 let path = self
1781 .working_directory
1782 .join(".git")
1783 .join("info")
1784 .join("exclude");
1785
1786 GitExcludeOverride::new(path).await
1787 }
1788
1789 fn path_for_index_id(&self, id: Uuid) -> PathBuf {
1790 self.working_directory
1791 .join(".git")
1792 .join(format!("index-{}.tmp", id))
1793 }
1794
1795 pub async fn run<S>(&self, args: impl IntoIterator<Item = S>) -> Result<String>
1796 where
1797 S: AsRef<OsStr>,
1798 {
1799 let mut stdout = self.run_raw(args).await?;
1800 if stdout.chars().last() == Some('\n') {
1801 stdout.pop();
1802 }
1803 Ok(stdout)
1804 }
1805
1806 /// Returns the result of the command without trimming the trailing newline.
1807 pub async fn run_raw<S>(&self, args: impl IntoIterator<Item = S>) -> Result<String>
1808 where
1809 S: AsRef<OsStr>,
1810 {
1811 let mut command = self.build_command(args);
1812 let output = command.output().await?;
1813 anyhow::ensure!(
1814 output.status.success(),
1815 GitBinaryCommandError {
1816 stdout: String::from_utf8_lossy(&output.stdout).to_string(),
1817 stderr: String::from_utf8_lossy(&output.stderr).to_string(),
1818 status: output.status,
1819 }
1820 );
1821 Ok(String::from_utf8(output.stdout)?)
1822 }
1823
1824 fn build_command<S>(&self, args: impl IntoIterator<Item = S>) -> smol::process::Command
1825 where
1826 S: AsRef<OsStr>,
1827 {
1828 let mut command = new_smol_command(&self.git_binary_path);
1829 command.current_dir(&self.working_directory);
1830 command.args(args);
1831 if let Some(index_file_path) = self.index_file_path.as_ref() {
1832 command.env("GIT_INDEX_FILE", index_file_path);
1833 }
1834 command.envs(&self.envs);
1835 command
1836 }
1837}
1838
1839#[derive(Error, Debug)]
1840#[error("Git command failed:\n{stdout}{stderr}\n")]
1841struct GitBinaryCommandError {
1842 stdout: String,
1843 stderr: String,
1844 status: ExitStatus,
1845}
1846
1847async fn run_git_command(
1848 env: Arc<HashMap<String, String>>,
1849 ask_pass: AskPassDelegate,
1850 mut command: smol::process::Command,
1851 executor: &BackgroundExecutor,
1852) -> Result<RemoteCommandOutput> {
1853 if env.contains_key("GIT_ASKPASS") {
1854 let git_process = command.spawn()?;
1855 let output = git_process.output().await?;
1856 anyhow::ensure!(
1857 output.status.success(),
1858 "{}",
1859 String::from_utf8_lossy(&output.stderr)
1860 );
1861 Ok(RemoteCommandOutput {
1862 stdout: String::from_utf8_lossy(&output.stdout).to_string(),
1863 stderr: String::from_utf8_lossy(&output.stderr).to_string(),
1864 })
1865 } else {
1866 let ask_pass = AskPassSession::new(executor, ask_pass).await?;
1867 command
1868 .env("GIT_ASKPASS", ask_pass.script_path())
1869 .env("SSH_ASKPASS", ask_pass.script_path())
1870 .env("SSH_ASKPASS_REQUIRE", "force");
1871 let git_process = command.spawn()?;
1872
1873 run_askpass_command(ask_pass, git_process).await
1874 }
1875}
1876
1877async fn run_askpass_command(
1878 mut ask_pass: AskPassSession,
1879 git_process: smol::process::Child,
1880) -> anyhow::Result<RemoteCommandOutput> {
1881 select_biased! {
1882 result = ask_pass.run().fuse() => {
1883 match result {
1884 AskPassResult::CancelledByUser => {
1885 Err(anyhow!(REMOTE_CANCELLED_BY_USER))?
1886 }
1887 AskPassResult::Timedout => {
1888 Err(anyhow!("Connecting to host timed out"))?
1889 }
1890 }
1891 }
1892 output = git_process.output().fuse() => {
1893 let output = output?;
1894 anyhow::ensure!(
1895 output.status.success(),
1896 "{}",
1897 String::from_utf8_lossy(&output.stderr)
1898 );
1899 Ok(RemoteCommandOutput {
1900 stdout: String::from_utf8_lossy(&output.stdout).to_string(),
1901 stderr: String::from_utf8_lossy(&output.stderr).to_string(),
1902 })
1903 }
1904 }
1905}
1906
1907pub static WORK_DIRECTORY_REPO_PATH: LazyLock<RepoPath> =
1908 LazyLock::new(|| RepoPath(Path::new("").into()));
1909
1910#[derive(Clone, Debug, Ord, Hash, PartialOrd, Eq, PartialEq)]
1911pub struct RepoPath(pub Arc<Path>);
1912
1913impl RepoPath {
1914 pub fn new(path: PathBuf) -> Self {
1915 debug_assert!(path.is_relative(), "Repo paths must be relative");
1916
1917 RepoPath(path.into())
1918 }
1919
1920 pub fn from_str(path: &str) -> Self {
1921 let path = Path::new(path);
1922 debug_assert!(path.is_relative(), "Repo paths must be relative");
1923
1924 RepoPath(path.into())
1925 }
1926
1927 pub fn to_unix_style(&self) -> Cow<'_, OsStr> {
1928 #[cfg(target_os = "windows")]
1929 {
1930 use std::ffi::OsString;
1931
1932 let path = self.0.as_os_str().to_string_lossy().replace("\\", "/");
1933 Cow::Owned(OsString::from(path))
1934 }
1935 #[cfg(not(target_os = "windows"))]
1936 {
1937 Cow::Borrowed(self.0.as_os_str())
1938 }
1939 }
1940}
1941
1942impl std::fmt::Display for RepoPath {
1943 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
1944 self.0.to_string_lossy().fmt(f)
1945 }
1946}
1947
1948impl From<&Path> for RepoPath {
1949 fn from(value: &Path) -> Self {
1950 RepoPath::new(value.into())
1951 }
1952}
1953
1954impl From<Arc<Path>> for RepoPath {
1955 fn from(value: Arc<Path>) -> Self {
1956 RepoPath(value)
1957 }
1958}
1959
1960impl From<PathBuf> for RepoPath {
1961 fn from(value: PathBuf) -> Self {
1962 RepoPath::new(value)
1963 }
1964}
1965
1966impl From<&str> for RepoPath {
1967 fn from(value: &str) -> Self {
1968 Self::from_str(value)
1969 }
1970}
1971
1972impl Default for RepoPath {
1973 fn default() -> Self {
1974 RepoPath(Path::new("").into())
1975 }
1976}
1977
1978impl AsRef<Path> for RepoPath {
1979 fn as_ref(&self) -> &Path {
1980 self.0.as_ref()
1981 }
1982}
1983
1984impl std::ops::Deref for RepoPath {
1985 type Target = Path;
1986
1987 fn deref(&self) -> &Self::Target {
1988 &self.0
1989 }
1990}
1991
1992impl Borrow<Path> for RepoPath {
1993 fn borrow(&self) -> &Path {
1994 self.0.as_ref()
1995 }
1996}
1997
1998#[derive(Debug)]
1999pub struct RepoPathDescendants<'a>(pub &'a Path);
2000
2001impl MapSeekTarget<RepoPath> for RepoPathDescendants<'_> {
2002 fn cmp_cursor(&self, key: &RepoPath) -> Ordering {
2003 if key.starts_with(self.0) {
2004 Ordering::Greater
2005 } else {
2006 self.0.cmp(key)
2007 }
2008 }
2009}
2010
2011fn parse_branch_input(input: &str) -> Result<Vec<Branch>> {
2012 let mut branches = Vec::new();
2013 for line in input.split('\n') {
2014 if line.is_empty() {
2015 continue;
2016 }
2017 let mut fields = line.split('\x00');
2018 let is_current_branch = fields.next().context("no HEAD")? == "*";
2019 let head_sha: SharedString = fields.next().context("no objectname")?.to_string().into();
2020 let parent_sha: SharedString = fields.next().context("no parent")?.to_string().into();
2021 let ref_name = fields.next().context("no refname")?.to_string().into();
2022 let upstream_name = fields.next().context("no upstream")?.to_string();
2023 let upstream_tracking = parse_upstream_track(fields.next().context("no upstream:track")?)?;
2024 let commiterdate = fields.next().context("no committerdate")?.parse::<i64>()?;
2025 let subject: SharedString = fields
2026 .next()
2027 .context("no contents:subject")?
2028 .to_string()
2029 .into();
2030
2031 branches.push(Branch {
2032 is_head: is_current_branch,
2033 ref_name,
2034 most_recent_commit: Some(CommitSummary {
2035 sha: head_sha,
2036 subject,
2037 commit_timestamp: commiterdate,
2038 has_parent: !parent_sha.is_empty(),
2039 }),
2040 upstream: if upstream_name.is_empty() {
2041 None
2042 } else {
2043 Some(Upstream {
2044 ref_name: upstream_name.into(),
2045 tracking: upstream_tracking,
2046 })
2047 },
2048 })
2049 }
2050
2051 Ok(branches)
2052}
2053
2054fn parse_upstream_track(upstream_track: &str) -> Result<UpstreamTracking> {
2055 if upstream_track.is_empty() {
2056 return Ok(UpstreamTracking::Tracked(UpstreamTrackingStatus {
2057 ahead: 0,
2058 behind: 0,
2059 }));
2060 }
2061
2062 let upstream_track = upstream_track.strip_prefix("[").context("missing [")?;
2063 let upstream_track = upstream_track.strip_suffix("]").context("missing [")?;
2064 let mut ahead: u32 = 0;
2065 let mut behind: u32 = 0;
2066 for component in upstream_track.split(", ") {
2067 if component == "gone" {
2068 return Ok(UpstreamTracking::Gone);
2069 }
2070 if let Some(ahead_num) = component.strip_prefix("ahead ") {
2071 ahead = ahead_num.parse::<u32>()?;
2072 }
2073 if let Some(behind_num) = component.strip_prefix("behind ") {
2074 behind = behind_num.parse::<u32>()?;
2075 }
2076 }
2077 Ok(UpstreamTracking::Tracked(UpstreamTrackingStatus {
2078 ahead,
2079 behind,
2080 }))
2081}
2082
2083fn check_path_to_repo_path_errors(relative_file_path: &Path) -> Result<()> {
2084 match relative_file_path.components().next() {
2085 None => anyhow::bail!("repo path should not be empty"),
2086 Some(Component::Prefix(_)) => anyhow::bail!(
2087 "repo path `{}` should be relative, not a windows prefix",
2088 relative_file_path.to_string_lossy()
2089 ),
2090 Some(Component::RootDir) => {
2091 anyhow::bail!(
2092 "repo path `{}` should be relative",
2093 relative_file_path.to_string_lossy()
2094 )
2095 }
2096 Some(Component::CurDir) => {
2097 anyhow::bail!(
2098 "repo path `{}` should not start with `.`",
2099 relative_file_path.to_string_lossy()
2100 )
2101 }
2102 Some(Component::ParentDir) => {
2103 anyhow::bail!(
2104 "repo path `{}` should not start with `..`",
2105 relative_file_path.to_string_lossy()
2106 )
2107 }
2108 _ => Ok(()),
2109 }
2110}
2111
2112fn checkpoint_author_envs() -> HashMap<String, String> {
2113 HashMap::from_iter([
2114 ("GIT_AUTHOR_NAME".to_string(), "Zed".to_string()),
2115 ("GIT_AUTHOR_EMAIL".to_string(), "hi@zed.dev".to_string()),
2116 ("GIT_COMMITTER_NAME".to_string(), "Zed".to_string()),
2117 ("GIT_COMMITTER_EMAIL".to_string(), "hi@zed.dev".to_string()),
2118 ])
2119}
2120
2121#[cfg(test)]
2122mod tests {
2123 use super::*;
2124 use gpui::TestAppContext;
2125
2126 #[gpui::test]
2127 async fn test_checkpoint_basic(cx: &mut TestAppContext) {
2128 cx.executor().allow_parking();
2129
2130 let repo_dir = tempfile::tempdir().unwrap();
2131
2132 git2::Repository::init(repo_dir.path()).unwrap();
2133 let file_path = repo_dir.path().join("file");
2134 smol::fs::write(&file_path, "initial").await.unwrap();
2135
2136 let repo =
2137 RealGitRepository::new(&repo_dir.path().join(".git"), None, cx.executor()).unwrap();
2138 repo.stage_paths(
2139 vec![RepoPath::from_str("file")],
2140 Arc::new(HashMap::default()),
2141 )
2142 .await
2143 .unwrap();
2144 repo.commit(
2145 "Initial commit".into(),
2146 None,
2147 CommitOptions::default(),
2148 Arc::new(checkpoint_author_envs()),
2149 )
2150 .await
2151 .unwrap();
2152
2153 smol::fs::write(&file_path, "modified before checkpoint")
2154 .await
2155 .unwrap();
2156 smol::fs::write(repo_dir.path().join("new_file_before_checkpoint"), "1")
2157 .await
2158 .unwrap();
2159 let checkpoint = repo.checkpoint().await.unwrap();
2160
2161 // Ensure the user can't see any branches after creating a checkpoint.
2162 assert_eq!(repo.branches().await.unwrap().len(), 1);
2163
2164 smol::fs::write(&file_path, "modified after checkpoint")
2165 .await
2166 .unwrap();
2167 repo.stage_paths(
2168 vec![RepoPath::from_str("file")],
2169 Arc::new(HashMap::default()),
2170 )
2171 .await
2172 .unwrap();
2173 repo.commit(
2174 "Commit after checkpoint".into(),
2175 None,
2176 CommitOptions::default(),
2177 Arc::new(checkpoint_author_envs()),
2178 )
2179 .await
2180 .unwrap();
2181
2182 smol::fs::remove_file(repo_dir.path().join("new_file_before_checkpoint"))
2183 .await
2184 .unwrap();
2185 smol::fs::write(repo_dir.path().join("new_file_after_checkpoint"), "2")
2186 .await
2187 .unwrap();
2188
2189 // Ensure checkpoint stays alive even after a Git GC.
2190 repo.gc().await.unwrap();
2191 repo.restore_checkpoint(checkpoint.clone()).await.unwrap();
2192
2193 assert_eq!(
2194 smol::fs::read_to_string(&file_path).await.unwrap(),
2195 "modified before checkpoint"
2196 );
2197 assert_eq!(
2198 smol::fs::read_to_string(repo_dir.path().join("new_file_before_checkpoint"))
2199 .await
2200 .unwrap(),
2201 "1"
2202 );
2203 // See TODO above
2204 // assert_eq!(
2205 // smol::fs::read_to_string(repo_dir.path().join("new_file_after_checkpoint"))
2206 // .await
2207 // .ok(),
2208 // None
2209 // );
2210 }
2211
2212 #[gpui::test]
2213 async fn test_checkpoint_empty_repo(cx: &mut TestAppContext) {
2214 cx.executor().allow_parking();
2215
2216 let repo_dir = tempfile::tempdir().unwrap();
2217 git2::Repository::init(repo_dir.path()).unwrap();
2218 let repo =
2219 RealGitRepository::new(&repo_dir.path().join(".git"), None, cx.executor()).unwrap();
2220
2221 smol::fs::write(repo_dir.path().join("foo"), "foo")
2222 .await
2223 .unwrap();
2224 let checkpoint_sha = repo.checkpoint().await.unwrap();
2225
2226 // Ensure the user can't see any branches after creating a checkpoint.
2227 assert_eq!(repo.branches().await.unwrap().len(), 1);
2228
2229 smol::fs::write(repo_dir.path().join("foo"), "bar")
2230 .await
2231 .unwrap();
2232 smol::fs::write(repo_dir.path().join("baz"), "qux")
2233 .await
2234 .unwrap();
2235 repo.restore_checkpoint(checkpoint_sha).await.unwrap();
2236 assert_eq!(
2237 smol::fs::read_to_string(repo_dir.path().join("foo"))
2238 .await
2239 .unwrap(),
2240 "foo"
2241 );
2242 // See TODOs above
2243 // assert_eq!(
2244 // smol::fs::read_to_string(repo_dir.path().join("baz"))
2245 // .await
2246 // .ok(),
2247 // None
2248 // );
2249 }
2250
2251 #[gpui::test]
2252 async fn test_compare_checkpoints(cx: &mut TestAppContext) {
2253 cx.executor().allow_parking();
2254
2255 let repo_dir = tempfile::tempdir().unwrap();
2256 git2::Repository::init(repo_dir.path()).unwrap();
2257 let repo =
2258 RealGitRepository::new(&repo_dir.path().join(".git"), None, cx.executor()).unwrap();
2259
2260 smol::fs::write(repo_dir.path().join("file1"), "content1")
2261 .await
2262 .unwrap();
2263 let checkpoint1 = repo.checkpoint().await.unwrap();
2264
2265 smol::fs::write(repo_dir.path().join("file2"), "content2")
2266 .await
2267 .unwrap();
2268 let checkpoint2 = repo.checkpoint().await.unwrap();
2269
2270 assert!(
2271 !repo
2272 .compare_checkpoints(checkpoint1, checkpoint2.clone())
2273 .await
2274 .unwrap()
2275 );
2276
2277 let checkpoint3 = repo.checkpoint().await.unwrap();
2278 assert!(
2279 repo.compare_checkpoints(checkpoint2, checkpoint3)
2280 .await
2281 .unwrap()
2282 );
2283 }
2284
2285 #[gpui::test]
2286 async fn test_checkpoint_exclude_binary_files(cx: &mut TestAppContext) {
2287 cx.executor().allow_parking();
2288
2289 let repo_dir = tempfile::tempdir().unwrap();
2290 let text_path = repo_dir.path().join("main.rs");
2291 let bin_path = repo_dir.path().join("binary.o");
2292
2293 git2::Repository::init(repo_dir.path()).unwrap();
2294
2295 smol::fs::write(&text_path, "fn main() {}").await.unwrap();
2296
2297 smol::fs::write(&bin_path, "some binary file here")
2298 .await
2299 .unwrap();
2300
2301 let repo =
2302 RealGitRepository::new(&repo_dir.path().join(".git"), None, cx.executor()).unwrap();
2303
2304 // initial commit
2305 repo.stage_paths(
2306 vec![RepoPath::from_str("main.rs")],
2307 Arc::new(HashMap::default()),
2308 )
2309 .await
2310 .unwrap();
2311 repo.commit(
2312 "Initial commit".into(),
2313 None,
2314 CommitOptions::default(),
2315 Arc::new(checkpoint_author_envs()),
2316 )
2317 .await
2318 .unwrap();
2319
2320 let checkpoint = repo.checkpoint().await.unwrap();
2321
2322 smol::fs::write(&text_path, "fn main() { println!(\"Modified\"); }")
2323 .await
2324 .unwrap();
2325 smol::fs::write(&bin_path, "Modified binary file")
2326 .await
2327 .unwrap();
2328
2329 repo.restore_checkpoint(checkpoint).await.unwrap();
2330
2331 // Text files should be restored to checkpoint state,
2332 // but binaries should not (they aren't tracked)
2333 assert_eq!(
2334 smol::fs::read_to_string(&text_path).await.unwrap(),
2335 "fn main() {}"
2336 );
2337
2338 assert_eq!(
2339 smol::fs::read_to_string(&bin_path).await.unwrap(),
2340 "Modified binary file"
2341 );
2342 }
2343
2344 #[test]
2345 fn test_branches_parsing() {
2346 // suppress "help: octal escapes are not supported, `\0` is always null"
2347 #[allow(clippy::octal_escapes)]
2348 let input = "*\0060964da10574cd9bf06463a53bf6e0769c5c45e\0\0refs/heads/zed-patches\0refs/remotes/origin/zed-patches\0\01733187470\0generated protobuf\n";
2349 assert_eq!(
2350 parse_branch_input(input).unwrap(),
2351 vec![Branch {
2352 is_head: true,
2353 ref_name: "refs/heads/zed-patches".into(),
2354 upstream: Some(Upstream {
2355 ref_name: "refs/remotes/origin/zed-patches".into(),
2356 tracking: UpstreamTracking::Tracked(UpstreamTrackingStatus {
2357 ahead: 0,
2358 behind: 0
2359 })
2360 }),
2361 most_recent_commit: Some(CommitSummary {
2362 sha: "060964da10574cd9bf06463a53bf6e0769c5c45e".into(),
2363 subject: "generated protobuf".into(),
2364 commit_timestamp: 1733187470,
2365 has_parent: false,
2366 })
2367 }]
2368 )
2369 }
2370
2371 impl RealGitRepository {
2372 /// Force a Git garbage collection on the repository.
2373 fn gc(&self) -> BoxFuture<'_, Result<()>> {
2374 let working_directory = self.working_directory();
2375 let git_binary_path = self.git_binary_path.clone();
2376 let executor = self.executor.clone();
2377 self.executor
2378 .spawn(async move {
2379 let git_binary_path = git_binary_path.clone();
2380 let working_directory = working_directory?;
2381 let git = GitBinary::new(git_binary_path, working_directory, executor);
2382 git.run(&["gc", "--prune"]).await?;
2383 Ok(())
2384 })
2385 .boxed()
2386 }
2387 }
2388}