From: Josh Steadmon <steadmon@google.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, chooglen@google.com,
emilyshaffer@google.com
Subject: Re: [PATCH v5 1/2] branch: accept multiple upstream branches for tracking
Date: Thu, 9 Dec 2021 15:03:11 -0800 [thread overview]
Message-ID: <YbKLL2cQCxXQeQ5J@google.com> (raw)
In-Reply-To: <211207.86mtlcpyu4.gmgdl@evledraar.gmail.com>
On 2021.12.07 09:57, Ævar Arnfjörð Bjarmason wrote:
>
> On Mon, Dec 06 2021, Josh Steadmon wrote:
>
> > Add a new static variant of install_branch_config() that accepts
> > multiple remote branch names for tracking. This will be used in an
> > upcoming commit that enables inheriting the tracking configuration from
> > a parent branch.
> >
> > Currently, all callers of install_branch_config() pass only a single
> > remote. Make install_branch_config() a small wrapper around
> > install_branch_config_multiple_remotes() so that existing callers do not
> > need to be changed.
> >
> > Signed-off-by: Josh Steadmon <steadmon@google.com>
> > ---
> > branch.c | 120 ++++++++++++++++++++++++++++++++++++++++---------------
> > 1 file changed, 87 insertions(+), 33 deletions(-)
> >
> > diff --git a/branch.c b/branch.c
> > index 7a88a4861e..1aabef4de0 100644
> > --- a/branch.c
> > +++ b/branch.c
> > @@ -55,19 +55,24 @@ N_("\n"
> > "the remote tracking information by invoking\n"
> > "\"git branch --set-upstream-to=%s%s%s\".");
> >
> > -int install_branch_config(int flag, const char *local, const char *origin, const char *remote)
> > +static int install_branch_config_multiple_remotes(int flag, const char *local, const char *origin,
> > + struct string_list *remotes)
> > {
> > const char *shortname = NULL;
> > struct strbuf key = STRBUF_INIT;
> > - int rebasing = should_setup_rebase(origin);
> > -
> > - if (skip_prefix(remote, "refs/heads/", &shortname)
> > - && !strcmp(local, shortname)
> > - && !origin) {
> > - warning(_("Not setting branch %s as its own upstream."),
> > - local);
> > - return 0;
> > - }
> > + int i, rebasing = should_setup_rebase(origin);
> > +
> > + if (remotes->nr < 1)
> > + BUG("must provide at least one remote for branch config");
>
> Since it's unsigned IMO this would be clearer: if (!remotes->nr)
Fixed in v6.
> > +
> > + if (!origin)
> > + for (i = 0; i < remotes->nr; i++)
> > + if (skip_prefix(remotes->items[i].string, "refs/heads/", &shortname)
>
> For this and others, since you don't use the [i] for anything except
> getting the current item using for_each_string_list_item() would be
> better.
>
> Partially a nit, partially that I've got another WIP
> soon-to-be-submitted topic to fix overflow bugs in that API, and not
> having "int i" etc. hardcoded in various places
> helps. I.e. for_each_string_list_item() is future-proof.
Thanks. I somehow missed for_each_string_list_item() when I checked the
header file. Fixed in v6.
> > + && !strcmp(local, shortname)) {
> > + warning(_("Not setting branch %s as its own upstream."),
>
> Better to quote '%s', also s/Not/not/ (lower-case) for all error/warning/die etc.
Done (for now) in v6, but this might become moot as I address Junio's
review comments.
> > + local);
> > + return 0;
> > + }
> >
> > strbuf_addf(&key, "branch.%s.remote", local);
> > if (git_config_set_gently(key.buf, origin ? origin : ".") < 0)
> > @@ -75,8 +80,17 @@ int install_branch_config(int flag, const char *local, const char *origin, const
> >
> > strbuf_reset(&key);
> > strbuf_addf(&key, "branch.%s.merge", local);
> > - if (git_config_set_gently(key.buf, remote) < 0)
> > + /*
> > + * We want to overwrite any existing config with all the branches in
> > + * "remotes". Override any existing config with the first branch, but if
> > + * more than one is provided, use CONFIG_REGEX_NONE to preserve what
> > + * we've written so far.
> > + */
> > + if (git_config_set_gently(key.buf, remotes->items[0].string) < 0)
> > goto out_err;
> > + for (i = 1; i < remotes->nr; i++)
> > + if (git_config_set_multivar_gently(key.buf, remotes->items[i].string, CONFIG_REGEX_NONE, 0) < 0)
> > + goto out_err;
> >
> > if (rebasing) {
> > strbuf_reset(&key);
> > @@ -87,29 +101,62 @@ int install_branch_config(int flag, const char *local, const char *origin, const
> > strbuf_release(&key);
> >
> > if (flag & BRANCH_CONFIG_VERBOSE) {
> > - if (shortname) {
> > - if (origin)
> > - printf_ln(rebasing ?
> > - _("Branch '%s' set up to track remote branch '%s' from '%s' by rebasing.") :
> > - _("Branch '%s' set up to track remote branch '%s' from '%s'."),
> > - local, shortname, origin);
> > - else
> > - printf_ln(rebasing ?
> > - _("Branch '%s' set up to track local branch '%s' by rebasing.") :
> > - _("Branch '%s' set up to track local branch '%s'."),
> > - local, shortname);
> > + int plural = remotes->nr > 1;
>
> This....
>
> > + int all_shortnames = 1;
> > + const char *msg_fmt;
> > + struct strbuf ref_string = STRBUF_INIT;
> > +
> > + for (i = 0; i < remotes->nr; i++)
> > + if (skip_prefix(remotes->items[i].string, "refs/heads/", &shortname)) {
> > + strbuf_addf(&ref_string, "'%s', ", shortname);
> > + } else {
> > + all_shortnames = 0;
> > + strbuf_addf(&ref_string, "'%s', ", remotes->items[i].string);
> > + }
> > + /* The last two characters are an extraneous ", ", so trim those. */
> > + strbuf_setlen(&ref_string, ref_string.len - 2);
>
> languages RTL in around way wrong the be to going is thing of sort This.
>
> :)
>
> We deal with this in most other places by just formatting a list of
> branches. E.g. in the ambiguous object output:
>
> https://lore.kernel.org/git/patch-v5-4.6-36b6b440c37-20211125T215529Z-avarab@gmail.com/
Done, thanks for the suggestion.
> > +
> > + if (all_shortnames && origin) {
> > + if (rebasing && plural)
> > + msg_fmt = "Branch '%s' set up to track remote branches %s from '%s' by rebasing.";
> > + else if (rebasing && !plural)
> > + msg_fmt = "Branch '%s' set up to track remote branch %s from '%s' by rebasing.";
> > + else if (!rebasing && plural)
> > + msg_fmt = "Branch '%s' set up to track remote branches %s from '%s'.";
> > + else if (!rebasing && !plural)
> > + msg_fmt = "Branch '%s' set up to track remote branch %s from '%s'.";
>
> ...and this is hardcoding plural rules used in English that don't apply
> in a lot of other languages...
>
> > +
> > + printf_ln(_(msg_fmt), local, ref_string, origin);
> > } else {
> > - if (origin)
> > - printf_ln(rebasing ?
> > - _("Branch '%s' set up to track remote ref '%s' by rebasing.") :
> > - _("Branch '%s' set up to track remote ref '%s'."),
> > - local, remote);
> > - else
> > - printf_ln(rebasing ?
> > - _("Branch '%s' set up to track local ref '%s' by rebasing.") :
> > - _("Branch '%s' set up to track local ref '%s'."),
> > - local, remote);
> > + if (all_shortnames && !origin && rebasing && plural)
> > + msg_fmt = "Branch '%s' set up to track local branches %s by rebasing.";
> > + if (all_shortnames && !origin && rebasing && !plural)
> > + msg_fmt = "Branch '%s' set up to track local branch %s by rebasing.";
> > + if (all_shortnames && !origin && !rebasing && plural)
> > + msg_fmt = "Branch '%s' set up to track local branches %s.";
> > + if (all_shortnames && !origin && !rebasing && !plural)
> > + msg_fmt = "Branch '%s' set up to track local branch %s.";
> > + if (!all_shortnames && origin && rebasing && plural)
> > + msg_fmt = "Branch '%s' set up to track remote refs %s by rebasing.";
> > + if (!all_shortnames && origin && rebasing && !plural)
> > + msg_fmt = "Branch '%s' set up to track remote ref %s by rebasing.";
> > + if (!all_shortnames && origin && !rebasing && plural)
> > + msg_fmt = "Branch '%s' set up to track remote refs %s.";
> > + if (!all_shortnames && origin && !rebasing && !plural)
> > + msg_fmt = "Branch '%s' set up to track remote ref %s.";
> > + if (!all_shortnames && !origin && rebasing && plural)
> > + msg_fmt = "Branch '%s' set up to track local refs %s by rebasing.";
> > + if (!all_shortnames && !origin && rebasing && !plural)
> > + msg_fmt = "Branch '%s' set up to track local ref %s by rebasing.";
> > + if (!all_shortnames && !origin && !rebasing && plural)
> > + msg_fmt = "Branch '%s' set up to track local refs %s.";
> > + if (!all_shortnames && !origin && !rebasing && !plural)
> > + msg_fmt = "Branch '%s' set up to track local ref %s.";
>
> ...in English you've got one dog, then dogs, so == 1 and >1, but in
> various other languages it's:
>
> git grep Plural-Forms -- po
>
> Anyway, this is easily solved, and even with less verbosity, see:
>
> git grep -E -W '\bQ_\('
>
> For examples of how to use the magic of libintl to do this for you.
Thank you for the pointer. I looked specifically for dealing with plural
forms in our docs, but the referenced "Preparing Strings" gettext docs
were not helpful for this. (Although I see now I should have read
further in po/README.md to find the relevant advice). I may send a
separate change to po/README.md to make it easier to find in the future.
> > +
> > + printf_ln(_(msg_fmt), local, ref_string);
>
> ...also s/Branch/branch/ for all of them/.
Done.
> > }
> > +
> > + strbuf_release(&ref_string);
> > }
> >
> > return 0;
> > @@ -121,11 +168,18 @@ int install_branch_config(int flag, const char *local, const char *origin, const
> > advise(_(tracking_advice),
> > origin ? origin : "",
> > origin ? "/" : "",
> > - shortname ? shortname : remote);
> > + remotes->items[0].string);
> >
> > return -1;
> > }
> >
> > +int install_branch_config(int flag, const char *local, const char *origin, const char *remote) {
>
> nit: overly long line..
Fixed.
> > + struct string_list remotes = STRING_LIST_INIT_DUP;
>
> nit: an extra \n after variable decls...
Fixed.
> > + string_list_append(&remotes, remote);
> > + return install_branch_config_multiple_remotes(flag, local, origin, &remotes);
> > + string_list_clear(&remotes, 0);
> > +}
> > +
> > /*
> > * This is called when new_ref is branched off of orig_ref, and tries
> > * to infer the settings for branch.<new_ref>.{remote,merge} from the
>
Thanks for the review!
next prev parent reply other threads:[~2021-12-09 23:03 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 20:15 [RFC PATCH] branch: add "inherit" option for branch.autoSetupMerge Josh Steadmon
2021-09-08 20:44 ` Josh Steadmon
2021-09-11 0:25 ` [PATCH v2] " Josh Steadmon
2021-09-11 0:52 ` Junio C Hamano
2021-10-17 4:35 ` Josh Steadmon
2021-10-17 5:50 ` Junio C Hamano
2021-11-15 21:57 ` Josh Steadmon
2021-10-17 4:45 ` [PATCH v3] branch: add flags and config to inherit tracking Josh Steadmon
2021-10-18 18:31 ` Ævar Arnfjörð Bjarmason
2021-10-18 21:44 ` Junio C Hamano
2021-10-18 22:11 ` Ævar Arnfjörð Bjarmason
2021-11-15 22:22 ` Josh Steadmon
2021-10-18 17:50 ` [RFC PATCH] branch: add "inherit" option for branch.autoSetupMerge Glen Choo
2021-10-18 18:08 ` Glen Choo
2021-11-15 21:44 ` Josh Steadmon
2021-11-16 18:25 ` [PATCH v4] branch: add flags and config to inherit tracking Josh Steadmon
2021-11-17 0:33 ` Glen Choo
2021-11-18 22:29 ` Junio C Hamano
2021-11-30 22:05 ` Josh Steadmon
2021-11-19 6:47 ` Ævar Arnfjörð Bjarmason
2021-11-30 21:34 ` Josh Steadmon
2021-12-01 9:11 ` Ævar Arnfjörð Bjarmason
2021-12-07 7:12 ` [PATCH v5 0/2] branch: inherit tracking configs Josh Steadmon
2021-12-07 7:12 ` [PATCH v5 1/2] branch: accept multiple upstream branches for tracking Josh Steadmon
2021-12-07 8:57 ` Ævar Arnfjörð Bjarmason
2021-12-09 23:03 ` Josh Steadmon [this message]
2021-12-10 1:00 ` Ævar Arnfjörð Bjarmason
2021-12-07 19:28 ` Junio C Hamano
2021-12-14 20:35 ` Josh Steadmon
2021-12-08 0:16 ` Glen Choo
2021-12-08 0:17 ` Glen Choo
2021-12-09 22:45 ` Josh Steadmon
2021-12-09 23:47 ` Glen Choo
2021-12-10 1:03 ` Ævar Arnfjörð Bjarmason
2021-12-10 17:32 ` Glen Choo
2021-12-11 2:18 ` Ævar Arnfjörð Bjarmason
2021-12-08 23:53 ` Glen Choo
2021-12-09 0:08 ` Glen Choo
2021-12-09 22:49 ` Josh Steadmon
2021-12-09 23:43 ` Glen Choo
2021-12-07 7:12 ` [PATCH v5 2/2] branch: add flags and config to inherit tracking Josh Steadmon
2021-12-07 9:08 ` Ævar Arnfjörð Bjarmason
2021-12-08 0:35 ` Glen Choo
2021-12-14 22:15 ` Josh Steadmon
2021-12-14 22:27 ` Josh Steadmon
2021-12-07 19:41 ` Junio C Hamano
2021-12-14 20:37 ` Josh Steadmon
2021-12-08 1:02 ` Glen Choo
2021-12-14 22:10 ` Josh Steadmon
2021-12-07 18:52 ` [PATCH v5 0/2] branch: inherit tracking configs Junio C Hamano
2021-12-08 17:06 ` Glen Choo
2021-12-10 22:48 ` Johannes Schindelin
2021-12-14 22:11 ` Josh Steadmon
2021-12-14 23:44 ` [PATCH v6 0/3] " Josh Steadmon
2021-12-14 23:44 ` [PATCH v6 1/3] branch: accept multiple upstream branches for tracking Josh Steadmon
2021-12-15 21:30 ` Junio C Hamano
2021-12-16 19:57 ` Glen Choo
2021-12-17 5:10 ` Josh Steadmon
2021-12-20 18:29 ` Glen Choo
2021-12-21 3:27 ` Josh Steadmon
2021-12-14 23:44 ` [PATCH v6 2/3] branch: add flags and config to inherit tracking Josh Steadmon
2021-12-16 21:27 ` Glen Choo
2021-12-17 5:11 ` Josh Steadmon
2021-12-14 23:44 ` [PATCH v6 3/3] config: require lowercase for branch.autosetupmerge Josh Steadmon
2021-12-15 0:43 ` [PATCH v6 0/3] branch: inherit tracking configs Josh Steadmon
2021-12-16 0:02 ` Junio C Hamano
2021-12-16 0:37 ` Glen Choo
2021-12-16 1:20 ` Junio C Hamano
2021-12-17 5:12 ` [PATCH v7 " Josh Steadmon
2021-12-17 5:12 ` [PATCH v7 1/3] branch: accept multiple upstream branches for tracking Josh Steadmon
2021-12-17 5:12 ` [PATCH v7 2/3] branch: add flags and config to inherit tracking Josh Steadmon
2021-12-17 5:12 ` [PATCH v7 3/3] config: require lowercase for branch.*.autosetupmerge Josh Steadmon
2021-12-20 21:05 ` [PATCH v7 0/3] branch: inherit tracking configs Glen Choo
2021-12-21 3:30 ` [PATCH v8 " Josh Steadmon
2021-12-21 3:30 ` [PATCH v8 1/3] branch: accept multiple upstream branches for tracking Josh Steadmon
2021-12-21 6:55 ` Junio C Hamano
2021-12-21 18:25 ` Glen Choo
2021-12-21 3:30 ` [PATCH v8 2/3] branch: add flags and config to inherit tracking Josh Steadmon
2021-12-21 18:17 ` Glen Choo
2022-01-11 1:57 ` incorrect 'git (checkout|branch) -h' output with new --track modes (was: [PATCH v8 2/3] branch: add flags and config to inherit tracking) Ævar Arnfjörð Bjarmason
2022-01-18 20:49 ` [PATCH] branch,checkout: fix --track usage strings Josh Steadmon
2022-01-18 22:26 ` Junio C Hamano
2022-01-19 10:56 ` [PATCH] parse-options: document automatic PARSE_OPT_LITERAL_ARGHELP René Scharfe
2022-01-19 14:41 ` Ævar Arnfjörð Bjarmason
[not found] ` <CA++g3E-azP3wFTtNkbFdmT7VW3hvULL0WkkAdwfrMb6HDtcXdg@mail.gmail.com>
2022-01-19 15:30 ` René Scharfe
2022-01-19 18:16 ` Junio C Hamano
2022-01-20 10:30 ` René Scharfe
2022-01-20 18:25 ` Junio C Hamano
2022-01-21 9:42 ` René Scharfe
2022-01-21 20:59 ` Junio C Hamano
2022-01-20 12:05 ` [PATCH] branch,checkout: fix --track usage strings Ævar Arnfjörð Bjarmason
2022-01-20 12:18 ` Andreas Schwab
2022-01-20 14:00 ` Ævar Arnfjörð Bjarmason
2022-01-20 18:38 ` Junio C Hamano
2022-01-21 11:27 ` Ævar Arnfjörð Bjarmason
2022-01-21 21:12 ` Junio C Hamano
2022-01-19 10:20 ` incorrect 'git (checkout|branch) -h' output with new --track modes (was: [PATCH v8 2/3] branch: add flags and config to inherit tracking) René Scharfe
2022-01-20 12:00 ` Ævar Arnfjörð Bjarmason
2022-01-20 12:35 ` [PATCH] branch,checkout: fix --track documentation René Scharfe
2022-01-20 13:57 ` Ævar Arnfjörð Bjarmason
2022-01-20 19:08 ` Junio C Hamano
2021-12-21 3:30 ` [PATCH v8 3/3] config: require lowercase for branch.*.autosetupmerge Josh Steadmon
2021-12-21 18:13 ` [PATCH v8 0/3] branch: inherit tracking configs Glen Choo
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=YbKLL2cQCxXQeQ5J@google.com \
--to=steadmon@google.com \
--cc=avarab@gmail.com \
--cc=chooglen@google.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).