From: Nickolai Belakovski <nbelakovski@gmail.com>
To: Jeff King <peff@peff.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Rafael Ascensão" <rafa.almas@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v6 1/3] ref-filter: add worktreepath atom
Date: Thu, 31 Jan 2019 12:53:24 -0800 [thread overview]
Message-ID: <CAC05385KQPXodr-LymXVK97fBAp5==M=OBr1mRYueGbG1qcepA@mail.gmail.com> (raw)
In-Reply-To: <20190124212608.GD16114@sigill.intra.peff.net>
So where does that leave us for this series? We could move hashmap
back into used_atom, but if a user entered
--format="%(worktreepath)%(worktreepath:)" we'd end up freeing
worktrees twice. Not that that should stop us - that scenario is one
where user input isn't sensible and personally I don't think it's
necessary to protect against such things (unless the user was
reasonably confused, but I don't see that as the case here).
I agree with Jeff that a ref-filter "context" would help. And in more
ways than one, it could help us decide ahead of time whether to check
if a ref is a branch or a tag before doing a hashmap lookup or just
skip the check (i.e. if there are no tags within the context, the
check would only add cost). But I do believe that that would be
outside the scope of this series.
I think leaving it as globals is a tiny bit safer and also makes it
easier to pack it into a context if/when we decide to do that work,
but as always I'm open to other interpretations.
On Thu, Jan 24, 2019 at 1:26 PM Jeff King <peff@peff.net> wrote:
>
> On Thu, Jan 24, 2019 at 11:30:20AM -0800, Junio C Hamano wrote:
>
> > Jeff King <peff@peff.net> writes:
> >
> > > What if you have other atoms that need worktrees? E.g., does
> > > %(worktreepath:foo) use the same used_atom slot? What if we have another
> > > worktree-related atom?
> > > ...
> > > And that one is a good example where we _do_ need the global, because we
> > > already have multiple atoms pulling from it.
> >
> > I guess that we broke the original atom design by mistake when we
> > added ":<modifiers>" support. There should have been one layer of
> > indirection that binds the instances of the same atom with different
> > modifiers together---I agree with you that we cannot avoid globals
> > without fixing that mistake first.
>
> Yes, that's one way to fix it.
>
> I actually think the biggest mistake is having that used_atoms list in
> the first place, as we iterate over it several times asking "can we fill
> this in yet?". The way pretty.c does it is just to incrementally parse
> the commit, saving intermediate results. And in cat-file.c, we figure
> out what we need ahead of time in a single pass, and then just fill it
> in for each object (which sort of works out the same, but doesn't
> require that the parsing needed for item X is a strict superset of item
> Y).
>
> So I'd much rather see us parse the format into a real tree of nodes,
> and figure out (once) which properties of each object are required to
> fulfill that. Then for each object, we grab those properties, and then
> walk the tree to generate the output string.
>
> -Peff
next prev parent reply other threads:[~2019-01-31 20:53 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <"<CAC05386q2iGoiJ_fRgwoOTF23exEN2D1+oh4VjajEvYQ58O1TQ@mail.gmail.com>
2018-09-27 15:13 ` [PATCH] branch: colorize branches checked out in a linked working tree the same way as the current branch is colorized Nickolai Belakovski
2018-09-27 15:33 ` Ævar Arnfjörð Bjarmason
2018-09-27 17:46 ` Nickolai Belakovski
[not found] ` <CAC05387S9P+w8yqqcjkQDnURYSgQmqtukxS4KvqJu-kDA+_o0g@mail.gmail.com>
2018-09-27 17:59 ` Ævar Arnfjörð Bjarmason
2018-10-02 20:41 ` Johannes Schindelin
2018-09-27 17:58 ` Duy Nguyen
2018-09-27 18:17 ` Jeff King
2018-09-27 18:39 ` Nickolai Belakovski
2018-09-27 18:51 ` Jeff King
2018-09-27 19:28 ` Rafael Ascensão
2018-09-27 19:35 ` Jeff King
2018-09-27 19:41 ` Jeff King
2018-09-27 21:22 ` Junio C Hamano
2018-09-28 1:05 ` Jeff King
2018-09-28 1:28 ` Junio C Hamano
2018-09-27 21:35 ` Rafael Ascensão
2018-09-28 1:07 ` Jeff King
2018-09-27 20:02 ` Ævar Arnfjörð Bjarmason
2018-09-27 20:16 ` Nickolai Belakovski
2018-09-27 20:40 ` Rafael Ascensão
2018-11-11 23:58 ` [PATCH v2 0/2] refactoring branch colorization to ref-filter nbelakovski
2018-11-11 23:58 ` [PATCH v2 1/2] ref-filter: add worktree atom nbelakovski
2018-11-12 10:11 ` Junio C Hamano
2018-11-12 12:22 ` Jeff King
2018-11-13 1:38 ` Junio C Hamano
2018-11-21 14:05 ` Nickolai Belakovski
2018-11-21 14:08 ` Jeff King
2018-11-12 12:23 ` Jeff King
2018-11-11 23:58 ` [PATCH v2 2/2] branch: Mark and colorize a branch differently if it is checked out in a linked worktree nbelakovski
2018-11-12 10:20 ` Junio C Hamano
2018-11-12 12:14 ` Jeff King
2018-11-12 18:07 ` Rafael Ascensão
2018-11-13 1:45 ` Junio C Hamano
2018-11-13 14:49 ` Jeff King
2018-11-21 14:07 ` Nickolai Belakovski
2018-12-16 21:57 ` [PATCH v3 0/3] nbelakovski
2018-12-16 21:57 ` [PATCH v3 1/3] ref-filter: add worktreepath atom nbelakovski
2018-12-18 17:22 ` Jeff King
2018-12-20 7:09 ` Nickolai Belakovski
2018-12-20 14:59 ` Jeff King
2018-12-24 8:47 ` [PATCH v4 0/3] nbelakovski
2018-12-24 8:47 ` [PATCH v4 1/3] ref-filter: add worktreepath atom nbelakovski
2019-01-03 5:40 ` Jeff King
2019-01-03 9:31 ` Eric Sunshine
2018-12-24 8:47 ` [PATCH v4 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2018-12-24 8:47 ` [PATCH v4 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2019-01-03 5:42 ` Jeff King
2019-01-03 5:22 ` [PATCH v4 0/3] Jeff King
2018-12-16 21:57 ` [PATCH v3 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2018-12-16 21:57 ` [PATCH v3 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2018-12-18 17:25 ` [PATCH v3 0/3] Jeff King
2019-01-06 0:26 ` [PATCH v5 0/3] nbelakovski
2019-01-06 0:26 ` [PATCH v5 1/3] ref-filter: add worktreepath atom nbelakovski
2019-01-07 18:20 ` Junio C Hamano
2019-01-18 22:17 ` Nickolai Belakovski
2019-01-18 22:20 ` Nickolai Belakovski
2019-01-06 0:26 ` [PATCH v5 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2019-01-07 19:04 ` Junio C Hamano
2019-01-10 21:42 ` Philip Oakley
2019-01-13 1:41 ` Nickolai Belakovski
2019-01-14 18:18 ` Junio C Hamano
2019-01-18 22:18 ` Nickolai Belakovski
2019-01-06 0:26 ` [PATCH v5 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2019-01-07 19:09 ` Junio C Hamano
2019-01-22 23:22 ` [PATCH v6 0/3] nbelakovski
2019-01-22 23:22 ` [PATCH v6 1/3] ref-filter: add worktreepath atom nbelakovski
2019-01-23 18:57 ` Junio C Hamano
2019-01-23 23:34 ` Nickolai Belakovski
2019-01-24 18:26 ` Junio C Hamano
2019-01-24 18:32 ` Jeff King
2019-01-24 19:27 ` Junio C Hamano
2019-01-24 19:34 ` Jeff King
2019-01-24 19:30 ` Junio C Hamano
2019-01-24 21:26 ` Jeff King
2019-01-31 20:53 ` Nickolai Belakovski [this message]
2019-01-31 23:21 ` Jeff King
2019-01-31 21:42 ` Junio C Hamano
2019-01-31 23:20 ` Jeff King
2019-01-22 23:23 ` [PATCH v6 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2019-01-22 23:23 ` [PATCH v6 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2019-02-01 22:04 ` [PATCH v7 0/3] nbelakovski
2019-02-01 22:28 ` Junio C Hamano
2019-02-01 23:31 ` Nickolai Belakovski
2019-02-01 22:04 ` [PATCH v7 1/3] ref-filter: add worktreepath atom nbelakovski
2019-02-01 22:20 ` Eric Sunshine
2019-02-01 22:41 ` Nickolai Belakovski
2019-02-04 18:14 ` Junio C Hamano
2019-02-18 10:09 ` Nickolai Belakovski
2019-02-01 22:31 ` Junio C Hamano
2019-02-01 22:04 ` [PATCH v7 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree nbelakovski
2019-02-01 22:34 ` Junio C Hamano
2019-02-01 23:12 ` Nickolai Belakovski
2019-02-04 18:18 ` Junio C Hamano
2019-02-01 22:04 ` [PATCH v7 3/3] branch: Add an extra verbose output displaying worktree path for refs " nbelakovski
2019-02-01 22:27 ` Eric Sunshine
2019-02-01 22:45 ` Nickolai Belakovski
2019-02-01 22:53 ` Junio C Hamano
2019-02-01 23:06 ` Nickolai Belakovski
2019-02-02 1:22 ` [RFC] Sample of test for git branch -vv nbelakovski
2019-02-19 8:31 ` [PATCH v8 0/3] nbelakovski
2019-02-19 8:31 ` [PATCH v8 1/3] ref-filter: add worktreepath atom nbelakovski
2019-02-19 8:31 ` [PATCH v8 2/3] branch: update output to include worktree info nbelakovski
2019-02-21 12:44 ` Jeff King
2019-03-14 5:45 ` Nickolai Belakovski
2019-02-19 8:31 ` [PATCH v8 3/3] branch: add worktree info on verbose output nbelakovski
2019-02-21 12:59 ` Jeff King
2019-03-14 5:58 ` Nickolai Belakovski
2019-03-18 2:12 ` Junio C Hamano
2019-02-21 12:36 ` [PATCH v8 0/3] Jeff King
2019-03-14 6:10 ` Nickolai Belakovski
2019-03-16 1:38 ` [PATCH v9 0/3] nbelakovski
2019-03-16 1:38 ` [PATCH v9 1/3] ref-filter: add worktreepath atom nbelakovski
2019-03-16 1:38 ` [PATCH v9 2/3] branch: update output to include worktree info nbelakovski
2019-03-16 1:38 ` [PATCH v9 3/3] branch: add worktree info on verbose output nbelakovski
2019-03-18 12:10 ` SZEDER Gábor
2019-03-18 5:30 ` [PATCH v9 0/3] Junio C Hamano
2019-04-29 5:19 ` [PATCH v10 0/3] nbelakovski
2019-04-29 5:19 ` [PATCH v10 1/3] ref-filter: add worktreepath atom nbelakovski
2019-04-29 5:19 ` [PATCH v10 2/3] branch: update output to include worktree info nbelakovski
2019-04-29 5:19 ` [PATCH v10 3/3] branch: add worktree info on verbose output nbelakovski
2019-04-29 14:12 ` [PATCH v10 0/3] SZEDER Gábor
2019-04-29 19:27 ` Nickolai Belakovski
2019-04-29 20:57 ` Johannes Schindelin
2019-04-29 21:33 ` Nickolai Belakovski
[not found] ` <CAC05385Mc7pqiCd5mb+1c4WM+v7K=h=GMHuvkw9xizhRFJXXBA@mail.gmail.com>
2019-04-30 21:46 ` Johannes Schindelin
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='CAC05385KQPXodr-LymXVK97fBAp5==M=OBr1mRYueGbG1qcepA@mail.gmail.com' \
--to=nbelakovski@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=rafa.almas@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).