From: "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
To: Elijah Newren via GitGitGadget <gitgitgadget@gmail•com>
Cc: git@vger•kernel.org, Jeff King <peff@peff•net>,
Jonathan Nieder <jrnieder@gmail•com>,
Sergey Organov <sorganov@gmail•com>,
Elijah Newren <newren@gmail•com>,
"Neeraj K. Singh" <neerajsi@microsoft•com>
Subject: Re: [PATCH 6/7] show, log: provide a --remerge-diff capability
Date: Tue, 28 Sep 2021 10:01:03 +0200 [thread overview]
Message-ID: <87mtnxxgz3.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <b75e73384fde4f23296bd02eb40455263f805706.1630376800.git.gitgitgadget@gmail.com>
On Tue, Aug 31 2021, Elijah Newren via GitGitGadget wrote:
> static int decoration_given;
> static int use_mailmap_config = 1;
> +static struct tmp_objdir *tmp_objdir;
> static const char *fmt_patch_subject_prefix = "PATCH";
> static int fmt_patch_name_max = FORMAT_PATCH_NAME_MAX_DEFAULT;
> static const char *fmt_pretty;
So here we make this static file-level etc...
> @@ -407,6 +410,17 @@ static int cmd_log_walk(struct rev_info *rev)
> int saved_nrl = 0;
> int saved_dcctc = 0;
>
> + if (rev->remerge_diff) {
> + tmp_objdir = tmp_objdir_create();
> + if (!tmp_objdir)
> + die(_("unable to create temporary object directory"));
> + tmp_objdir_make_primary(the_repository, tmp_objdir);
> +
> + strbuf_init(&rev->remerge_objdir_location, 0);
> + strbuf_addstr(&rev->remerge_objdir_location,
> + tmp_objdir_path(tmp_objdir));
> + }
> +
> if (rev->early_output)
> setup_early_output();
>
> @@ -449,6 +463,13 @@ static int cmd_log_walk(struct rev_info *rev)
> rev->diffopt.no_free = 0;
> diff_free(&rev->diffopt);
>
> + if (rev->remerge_diff) {
> + strbuf_release(&rev->remerge_objdir_location);
> + tmp_objdir_remove_as_primary(the_repository, tmp_objdir);
> + tmp_objdir_destroy(tmp_objdir);
> + tmp_objdir = NULL;
...but all of the "tmp_objdir" usage is in one function, can't the
variable be declared here instead?
We need to hand the "remerge_objdir_location" off to the "rev_info"
struct, but that seems separate from its lifetime.
Re my [1] & [2] I like Neeraj's "atexit cleanup" approach better,
perhaps that makes your cleanup in log-tree.c redundant or easier?
Per [2] it looks like you need to "hand off" the
"remerge_objdir_location", so having the struct live in tmp-objdir.h as
I suggested in [2] might make that work...
1. https://lore.kernel.org/git/87v92lxhh4.fsf@evledraar.gmail.com/
2. https://lore.kernel.org/git/87r1d9xh71.fsf@evledraar.gmail.com/
next prev parent reply other threads:[~2021-09-28 8:05 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 2:26 [PATCH 0/7] Add a new --remerge-diff capability to show & log Elijah Newren via GitGitGadget
2021-08-31 2:26 ` [PATCH 1/7] merge-ort: mark a few more conflict messages as omittable Elijah Newren via GitGitGadget
2021-08-31 21:06 ` Junio C Hamano
2021-09-01 0:03 ` Elijah Newren
2021-09-01 17:19 ` Junio C Hamano
2021-08-31 2:26 ` [PATCH 2/7] merge-ort: add ability to record conflict messages in a file Elijah Newren via GitGitGadget
2021-09-28 22:29 ` Jeff King
2021-09-29 6:25 ` Elijah Newren
2021-09-29 16:14 ` Junio C Hamano
2021-09-29 16:31 ` Elijah Newren
2021-09-30 7:58 ` Jeff King
2021-09-30 8:09 ` Ævar Arnfjörð Bjarmason
2021-10-01 2:07 ` Elijah Newren
2021-10-01 5:28 ` Jeff King
2021-08-31 2:26 ` [PATCH 3/7] ll-merge: add API for capturing warnings in a strbuf instead of stderr Elijah Newren via GitGitGadget
2021-09-28 22:37 ` Jeff King
2021-09-28 23:49 ` Junio C Hamano
2021-09-29 4:03 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 4/7] merge-ort: capture and print ll-merge warnings in our preferred fashion Elijah Newren via GitGitGadget
2021-09-28 22:39 ` Jeff King
2021-09-30 16:53 ` Ævar Arnfjörð Bjarmason
2021-10-01 1:54 ` Elijah Newren
2021-10-01 7:23 ` Ævar Arnfjörð Bjarmason
2021-08-31 2:26 ` [PATCH 5/7] tmp-objdir: new API for creating and removing primary object dirs Elijah Newren via GitGitGadget
2021-09-28 7:55 ` Ævar Arnfjörð Bjarmason
2021-09-29 4:22 ` Elijah Newren
2021-09-30 7:41 ` Jeff King
2021-09-30 14:17 ` Ævar Arnfjörð Bjarmason
2021-10-01 3:55 ` Elijah Newren
2021-09-28 23:17 ` Jeff King
2021-09-29 4:08 ` Junio C Hamano
2021-09-30 7:33 ` Jeff King
2021-09-30 13:16 ` Ævar Arnfjörð Bjarmason
2021-09-30 21:00 ` Jeff King
2021-10-01 3:11 ` Elijah Newren
2021-10-01 7:30 ` Ævar Arnfjörð Bjarmason
2021-10-01 8:03 ` Elijah Newren
2021-10-01 4:26 ` Elijah Newren
2021-10-01 5:27 ` Jeff King
2021-10-01 7:43 ` Ævar Arnfjörð Bjarmason
2021-09-29 5:05 ` Elijah Newren
2021-09-30 7:26 ` Jeff King
2021-09-30 7:46 ` Jeff King
2021-09-30 20:06 ` Junio C Hamano
2021-10-01 3:59 ` Elijah Newren
2021-10-01 16:36 ` Junio C Hamano
2021-10-01 2:31 ` Elijah Newren
2021-10-01 5:21 ` Jeff King
2021-09-30 19:25 ` Neeraj Singh
2021-09-30 20:19 ` Junio C Hamano
2021-09-30 20:00 ` Junio C Hamano
2021-10-01 2:23 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 6/7] show, log: provide a --remerge-diff capability Elijah Newren via GitGitGadget
2021-08-31 9:19 ` Sergey Organov
2021-09-28 8:01 ` Ævar Arnfjörð Bjarmason [this message]
2021-09-29 4:00 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 7/7] doc/diff-options: explain the new --remerge-diff option Elijah Newren via GitGitGadget
2021-08-31 11:05 ` [PATCH 0/7] Add a new --remerge-diff capability to show & log Bagas Sanjaya
2021-08-31 16:16 ` Elijah Newren
2021-08-31 20:03 ` Junio C Hamano
2021-08-31 20:23 ` Elijah Newren
2021-09-01 21:07 ` Junio C Hamano
2021-09-01 21:42 ` Elijah Newren
2021-09-01 21:55 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mtnxxgz3.fsf@evledraar.gmail.com \
--to=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
--cc=neerajsi@microsoft$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sorganov@gmail$(echo .)com \
/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