git clone: Add depth argument

martinvonz · Sep 13, 2024 · 6c47a30 · 6c47a30
1 parent 3df3779
commit 6c47a30
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/cli/src/commands/git/clone.rs b/cli/src/commands/git/clone.rs
@@ -57,6 +57,9 @@ pub struct GitCloneArgs {
     /// Whether or not to colocate the Jujutsu repo with the git repo
     #[arg(long)]
     colocate: bool,
+    /// Create a shallow clone of the given depth
+    #[arg(long, default_value_t = 0)]
+    depth: usize,
 }
 
 fn absolute_git_source(cwd: &Path, source: &str) -> String {
@@ -129,6 +132,7 @@ pub fn cmd_git_clone(
         ui,
         command,
         args.colocate,
+        args.depth,
         remote_name,
         &source,
         &canonical_wc_path,
@@ -192,6 +196,7 @@ fn do_git_clone(
     ui: &mut Ui,
     command: &CommandHelper,
     colocate: bool,
+    depth: usize,
     remote_name: &str,
     source: &str,
     wc_path: &Path,
@@ -216,6 +221,7 @@ fn do_git_clone(
         git::fetch(
             fetch_tx.repo_mut(),
             &git_repo,
+            depth,
             remote_name,
             &[StringPattern::everything()],
             cb,

diff --git a/cli/src/commands/git/fetch.rs b/cli/src/commands/git/fetch.rs
@@ -73,6 +73,7 @@ pub fn cmd_git_fetch(
             git::fetch(
                 tx.repo_mut(),
                 &git_repo,
+                0,
                 remote,
                 &args.branch,
                 cb,

diff --git a/cli/tests/[email protected] b/cli/tests/[email protected]
@@ -958,6 +958,7 @@ The Git repo will be a bare git repo stored inside the `.jj/` directory.
 ###### **Options:**
 
 * `--colocate` — Whether or not to colocate the Jujutsu repo with the git repo
+* `--depth <DEPTH>` — Create a shallow clone of the given depth
 
 
 

diff --git a/lib/src/git.rs b/lib/src/git.rs
@@ -1240,6 +1240,7 @@ pub struct GitFetchStats {
 pub fn fetch(
     mut_repo: &mut MutableRepo,
     git_repo: &git2::Repository,
+    depth: usize,
     remote_name: &str,
     branch_names: &[StringPattern],
     callbacks: RemoteCallbacks<'_>,
@@ -1260,6 +1261,7 @@ pub fn fetch(
     fetch_options.proxy_options(proxy_options);
     let callbacks = callbacks.into_git();
     fetch_options.remote_callbacks(callbacks);
+    fetch_options.depth(depth.try_into().unwrap_or(0));
     // At this point, we are only updating Git's remote tracking branches, not the
     // local branches.
     let refspecs: Vec<_> = branch_names

diff --git a/lib/tests/test_git.rs b/lib/tests/test_git.rs
@@ -2265,6 +2265,7 @@ fn test_fetch_empty_repo() {
     let stats = git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),
@@ -2291,6 +2292,7 @@ fn test_fetch_initial_commit() {
     let stats = git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),
@@ -2341,6 +2343,7 @@ fn test_fetch_success() {
     git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),
@@ -2364,6 +2367,7 @@ fn test_fetch_success() {
     let stats = git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),
@@ -2421,6 +2425,7 @@ fn test_fetch_prune_deleted_ref() {
     git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),
@@ -2444,6 +2449,7 @@ fn test_fetch_prune_deleted_ref() {
     let stats = git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),
@@ -2471,6 +2477,7 @@ fn test_fetch_no_default_branch() {
     git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),
@@ -2494,6 +2501,7 @@ fn test_fetch_no_default_branch() {
     let stats = git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),
@@ -2515,6 +2523,7 @@ fn test_fetch_empty_refspecs() {
     git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "origin",
         &[],
         git::RemoteCallbacks::default(),
@@ -2541,6 +2550,7 @@ fn test_fetch_no_such_remote() {
     let result = git::fetch(
         tx.repo_mut(),
         &test_data.git_repo,
+        0,
         "invalid-remote",
         &[StringPattern::everything()],
         git::RemoteCallbacks::default(),