From: ZheNing Hu <adlternative@xxxxxxxxx>
Sometimes when users use scalar to download a monorepo
with a long commit history, they want to check the
progress bar to know how long they still need to wait
during the fetch process, but scalar suppresses this
output by default.
So add `[--verbose| -v]` to scalar clone, to enable
fetch's output.
Signed-off-by: ZheNing Hu <adlternative@xxxxxxxxx>
---
scalar: use verbose mode in clone
When users use scalar to download a monorepo with a long commit history
(or the client and server network communication is very poor), we often
need to spend a long time in the fetch phase of scalar, some users may
want to check this progress bar To understand the progress of fetch and
how long they have to wait, so we should enable scalar to display fetch
progress.
v1. add [--verbose| -v] to scalar clone.
Note: output look like this:
$ scalar clone -v git@xxxxxxxxxx:git/git.git
Initialized empty Git repository in /Users/adl/test/git/src/.git/
remote: Enumerating objects: 209091, done.
remote: Counting objects: 100% (991/991), done.
remote: Compressing objects: 100% (944/944), done.
Receiving objects: 100% (209085/209085), 81.39 MiB | 126.00 KiB/s, done.
remote: Total 209085 (delta 54), reused 979 (delta 47), pack-reused 208094
Resolving deltas: 100% (134000/134000), done.
From github.com:git/git
* [new branch] jch -> origin/jch
* [new branch] main -> origin/main
* [new branch] maint -> origin/maint
* [new branch] master -> origin/master
* [new branch] next -> origin/next
* [new branch] seen -> origin/seen
* [new branch] todo -> origin/todo
* [new tag] v2.39.0-rc2 -> v2.39.0-rc2
* [new tag] gitgui-0.10.0 -> gitgui-0.10.0
* [new tag] gitgui-0.10.1 -> gitgui-0.10.1
* [new tag] gitgui-0.10.2 -> gitgui-0.10.2
* [new tag] gitgui-0.11.0 -> gitgui-0.11.0
...
"new branch", "new tag" output is a bit annoying, it would be better to
suppress them, but keep the progress.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1441%2Fadlternative%2Fzh%2Fscalar-verbosity-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1441/adlternative/zh/scalar-verbosity-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1441
Documentation/scalar.txt | 7 ++++++-
scalar.c | 11 ++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Documentation/scalar.txt b/Documentation/scalar.txt
index f33436c7f65..7ff37b43945 100644
--- a/Documentation/scalar.txt
+++ b/Documentation/scalar.txt
@@ -8,7 +8,7 @@ scalar - A tool for managing large Git repositories
SYNOPSIS
--------
[verse]
-scalar clone [--single-branch] [--branch <main-branch>] [--full-clone] <url> [<enlistment>]
+scalar clone [--single-branch] [--branch <main-branch>] [--verbose | -v] [--full-clone] <url> [<enlistment>]
scalar list
scalar register [<enlistment>]
scalar unregister [<enlistment>]
@@ -84,6 +84,11 @@ cloning. If the HEAD at the remote did not point at any branch when
A sparse-checkout is initialized by default. This behavior can be
turned off via `--full-clone`.
+-v::
+--verbose::
+ When scalar executes `git fetch`, `--quiet` is used by default to
+ suppress the output of fetch, use verbose mode for cancel this.
+
List
~~~~
diff --git a/scalar.c b/scalar.c
index 6c52243cdf1..b1d4504d136 100644
--- a/scalar.c
+++ b/scalar.c
@@ -404,7 +404,7 @@ void load_builtin_commands(const char *prefix, struct cmdnames *cmds)
static int cmd_clone(int argc, const char **argv)
{
const char *branch = NULL;
- int full_clone = 0, single_branch = 0;
+ int full_clone = 0, single_branch = 0, verbosity = 0;
struct option clone_options[] = {
OPT_STRING('b', "branch", &branch, N_("<branch>"),
N_("branch to checkout after clone")),
@@ -413,6 +413,7 @@ static int cmd_clone(int argc, const char **argv)
OPT_BOOL(0, "single-branch", &single_branch,
N_("only download metadata for the branch that will "
"be checked out")),
+ OPT__VERBOSITY(&verbosity),
OPT_END(),
};
const char * const clone_usage[] = {
@@ -499,7 +500,9 @@ static int cmd_clone(int argc, const char **argv)
if (set_recommended_config(0))
return error(_("could not configure '%s'"), dir);
- if ((res = run_git("fetch", "--quiet", "origin", NULL))) {
+ if ((res = run_git("fetch", "origin",
+ verbosity ? NULL : "--quiet",
+ NULL))) {
warning(_("partial clone failed; attempting full clone"));
if (set_config("remote.origin.promisor") ||
@@ -508,7 +511,9 @@ static int cmd_clone(int argc, const char **argv)
goto cleanup;
}
- if ((res = run_git("fetch", "--quiet", "origin", NULL)))
+ if ((res = run_git("fetch", "origin",
+ verbosity ? NULL : "--quiet",
+ NULL)))
goto cleanup;
}
base-commit: 2e71cbbddd64695d43383c25c7a054ac4ff86882
--
gitgitgadget
