I wrote this patch series about a year and a half ago, but never submitted
it. I rebased and updated it due to [0].
Some time ago, I noticed that struct dir_struct and struct
unpack_trees_options both have numerous fields meant for internal use only,
most of which are not marked as such. This has resulted in callers
accidentally trying to initialize some of these fields, and in at least one
case required a fair amount of review to verify other changes were okay --
review that would have been simplified with the apriori knowledge that a
combination of multiple fields were internal-only[1]. Looking closer, I
found that only 6 out of 18 fields in dir_struct were actually meant to be
public[2], and noted that unpack_trees_options also had 11 internal-only
fields (out of 36).
This patch is primarily about moving internal-only fields within these two
structs into an embedded internal struct. Patch breakdown:
* Patches 1-3: Restructuring dir_struct
* Patch 1: Splitting off internal-use-only fields
* Patch 2: Add important usage note to avoid accidentally using
deprecated API
* Patch 3: Mark output-only fields as such
* Patches 4-11: Restructuring unpack_trees_options
* Patches 4-6: Preparatory cleanup
* Patches 7-10: Splitting off internal-use-only fields
* Patch 11: Mark output-only field as such
To make the benefit more clear, here are compressed versions of dir_struct
both before and after the changes. First, before:
struct dir_struct {
int nr;
int alloc;
int ignored_nr;
int ignored_alloc;
enum [...] flags;
struct dir_entry **entries;
struct dir_entry **ignored;
const char *exclude_per_dir;
#define EXC_CMDL 0
#define EXC_DIRS 1
#define EXC_FILE 2
struct exclude_list_group exclude_list_group[3];
struct exclude_stack *exclude_stack;
struct path_pattern *pattern;
struct strbuf basebuf;
struct untracked_cache *untracked;
struct oid_stat ss_info_exclude;
struct oid_stat ss_excludes_file;
unsigned unmanaged_exclude_files;
unsigned visited_paths;
unsigned visited_directories;
};
And after the changes:
struct dir_struct {
enum [...] flags;
int nr; /* output only */
int ignored_nr; /* output only */
struct dir_entry **entries; /* output only */
struct dir_entry **ignored; /* output only */
struct untracked_cache *untracked;
const char *exclude_per_dir; /* deprecated */
struct dir_struct_internal {
int alloc;
int ignored_alloc;
#define EXC_CMDL 0
#define EXC_DIRS 1
#define EXC_FILE 2
struct exclude_list_group exclude_list_group[3];
struct exclude_stack *exclude_stack;
struct path_pattern *pattern;
struct strbuf basebuf;
struct oid_stat ss_info_exclude;
struct oid_stat ss_excludes_file;
unsigned unmanaged_exclude_files;
unsigned visited_paths;
unsigned visited_directories;
} internal;
};
The former version has 18 fields (and 3 magic constants) which API users
will have to figure out. The latter makes it clear there are only at most 2
fields you should be setting upon input, and at most 4 which you read at
output, and the rest (including all the magic constants) you can ignore.
[0] Search for "Extremely yes" in
https://lore.kernel.org/git/CAJoAoZm+TkCL0Jpg_qFgKottxbtiG2QOiY0qGrz3-uQy+=waPg@xxxxxxxxxxxxxx/
[1]
https://lore.kernel.org/git/CABPp-BFSFN3WM6q7KzkD5mhrwsz--St_-ej5LbaY8Yr2sZzj=w@xxxxxxxxxxxxxx/
[2]
https://lore.kernel.org/git/CABPp-BHgot=CPNyK_xNfog_SqsNPNoCGfiSb-gZoS2sn_741dQ@xxxxxxxxxxxxxx/
Elijah Newren (11):
dir: separate public from internal portion of dir_struct
dir: add a usage note to exclude_per_dir
dir: mark output only fields of dir_struct as such
unpack-trees: clean up some flow control
sparse-checkout: avoid using internal API of unpack-trees
sparse-checkout: avoid using internal API of unpack-trees, take 2
unpack_trees: start splitting internal fields from public API
unpack-trees: mark fields only used internally as internal
unpack-trees: rewrap a few overlong lines from previous patch
unpack-trees: special case read-tree debugging as internal usage
unpack-trees: add usage notices around df_conflict_entry
builtin/read-tree.c | 10 +-
builtin/sparse-checkout.c | 4 +-
dir.c | 114 +++++++++---------
dir.h | 110 +++++++++--------
unpack-trees.c | 245 ++++++++++++++++++++------------------
unpack-trees.h | 42 ++++---
6 files changed, 275 insertions(+), 250 deletions(-)
base-commit: 06dd2baa8da4a73421b959ec026a43711b9d77f9
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1149%2Fnewren%2Fclarify-api-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1149/newren/clarify-api-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1149
--
gitgitgadget
