mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-25 05:29:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

git_utils: Move git_fetch back to cli/src/commands/git/fetch.rs
Some checks failed
build / build (, macos-13) (push) Has been cancelled
Details
build / build (, macos-14) (push) Has been cancelled
Details
build / build (, ubuntu-latest) (push) Has been cancelled
Details
build / build (, windows-latest) (push) Has been cancelled
Details
build / build (--all-features, ubuntu-latest) (push) Has been cancelled
Details
build / Build jj-lib without Git support (push) Has been cancelled
Details
build / Check protos (push) Has been cancelled
Details
build / Check formatting (push) Has been cancelled
Details
build / Check that MkDocs can build the docs (push) Has been cancelled
Details
build / Check that MkDocs can build the docs with latest Python and uv (push) Has been cancelled
Details
build / cargo-deny (advisories) (push) Has been cancelled
Details
build / cargo-deny (bans licenses sources) (push) Has been cancelled
Details
build / Clippy check (push) Has been cancelled
Details

Browse source 
With the new GitFetch api, `git_fetch` will not be shared with `jj git sync`.
This commit is contained in:
Essien Ita Essien 2024-11-30 18:32:21 +00:00
parent 6757530d82
commit 0a643918ff
2 changed files with 55 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
cli/src/commands/git/fetch.rs
View file

@ -15,16 +15,24 @@
use clap_complete::ArgValueCandidates;
use itertools::Itertools;
use jj_lib::config::ConfigGetResultExt as _;
use jj_lib::git::GitFetch;
use jj_lib::git::GitFetchError;
use jj_lib::repo::Repo;
use jj_lib::settings::UserSettings;
use jj_lib::str_util::StringPattern;
use crate::cli_util::CommandHelper;
use crate::cli_util::WorkspaceCommandTransaction;
use crate::command_error::user_error;
use crate::command_error::user_error_with_hint;
use crate::command_error::CommandError;
use crate::commands::git::get_single_remote;
use crate::complete;
use crate::git_util::get_git_repo;
use crate::git_util::git_fetch;
use crate::git_util::map_git_error;
use crate::git_util::print_git_import_stats;
use crate::git_util::warn_if_branches_not_found;
use crate::git_util::with_remote_git_callbacks;
use crate::ui::Ui;
/// Fetch from a Git remote
@ -119,3 +127,48 @@ fn get_all_remotes(git_repo: &git2::Repository) -> Result<Vec<String>, CommandEr
.filter_map(|x| x.map(ToOwned::to_owned))
.collect())
}
pub fn git_fetch(
ui: &mut Ui,
tx: &mut WorkspaceCommandTransaction,
git_repo: &git2::Repository,
remotes: &[String],
branch: &[StringPattern],
) -> Result<(), CommandError> {
let git_settings = tx.settings().git_settings();
let mut git_fetch = GitFetch::new(tx.repo_mut(), git_repo, &git_settings);
for remote in remotes {
with_remote_git_callbacks(ui, None, |cb| -> Result<(), CommandError> {
git_fetch
.fetch(remote, branch, cb, None)
.map_err(|err| match err {
GitFetchError::InvalidBranchPattern => {
if branch
.iter()
.any(|pattern| pattern.as_exact().is_some_and(|s| s.contains('*')))
{
user_error_with_hint(
"Branch names may not include `*`.",
"Prefix the pattern with `glob:` to expand `*` as a glob",
)
} else {
user_error(err)
}
}
GitFetchError::GitImportError(err) => err.into(),
GitFetchError::InternalGitError(err) => map_git_error(err),
_ => user_error(err),
})?;
Ok(())
})?;
}
let import_stats = git_fetch.import_refs()?;
print_git_import_stats(ui, tx.repo(), &import_stats, true)?;
warn_if_branches_not_found(
ui,
tx,
branch,
&remotes.iter().map(StringPattern::exact).collect_vec(),
)
}

52
cli/src/git_util.rs
View file

@ -27,8 +27,6 @@ use itertools::Itertools;
use jj_lib::git;
use jj_lib::git::FailedRefExport;
use jj_lib::git::FailedRefExportReason;
use jj_lib::git::GitFetch;
use jj_lib::git::GitFetchError;
use jj_lib::git::GitImportStats;
use jj_lib::git::RefName;
use jj_lib::git_backend::GitBackend;
@ -457,55 +455,7 @@ export or their "parent" bookmarks."#,
Ok(())
}
// TODO: Move this back to cli/src/commands/git/fetch.rs
// With the new `GitFetch` api, this function is too specialized
// to the `jj git fetch` command and should not be reused.
pub fn git_fetch(
ui: &mut Ui,
tx: &mut WorkspaceCommandTransaction,
git_repo: &git2::Repository,
remotes: &[String],
branch: &[StringPattern],
) -> Result<(), CommandError> {
let git_settings = tx.settings().git_settings();
let mut git_fetch = GitFetch::new(tx.repo_mut(), git_repo, &git_settings);
for remote in remotes {
with_remote_git_callbacks(ui, None, |cb| -> Result<(), CommandError> {
git_fetch
.fetch(remote, branch, cb, None)
.map_err(|err| match err {
GitFetchError::InvalidBranchPattern => {
if branch
.iter()
.any(|pattern| pattern.as_exact().is_some_and(|s| s.contains('*')))
{
user_error_with_hint(
"Branch names may not include `*`.",
"Prefix the pattern with `glob:` to expand `*` as a glob",
)
} else {
user_error(err)
}
}
GitFetchError::GitImportError(err) => err.into(),
GitFetchError::InternalGitError(err) => map_git_error(err),
_ => user_error(err),
})?;
Ok(())
})?;
}
let import_stats = git_fetch.import_refs()?;
print_git_import_stats(ui, tx.repo(), &import_stats, true)?;
warn_if_branches_not_found(
ui,
tx,
branch,
&remotes.iter().map(StringPattern::exact).collect_vec(),
)
}
fn warn_if_branches_not_found(
pub fn warn_if_branches_not_found(
ui: &mut Ui,
tx: &WorkspaceCommandTransaction,
branches: &[StringPattern],