Re: [PATCH v4 03/13] commit-graph: create git-commit-graph builtin
On 2/26/2018 11:25 AM, SZEDER Gábor wrote: Teach git the 'commit-graph' builtin that will be used for writing and reading packed graph files. The current implementation is mostly empty, except for an '--object-dir' option. Since 'git commit-graph' is a builtin command, it shouldn't show up in completion when doing 'git co'. Please squash in the patch below to make it so. Furthermore, please have a look at https://public-inbox.org/git/20180202160132.31550-1-szeder@gmail.com/ for an other oneliner change. diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 17929b0809..fafed13c06 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -841,6 +841,7 @@ __git_list_porcelain_commands () check-ref-format) : plumbing;; checkout-index) : plumbing;; column) : internal helper;; + commit-graph) : plumbing;; commit-tree) : plumbing;; count-objects): infrequent;; credential) : credentials;; Thanks for this, and the reminder. I made these changes locally, so they will be in v5. -Stolee
Re: [PATCH v4 03/13] commit-graph: create git-commit-graph builtin
> Teach git the 'commit-graph' builtin that will be used for writing and > reading packed graph files. The current implementation is mostly > empty, except for an '--object-dir' option. Since 'git commit-graph' is a builtin command, it shouldn't show up in completion when doing 'git co'. Please squash in the patch below to make it so. Furthermore, please have a look at https://public-inbox.org/git/20180202160132.31550-1-szeder@gmail.com/ for an other oneliner change. diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 17929b0809..fafed13c06 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -841,6 +841,7 @@ __git_list_porcelain_commands () check-ref-format) : plumbing;; checkout-index) : plumbing;; column) : internal helper;; + commit-graph) : plumbing;; commit-tree) : plumbing;; count-objects): infrequent;; credential) : credentials;;
Re: [PATCH v4 03/13] commit-graph: create git-commit-graph builtin
On 2/21/2018 1:58 PM, Junio C Hamano wrote: Junio C Hamanowrites: Derrick Stolee writes: +int cmd_commit_graph(int argc, const char **argv, const char *prefix) +{ + static struct option builtin_commit_graph_options[] = { + { OPTION_STRING, 'p', "object-dir", _dir, + N_("dir"), + N_("The object directory to store the graph") }, I have a suspicion that this was modeled after some other built-in that has a similar issue (perhaps written long time ago), but isn't OPT_STRING() sufficient to define this element these days? Or am I missing something? You are not. There are several places in this history of this patch where I was using old patterns because I was using old code as my model (places like 'index-pack'). Why squat on short-and-sweet "-p"? For that matter, since this is not expected to be end-user facing command anyway, I suspect that we do not want to allocate a single letter option from day one, which paints ourselves into a corner from where we cannot escape. I'll drop all single-letter shortcuts. I suspect that exactly the same comment applies to patches in this series that add other subcommands (I just saw one in the patch for adding 'write'). Thanks, -Stolee
Re: [PATCH v4 03/13] commit-graph: create git-commit-graph builtin
Junio C Hamanowrites: > Derrick Stolee writes: > >> +int cmd_commit_graph(int argc, const char **argv, const char *prefix) >> +{ >> +static struct option builtin_commit_graph_options[] = { >> +{ OPTION_STRING, 'p', "object-dir", _dir, >> +N_("dir"), >> +N_("The object directory to store the graph") }, > > I have a suspicion that this was modeled after some other built-in > that has a similar issue (perhaps written long time ago), but isn't > OPT_STRING() sufficient to define this element these days? > > Or am I missing something? > > Why squat on short-and-sweet "-p"? For that matter, since this is > not expected to be end-user facing command anyway, I suspect that we > do not want to allocate a single letter option from day one, which > paints ourselves into a corner from where we cannot escape. I suspect that exactly the same comment applies to patches in this series that add other subcommands (I just saw one in the patch for adding 'write').
Re: [PATCH v4 03/13] commit-graph: create git-commit-graph builtin
Derrick Stoleewrites: > +int cmd_commit_graph(int argc, const char **argv, const char *prefix) > +{ > + static struct option builtin_commit_graph_options[] = { > + { OPTION_STRING, 'p', "object-dir", _dir, > + N_("dir"), > + N_("The object directory to store the graph") }, I have a suspicion that this was modeled after some other built-in that has a similar issue (perhaps written long time ago), but isn't OPT_STRING() sufficient to define this element these days? Or am I missing something? Why squat on short-and-sweet "-p"? For that matter, since this is not expected to be end-user facing command anyway, I suspect that we do not want to allocate a single letter option from day one, which paints ourselves into a corner from where we cannot escape.
[PATCH v4 03/13] commit-graph: create git-commit-graph builtin
Teach git the 'commit-graph' builtin that will be used for writing and reading packed graph files. The current implementation is mostly empty, except for an '--object-dir' option. Signed-off-by: Derrick Stolee--- .gitignore | 1 + Documentation/git-commit-graph.txt | 11 +++ Makefile | 1 + builtin.h | 1 + builtin/commit-graph.c | 37 + command-list.txt | 1 + git.c | 1 + 7 files changed, 53 insertions(+) create mode 100644 Documentation/git-commit-graph.txt create mode 100644 builtin/commit-graph.c diff --git a/.gitignore b/.gitignore index 833ef3b..e82f901 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ /git-clone /git-column /git-commit +/git-commit-graph /git-commit-tree /git-config /git-count-objects diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt new file mode 100644 index 000..e1c3078 --- /dev/null +++ b/Documentation/git-commit-graph.txt @@ -0,0 +1,11 @@ +git-commit-graph(1) +=== + +NAME + +git-commit-graph - Write and verify Git commit graphs (.graph files) + +GIT +--- +Part of the linkgit:git[1] suite + diff --git a/Makefile b/Makefile index ee9d5eb..fc40b81 100644 --- a/Makefile +++ b/Makefile @@ -932,6 +932,7 @@ BUILTIN_OBJS += builtin/clone.o BUILTIN_OBJS += builtin/column.o BUILTIN_OBJS += builtin/commit-tree.o BUILTIN_OBJS += builtin/commit.o +BUILTIN_OBJS += builtin/commit-graph.o BUILTIN_OBJS += builtin/config.o BUILTIN_OBJS += builtin/count-objects.o BUILTIN_OBJS += builtin/credential.o diff --git a/builtin.h b/builtin.h index 42378f3..079855b 100644 --- a/builtin.h +++ b/builtin.h @@ -149,6 +149,7 @@ extern int cmd_clone(int argc, const char **argv, const char *prefix); extern int cmd_clean(int argc, const char **argv, const char *prefix); extern int cmd_column(int argc, const char **argv, const char *prefix); extern int cmd_commit(int argc, const char **argv, const char *prefix); +extern int cmd_commit_graph(int argc, const char **argv, const char *prefix); extern int cmd_commit_tree(int argc, const char **argv, const char *prefix); extern int cmd_config(int argc, const char **argv, const char *prefix); extern int cmd_count_objects(int argc, const char **argv, const char *prefix); diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c new file mode 100644 index 000..98110bb --- /dev/null +++ b/builtin/commit-graph.c @@ -0,0 +1,37 @@ +#include "builtin.h" +#include "config.h" +#include "parse-options.h" + +static char const * const builtin_commit_graph_usage[] = { + N_("git commit-graph [--object-dir ]"), + NULL +}; + +static struct opts_commit_graph { + const char *obj_dir; +} opts; + + +int cmd_commit_graph(int argc, const char **argv, const char *prefix) +{ + static struct option builtin_commit_graph_options[] = { + { OPTION_STRING, 'p', "object-dir", _dir, + N_("dir"), + N_("The object directory to store the graph") }, + OPT_END(), + }; + + if (argc == 2 && !strcmp(argv[1], "-h")) + usage_with_options(builtin_commit_graph_usage, + builtin_commit_graph_options); + + git_config(git_default_config, NULL); + argc = parse_options(argc, argv, prefix, +builtin_commit_graph_options, +builtin_commit_graph_usage, +PARSE_OPT_STOP_AT_NON_OPTION); + + usage_with_options(builtin_commit_graph_usage, + builtin_commit_graph_options); +} + diff --git a/command-list.txt b/command-list.txt index a1fad28..835c589 100644 --- a/command-list.txt +++ b/command-list.txt @@ -34,6 +34,7 @@ git-clean mainporcelain git-clone mainporcelain init git-column purehelpers git-commit mainporcelain history +git-commit-graphplumbingmanipulators git-commit-tree plumbingmanipulators git-config ancillarymanipulators git-count-objects ancillaryinterrogators diff --git a/git.c b/git.c index 9e96dd4..d4832c1 100644 --- a/git.c +++ b/git.c @@ -388,6 +388,7 @@ static struct cmd_struct commands[] = { { "clone", cmd_clone }, { "column", cmd_column, RUN_SETUP_GENTLY }, { "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE }, + { "commit-graph", cmd_commit_graph, RUN_SETUP }, { "commit-tree", cmd_commit_tree, RUN_SETUP }, { "config", cmd_config, RUN_SETUP_GENTLY }, { "count-objects", cmd_count_objects, RUN_SETUP }, -- 2.7.4