revision: introduce setup_revision_opt

So far the last parameter to setup_revisions() was to specify the default
ref when the command line did not give any (typically "HEAD").  This changes
it to take a pointer to a structure so that we can add other information without
touching too many codepaths in later patches.

There is no functionality change.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-log.c b/builtin-log.c
index 8d16832f7e9483f7903009459a72efc39e267c98..dfbf6f22d0b8dec9416988dfc7be4a2d6e7b748a 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -32,7 +32,7 @@ static const char * const builtin_log_usage =
        "   or: git show [options] <object>...";
 
 static void cmd_log_init(int argc, const char **argv, const char *prefix,
        "   or: git show [options] <object>...";
 
 static void cmd_log_init(int argc, const char **argv, const char *prefix,

-                     struct rev_info *rev)
+                        struct rev_info *rev, struct setup_revision_opt *opt)

 {
        int i;
        int decoration_style = 0;
 {
        int i;
        int decoration_style = 0;


@@ -56,7 +56,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
         */
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage(builtin_log_usage);
         */
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage(builtin_log_usage);

-       argc = setup_revisions(argc, argv, rev, "HEAD");
+       argc = setup_revisions(argc, argv, rev, opt);

 
        if (!rev->show_notes_given && !rev->pretty_given)
                rev->show_notes = 1;
 
        if (!rev->show_notes_given && !rev->pretty_given)
                rev->show_notes = 1;


@@ -262,6 +262,7 @@ static int git_log_config(const char *var, const char *value, void *cb)
 int cmd_whatchanged(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
 int cmd_whatchanged(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;

+       struct setup_revision_opt opt;

 
        git_config(git_log_config, NULL);
 
 
        git_config(git_log_config, NULL);
 


@@ -271,7 +272,9 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
        init_revisions(&rev, prefix);
        rev.diff = 1;
        rev.simplify_history = 0;
        init_revisions(&rev, prefix);
        rev.diff = 1;
        rev.simplify_history = 0;

-       cmd_log_init(argc, argv, prefix, &rev);
+       memset(&opt, 0, sizeof(opt));
+       opt.def = "HEAD";
+       cmd_log_init(argc, argv, prefix, &rev, &opt);

        if (!rev.diffopt.output_format)
                rev.diffopt.output_format = DIFF_FORMAT_RAW;
        return cmd_log_walk(&rev);
        if (!rev.diffopt.output_format)
                rev.diffopt.output_format = DIFF_FORMAT_RAW;
        return cmd_log_walk(&rev);


@@ -328,6 +331,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
        struct object_array_entry *objects;
 {
        struct rev_info rev;
        struct object_array_entry *objects;

+       struct setup_revision_opt opt;

        int i, count, ret = 0;
 
        git_config(git_log_config, NULL);
        int i, count, ret = 0;
 
        git_config(git_log_config, NULL);


@@ -342,7 +346,9 @@ int cmd_show(int argc, const char **argv, const char *prefix)
        rev.always_show_header = 1;
        rev.ignore_merges = 0;
        rev.no_walk = 1;
        rev.always_show_header = 1;
        rev.ignore_merges = 0;
        rev.no_walk = 1;

-       cmd_log_init(argc, argv, prefix, &rev);
+       memset(&opt, 0, sizeof(opt));
+       opt.def = "HEAD";
+       cmd_log_init(argc, argv, prefix, &rev, &opt);

 
        count = rev.pending.nr;
        objects = rev.pending.objects;
 
        count = rev.pending.nr;
        objects = rev.pending.objects;


@@ -405,6 +411,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 int cmd_log_reflog(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
 int cmd_log_reflog(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;

+       struct setup_revision_opt opt;

 
        git_config(git_log_config, NULL);
 
 
        git_config(git_log_config, NULL);
 


@@ -415,7 +422,9 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
        init_reflog_walk(&rev.reflog_info);
        rev.abbrev_commit = 1;
        rev.verbose_header = 1;
        init_reflog_walk(&rev.reflog_info);
        rev.abbrev_commit = 1;
        rev.verbose_header = 1;

-       cmd_log_init(argc, argv, prefix, &rev);
+       memset(&opt, 0, sizeof(opt));
+       opt.def = "HEAD";
+       cmd_log_init(argc, argv, prefix, &rev, &opt);

 
        /*
         * This means that we override whatever commit format the user gave
 
        /*
         * This means that we override whatever commit format the user gave


@@ -438,6 +447,7 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)
 int cmd_log(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
 int cmd_log(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;

+       struct setup_revision_opt opt;

 
        git_config(git_log_config, NULL);
 
 
        git_config(git_log_config, NULL);
 


@@ -446,7 +456,9 @@ int cmd_log(int argc, const char **argv, const char *prefix)
 
        init_revisions(&rev, prefix);
        rev.always_show_header = 1;
 
        init_revisions(&rev, prefix);
        rev.always_show_header = 1;

-       cmd_log_init(argc, argv, prefix, &rev);
+       memset(&opt, 0, sizeof(opt));
+       opt.def = "HEAD";
+       cmd_log_init(argc, argv, prefix, &rev, &opt);

        return cmd_log_walk(&rev);
 }
 
        return cmd_log_walk(&rev);
 }
 


@@ -887,6 +899,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        struct commit *commit;
        struct commit **list = NULL;
        struct rev_info rev;
        struct commit *commit;
        struct commit **list = NULL;
        struct rev_info rev;

+       struct setup_revision_opt s_r_opt;

        int nr = 0, total, i;
        int use_stdout = 0;
        int start_number = -1;
        int nr = 0, total, i;
        int use_stdout = 0;
        int start_number = -1;


@@ -964,8 +977,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        rev.combine_merges = 0;
        rev.ignore_merges = 1;
        DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
        rev.combine_merges = 0;
        rev.ignore_merges = 1;
        DIFF_OPT_SET(&rev.diffopt, RECURSIVE);

-

        rev.subject_prefix = fmt_patch_subject_prefix;
        rev.subject_prefix = fmt_patch_subject_prefix;

+       memset(&s_r_opt, 0, sizeof(s_r_opt));
+       s_r_opt.def = "HEAD";

 
        if (default_attach) {
                rev.mime_boundary = default_attach;
 
        if (default_attach) {
                rev.mime_boundary = default_attach;


@@ -1037,7 +1051,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        if (keep_subject && subject_prefix)
                die ("--subject-prefix and -k are mutually exclusive.");
 
        if (keep_subject && subject_prefix)
                die ("--subject-prefix and -k are mutually exclusive.");
 

-       argc = setup_revisions(argc, argv, &rev, "HEAD");
+       argc = setup_revisions(argc, argv, &rev, &s_r_opt);

        if (argc > 1)
                die ("unrecognized argument: %s", argv[1]);
 
        if (argc > 1)
                die ("unrecognized argument: %s", argv[1]);
 

diff --git a/diff-lib.c b/diff-lib.c
index d7e13cb177a3c345eb076a9ffede87c6e6afa367..64976f921d58877d73e147b0abd74dafc878da9a 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -510,9 +510,12 @@ int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
 int index_differs_from(const char *def, int diff_flags)
 {
        struct rev_info rev;
 int index_differs_from(const char *def, int diff_flags)
 {
        struct rev_info rev;

+       struct setup_revision_opt opt;

 
        init_revisions(&rev, NULL);
 
        init_revisions(&rev, NULL);

-       setup_revisions(0, NULL, &rev, def);
+       memset(&opt, 0, sizeof(opt));
+       opt.def = def;
+       setup_revisions(0, NULL, &rev, &opt);

        DIFF_OPT_SET(&rev.diffopt, QUICK);
        DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
        rev.diffopt.flags |= diff_flags;
        DIFF_OPT_SET(&rev.diffopt, QUICK);
        DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
        rev.diffopt.flags |= diff_flags;

diff --git a/revision.c b/revision.c
index 3ba6d991f6e9789949c314c2981dfc6b208a6f66..25c1bbb9a6146accf30b555434a3eaefcef6f7be 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1328,7 +1328,7 @@ static void append_prune_data(const char ***prune_data, const char **av)
  * Returns the number of arguments left that weren't recognized
  * (which are also moved to the head of the argument list)
  */
  * Returns the number of arguments left that weren't recognized
  * (which are also moved to the head of the argument list)
  */

-int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
+int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)

 {
        int i, flags, left, seen_dashdash, read_from_stdin;
        const char **prune_data = NULL;
 {
        int i, flags, left, seen_dashdash, read_from_stdin;
        const char **prune_data = NULL;


@@ -1462,7 +1462,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                revs->prune_data = get_pathspec(revs->prefix, prune_data);
 
        if (revs->def == NULL)
                revs->prune_data = get_pathspec(revs->prefix, prune_data);
 
        if (revs->def == NULL)

-               revs->def = def;
+               revs->def = opt ? opt->def : NULL;

        if (revs->show_merge)
                prepare_show_merge(revs);
        if (revs->def && !revs->pending.nr) {
        if (revs->show_merge)
                prepare_show_merge(revs);
        if (revs->def && !revs->pending.nr) {

diff --git a/revision.h b/revision.h
index a14deefc252bd641fba5e16f7859b4a985a72578..fcc0de8eea9e0b6c14966b8a10f35e9c4be35de9 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -137,8 +137,12 @@ struct rev_info {
 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
 extern volatile show_early_output_fn_t show_early_output;
 
 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
 extern volatile show_early_output_fn_t show_early_output;
 

+struct setup_revision_opt {
+       const char *def;
+};
+

 extern void init_revisions(struct rev_info *revs, const char *prefix);
 extern void init_revisions(struct rev_info *revs, const char *prefix);

-extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
+extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);

 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
                                 const struct option *options,
                                 const char * const usagestr[]);
 extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
                                 const struct option *options,
                                 const char * const usagestr[]);

diff --git a/wt-status.c b/wt-status.c
index 5807fc3211a3aa8f886694776fe8c86b5bc5eb59..dcaec7f09e8801c0822a27ce2f9736eb05eaa105 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -290,10 +290,13 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
 static void wt_status_collect_changes_index(struct wt_status *s)
 {
        struct rev_info rev;
 static void wt_status_collect_changes_index(struct wt_status *s)
 {
        struct rev_info rev;

+       struct setup_revision_opt opt;

 
        init_revisions(&rev, NULL);
 
        init_revisions(&rev, NULL);

-       setup_revisions(0, NULL, &rev,
-               s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
+       memset(&opt, 0, sizeof(opt));
+       opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
+       setup_revisions(0, NULL, &rev, &opt);
+

        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
        rev.diffopt.format_callback = wt_status_collect_updated_cb;
        rev.diffopt.format_callback_data = s;
        rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
        rev.diffopt.format_callback = wt_status_collect_updated_cb;
        rev.diffopt.format_callback_data = s;


@@ -512,11 +515,15 @@ static void wt_status_print_untracked(struct wt_status *s)
 static void wt_status_print_verbose(struct wt_status *s)
 {
        struct rev_info rev;
 static void wt_status_print_verbose(struct wt_status *s)
 {
        struct rev_info rev;

+       struct setup_revision_opt opt;

 
        init_revisions(&rev, NULL);
        DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
 
        init_revisions(&rev, NULL);
        DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);

-       setup_revisions(0, NULL, &rev,
-               s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
+
+       memset(&opt, 0, sizeof(opt));
+       opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
+       setup_revisions(0, NULL, &rev, &opt);
+

        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
        rev.diffopt.detect_rename = 1;
        rev.diffopt.file = s->fp;
        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
        rev.diffopt.detect_rename = 1;
        rev.diffopt.file = s->fp;