revisions API: extend the nascent REV_INFO_INIT macro

Have the REV_INFO_INIT macro added in [1] declare more members of "struct rev_info" that we can initialize statically, and have repo_init_revisions() do so with the memcpy(..., &blank) idiom introduced in [2]. As the comment for the "REV_INFO_INIT" macro notes this still isn't sufficient to initialize a "struct rev_info" for use yet. But we are getting closer to that eventual goal. Even though we can't fully initialize a "struct rev_info" with REV_INFO_INIT it's useful for readability to clearly separate those things that we can statically initialize, and those that we can't. This change could replace the: list_objects_filter_init(&revs->filter); In the repo_init_revisions() with this line, at the end of the REV_INFO_INIT deceleration in revisions.h: .filter = LIST_OBJECTS_FILTER_INIT, \ But doing so would produce a minor conflict with an outstanding topic[3]. Let's skip that for now. I have follow-ups to initialize more of this statically, e.g. changes to get rid of grep_init(). We can initialize more members with the macro in a future series. 1. f196c1e908d (revisions API users: use release_revisions() needing REV_INFO_INIT, 2022-04-13) 2. 5726a6b4012 (*.c *_init(): define in terms of corresponding *_INIT macro, 2021-07-01) 3. https://lore.kernel.org/git/265b292ed5c2de19b7118dfe046d3d9d932e2e89.1667901510.git.ps@pks.im/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>

Ævar Arnfjörð Bjarmason committed Nov 8, 2022 at 15:02 UTC 916ebb327c813b44a054b6487cc5e5e224723f05
2 files changed +19 -18
revision.c
+2 -17
@@ -1865,30 +1865,15 @@ void repo_init_revisions(struct repository *r,
1865 struct rev_info *revs,
1866 const char *prefix)
1867 {
1868 - memset(revs, 0, sizeof(*revs));
1868 + struct rev_info blank = REV_INFO_INIT;
1869 + memcpy(revs, &blank, sizeof(*revs));
1870
1871 revs->repo = r;
1871 - revs->abbrev = DEFAULT_ABBREV;
1872 - revs->simplify_history = 1;
1872 revs->pruning.repo = r;
1874 - revs->pruning.flags.recursive = 1;
1875 - revs->pruning.flags.quick = 1;
1873 revs->pruning.add_remove = file_add_remove;
1874 revs->pruning.change = file_change;
1875 revs->pruning.change_fn_data = revs;
1879 - revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1880 - revs->dense = 1;
1876 revs->prefix = prefix;
1882 - revs->max_age = -1;
1883 - revs->max_age_as_filter = -1;
1884 - revs->min_age = -1;
1885 - revs->skip_count = -1;
1886 - revs->max_count = -1;
1887 - revs->max_parents = -1;
1888 - revs->expand_tabs_in_log = -1;
1889 -
1890 - revs->commit_format = CMIT_FMT_DEFAULT;
1891 - revs->expand_tabs_in_log_default = 8;
1877
1878 grep_init(&revs->grep_filter, revs->repo);
1879 revs->grep_filter.status_only = 1;
revision.h
+17 -1
@@ -357,7 +357,23 @@ struct rev_info {
357 * called before release_revisions() the "struct rev_info" can be left
358 * uninitialized.
359 */
360 -#define REV_INFO_INIT { 0 }
360 +#define REV_INFO_INIT { \
361 + .abbrev = DEFAULT_ABBREV, \
362 + .simplify_history = 1, \
363 + .pruning.flags.recursive = 1, \
364 + .pruning.flags.quick = 1, \
365 + .sort_order = REV_SORT_IN_GRAPH_ORDER, \
366 + .dense = 1, \
367 + .max_age = -1, \
368 + .max_age_as_filter = -1, \
369 + .min_age = -1, \
370 + .skip_count = -1, \
371 + .max_count = -1, \
372 + .max_parents = -1, \
373 + .expand_tabs_in_log = -1, \
374 + .commit_format = CMIT_FMT_DEFAULT, \
375 + .expand_tabs_in_log_default = 8, \
376 +}
377
378 /**
379 * Initialize a rev_info structure with default values. The third parameter may