From: Derrick Stolee <derrickstolee@github•com>
To: Taylor Blau <me@ttaylorr•com>, git@vger•kernel.org
Cc: sandals@crustytoothpaste•net, gitster@pobox•com
Subject: Re: [PATCH] builtin/remote.c: show progress when renaming remote references
Date: Wed, 2 Mar 2022 09:32:48 -0500 [thread overview]
Message-ID: <06ef2e2c-7048-1101-870a-4774a2dcd988@github.com> (raw)
In-Reply-To: <70a0325ca8ab0492a9b0873ee3fba576c5ab90b9.1646173186.git.me@ttaylorr.com>
On 3/1/2022 5:20 PM, Taylor Blau wrote:
> When renaming a remote, Git needs to rename all remote tracking
> references to the remote's new name (e.g., renaming
> "refs/remotes/old/foo" to "refs/remotes/new/foo" when renaming a remote
> from "old" to "new").
>
> This can be somewhat slow when there are many references to rename,
> since each rename is done in a separate call to rename_ref() as opposed
> to grouping all renames together into the same transaction. It would be
> nice to execute all renames as a single transaction, but there is a
> snag: the reference transaction backend doesn't support renames during a
> transaction (only individually, via rename_ref()).
>
> The reasons there are described in more detail in [1], but the main
> problem is that in order to preserve the existing reflog, it must be
> moved while holding both locks (i.e., on "oldname" and "newname"), and
> the ref transaction code doesn't support inserting arbitrary actions
> into the middle of a transaction like that.
>
> As an aside, adding support for this to the ref transaction code is
> less straightforward than inserting both a ref_update() and ref_delete()
> call into the same transaction. rename_ref()'s special handling to
> detect D/F conflicts would need to be rewritten for the transaction code
> if we wanted to proactively catch D/F conflicts when renaming a
> reference during a transaction. The reftable backend could support this
> much more readily because of its lack of D/F conflicts.
>
> 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.
Thanks for this patch. It improves the user experience through
useful feedback.
> @@ -682,7 +686,8 @@ static int mv(int argc, const char **argv)
> old_remote_context = STRBUF_INIT;
> struct string_list remote_branches = STRING_LIST_INIT_DUP;
> struct rename_info rename;
> - int i, refspec_updated = 0;
> + int i, j = 0, refspec_updated = 0;
My only complaint is that 'j' is not informative enough here.
'j' as a loop iterator is good, but we aren't looping "on" j,
but instead tracking a progress_count across multiple loops.
Thanks,
-Stolee
next prev parent reply other threads:[~2022-03-02 14:32 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 [this message]
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
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=06ef2e2c-7048-1101-870a-4774a2dcd988@github.com \
--to=derrickstolee@github$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=me@ttaylorr$(echo .)com \
--cc=sandals@crustytoothpaste$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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