From: Junio C Hamano <gitster@pobox.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org, sandals@crustytoothpaste.net,
derrickstolee@github.com, avarab@gmail.com
Subject: Re: [PATCH v3 2/2] builtin/remote.c: show progress when renaming remote references
Date: Thu, 03 Mar 2022 15:20:48 -0800 [thread overview]
Message-ID: <xmqqk0da7hdb.fsf@gitster.g> (raw)
In-Reply-To: <d5b0a4b71027619123b7284611692d3a9c128518.1646346287.git.me@ttaylorr.com> (Taylor Blau's message of "Thu, 3 Mar 2022 17:25:18 -0500")
Taylor Blau <me@ttaylorr.com> writes:
> Instead of a more complex modification to the ref transaction code,
> display a progress meter when running verbosely in order to convince the
> user that Git is doing work while renaming a remote.
Is it still "when running verbosely"?
I thought that tying this to --[no-]progress was the whole point of
iterating another round.
... when the standard error output is connected to a
terminal, so that user knows Git is not completely stuck.
> This is mostly done as-expected, with the minor caveat that we
> intentionally count symrefs renames twice, since renaming a symref takes
> place over two separate calls (one to delete the old one, and another to
> create the new one).
That's a nice note to leave here, as it is a bit tricky to reason about.
> [1]: https://lore.kernel.org/git/572367B4.4050207@alum.mit.edu/
>
> Suggested-by: brian m. carlson <sandals@crustytoothpaste.net>
> Signed-off-by: Taylor Blau <me@ttaylorr.com>
> ---
> Documentation/git-remote.txt | 2 +-
> builtin/remote.c | 30 +++++++++++++++++++++++++-----
> t/t5505-remote.sh | 4 +++-
> 3 files changed, 29 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
> index 2bebc32566..cde9614e36 100644
> --- a/Documentation/git-remote.txt
> +++ b/Documentation/git-remote.txt
> @@ -11,7 +11,7 @@ SYNOPSIS
> [verse]
> 'git remote' [-v | --verbose]
> 'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
> -'git remote rename' <old> <new>
> +'git remote rename' [--[no-]progress] <old> <new>
> 'git remote remove' <name>
> 'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
> 'git remote set-branches' [--add] <name> <branch>...
Do we already have an entry for the --progress option in the
description part of the documentation? I think the way progress
works in the context of this command is pretty much bog-standard
one that we may not have to, once the user has seen how progress
options work elsewhere.
If not, then we'd want something like this squashed in, perhaps?
Documentation/git-remote.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git c/Documentation/git-remote.txt w/Documentation/git-remote.txt
index cde9614e36..e04810ee70 100644
--- c/Documentation/git-remote.txt
+++ w/Documentation/git-remote.txt
@@ -83,7 +83,10 @@ will always behave as if `--mirror` was passed.
'rename'::
Rename the remote named <old> to <new>. All remote-tracking branches and
-configuration settings for the remote are updated.
+configuration settings for the remote are updated. When used interactively
+(i.e. the standard error stream is connected to a terminal),
+a progress bar may be shown while remote-tracking branches are renamed,
+which can be silenced by passing the `--no-progress` option.
+
In case <old> and <new> are the same, and <old> is a file under
`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to
next prev parent reply other threads:[~2022-03-03 23:20 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 22:20 [PATCH] builtin/remote.c: show progress when renaming remote references Taylor Blau
2022-03-02 14:32 ` Derrick Stolee
2022-03-02 15:52 ` Taylor Blau
2022-03-02 18:58 ` Derrick Stolee
2022-03-02 19:03 ` Junio C Hamano
2022-03-02 19:00 ` Ævar Arnfjörð Bjarmason
2022-03-02 22:55 ` Taylor Blau
2022-03-03 10:51 ` Ævar Arnfjörð Bjarmason
2022-03-03 19:54 ` Taylor Blau
2022-03-07 10:34 ` Han-Wen Nienhuys
2022-03-02 22:21 ` brian m. carlson
2022-03-02 22:57 ` Taylor Blau
2022-03-03 16:09 ` Derrick Stolee
2022-03-03 19:58 ` Taylor Blau
2022-03-02 23:00 ` [PATCH v2] " Taylor Blau
2022-03-03 11:04 ` Ævar Arnfjörð Bjarmason
2022-03-03 22:25 ` [PATCH v3 0/2] remote: show progress display when renaming Taylor Blau
2022-03-03 22:25 ` [PATCH v3 1/2] builtin/remote.c: parse options in 'rename' Taylor Blau
2022-03-05 14:28 ` Ævar Arnfjörð Bjarmason
2022-03-03 22:25 ` [PATCH v3 2/2] builtin/remote.c: show progress when renaming remote references Taylor Blau
2022-03-03 23:20 ` Junio C Hamano [this message]
2022-03-03 23:30 ` Taylor Blau
2022-03-05 14:31 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk0da7hdb.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).