From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Sebastian Schuberth <sschuberth@gmail.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCH v5 1/1] config: add conditional include
Date: Fri, 24 Feb 2017 16:37:48 +0700 [thread overview]
Message-ID: <CACsJy8CerU-=PF6wqzUAM02jkrVVGJ5MA0NgL6z9bHn5KM6jiw@mail.gmail.com> (raw)
In-Reply-To: <xmqqwpcg7k6r.fsf@gitster.mtv.corp.google.com>
On Fri, Feb 24, 2017 at 2:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
> The variable is obviously not treated the same way as include.path ;-)
>
> When includeIf.<condition>.path variable is set in a
> configuration file, the configuration file named by that
> variable is included (in a way similar to how include.path
> works) only if the <condition> holds true.
Yeah. I was thinking "value" and writing "variable" instead (or
perhaps I meant to write "variable value" and accidentally'd the last
word again).
>> + /* TODO: maybe support ~user/ too */
>> + if (pat->buf[0] == '~' && is_dir_sep(pat->buf[1])) {
>> + const char *home = getenv("HOME");
>> +
>> + if (!home)
>> + return error(_("$HOME is not defined"));
>
> Instead of half-duplicating it here yourself, can't we let
> expand_user_path() do its thing?
This comment came up in previous iterations. I perform explicit
expansion to make sure we don't apply wildcards on the expanded "~".
But I guess going with expand_user_path() is better (less confusion
for future readers). We can come back to it when that "don't apply
wildcards" concern becomes real.
>> +static int include_condition_is_true(const char *cond, size_t cond_len)
>> +{
>> + /* no condition (i.e., "include.path") is always true */
>> + if (!cond)
>> + return 1;
>> +
>> + if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len))
>> + return include_by_gitdir(cond, cond_len, 0);
>> + else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len))
>> + return include_by_gitdir(cond, cond_len, 1);
>
> This may be OK for now, but it should be trivial to start from a
> table with two entries, i.e.
>
> struct include_cond {
> const char *keyword;
> int (*fn)(const char *, size_t);
> };
>
> and will show a better way to do things to those who follow your
> footsteps.
Yeah I don't see a third include coming soon and did not go with that.
Let's way for it and refactor then.
--
Duy
next prev parent reply other threads:[~2017-02-24 9:46 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 12:23 [PATCH v5 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-23 12:23 ` [PATCH v5 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-23 19:59 ` Junio C Hamano
2017-02-24 9:37 ` Duy Nguyen [this message]
2017-02-24 17:46 ` Junio C Hamano
2017-02-26 6:07 ` Jeff King
2017-02-27 18:42 ` Junio C Hamano
2017-03-06 22:44 ` Stefan Beller
2017-03-07 8:47 ` Jeff King
2017-03-07 18:39 ` Stefan Beller
2017-02-24 13:14 ` [PATCH v6 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-24 13:14 ` [PATCH v6 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-24 18:35 ` Junio C Hamano
2017-02-24 19:48 ` Ramsay Jones
2017-02-24 22:08 ` Philip Oakley
2017-02-26 3:02 ` Duy Nguyen
2017-02-26 12:27 ` Philip Oakley
2017-02-24 13:14 ` [PATCH v6 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-24 13:18 ` Duy Nguyen
2017-02-24 13:14 ` [PATCH v6 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-26 6:12 ` Jeff King
2017-03-01 11:26 ` [PATCH v7 0/3] Conditional config include Nguyễn Thái Ngọc Duy
2017-03-01 11:26 ` [PATCH v7 1/3] config.txt: clarify multiple key values in include.path Nguyễn Thái Ngọc Duy
2017-03-01 17:40 ` Junio C Hamano
2017-03-01 11:26 ` [PATCH v7 2/3] config.txt: reflow the second include.path paragraph Nguyễn Thái Ngọc Duy
2017-03-01 11:26 ` [PATCH v7 3/3] config: add conditional include Nguyễn Thái Ngọc Duy
2017-03-01 17:16 ` Ramsay Jones
2017-03-01 17:47 ` Junio C Hamano
2017-03-03 6:30 ` Jeff King
2017-03-03 19:05 ` Junio C Hamano
2017-03-03 22:24 ` Jeff King
2017-03-01 17:52 ` [PATCH v7 0/3] Conditional config include Junio C Hamano
2017-03-03 6:33 ` Jeff King
2017-03-03 9:52 ` Duy Nguyen
2017-03-03 19:13 ` Junio C Hamano
2017-03-03 21:08 ` Junio C Hamano
2017-03-03 18:24 ` Junio C Hamano
2017-03-03 22:22 ` Jeff King
2017-03-03 23:22 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACsJy8CerU-=PF6wqzUAM02jkrVVGJ5MA0NgL6z9bHn5KM6jiw@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sschuberth@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).