undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revision.c: use skip_prefix() in handle_revision_opt()

Browse Source 
Instead of starts_with() and a bunch of magic numbers.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor 2017-06-09 20:17:32 +02:00 committed by Junio C Hamano
parent dffc651ed1
commit 479b3d9785
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
revision.c
View File

@ -1690,8 +1690,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->max_count = atoi(argv[1]); revs->max_count = atoi(argv[1]);
revs->no_walk = 0; revs->no_walk = 0;
return 2; return 2;
} else if (starts_with(arg, "-n")) { } else if (skip_prefix(arg, "-n", &optarg)) {
revs->max_count = atoi(arg + 2); revs->max_count = atoi(optarg);
revs->no_walk = 0; revs->no_walk = 0;
} else if ((argcount = parse_long_opt("max-age", argv, &optarg))) { } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
revs->max_age = atoi(optarg); revs->max_age = atoi(optarg);
@ -1772,12 +1772,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->min_parents = 2; revs->min_parents = 2;
} else if (!strcmp(arg, "--no-merges")) { } else if (!strcmp(arg, "--no-merges")) {
revs->max_parents = 1; revs->max_parents = 1;
} else if (starts_with(arg, "--min-parents=")) { } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
revs->min_parents = atoi(arg+14); revs->min_parents = atoi(optarg);
} else if (!strcmp(arg, "--no-min-parents")) { } else if (!strcmp(arg, "--no-min-parents")) {
revs->min_parents = 0; revs->min_parents = 0;
} else if (starts_with(arg, "--max-parents=")) { } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
revs->max_parents = atoi(arg+14); revs->max_parents = atoi(optarg);
} else if (!strcmp(arg, "--no-max-parents")) { } else if (!strcmp(arg, "--no-max-parents")) {
revs->max_parents = -1; revs->max_parents = -1;
} else if (!strcmp(arg, "--boundary")) { } else if (!strcmp(arg, "--boundary")) {
@ -1859,14 +1859,15 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->verbose_header = 1; revs->verbose_header = 1;
revs->pretty_given = 1; revs->pretty_given = 1;
get_commit_format(NULL, revs); get_commit_format(NULL, revs);
} else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) { } else if (skip_prefix(arg, "--pretty=", &optarg) ||
skip_prefix(arg, "--format=", &optarg)) {
/* /*
* Detached form ("--pretty X" as opposed to "--pretty=X") * Detached form ("--pretty X" as opposed to "--pretty=X")
* not allowed, since the argument is optional. * not allowed, since the argument is optional.
*/ */
revs->verbose_header = 1; revs->verbose_header = 1;
revs->pretty_given = 1; revs->pretty_given = 1;
get_commit_format(arg+9, revs); get_commit_format(optarg, revs);
} else if (!strcmp(arg, "--expand-tabs")) { } else if (!strcmp(arg, "--expand-tabs")) {
revs->expand_tabs_in_log = 8; revs->expand_tabs_in_log = 8;
} else if (!strcmp(arg, "--no-expand-tabs")) { } else if (!strcmp(arg, "--no-expand-tabs")) {
@ -1884,26 +1885,23 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->show_signature = 1; revs->show_signature = 1;
} else if (!strcmp(arg, "--no-show-signature")) { } else if (!strcmp(arg, "--no-show-signature")) {
revs->show_signature = 0; revs->show_signature = 0;
} else if (!strcmp(arg, "--show-linear-break") || } else if (!strcmp(arg, "--show-linear-break")) {
starts_with(arg, "--show-linear-break=")) { revs->break_bar = " ..........";
if (starts_with(arg, "--show-linear-break="))
revs->break_bar = xstrdup(arg + 20);
else
revs->break_bar = " ..........";
revs->track_linear = 1; revs->track_linear = 1;
revs->track_first_time = 1; revs->track_first_time = 1;
} else if (starts_with(arg, "--show-notes=") || } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
starts_with(arg, "--notes=")) { revs->break_bar = xstrdup(optarg);
revs->track_linear = 1;
revs->track_first_time = 1;
} else if (skip_prefix(arg, "--show-notes=", &optarg) ||
skip_prefix(arg, "--notes=", &optarg)) {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
revs->show_notes = 1; revs->show_notes = 1;
revs->show_notes_given = 1; revs->show_notes_given = 1;
if (starts_with(arg, "--show-notes")) { if (starts_with(arg, "--show-notes=") &&
if (revs->notes_opt.use_default_notes < 0) revs->notes_opt.use_default_notes < 0)
revs->notes_opt.use_default_notes = 1; revs->notes_opt.use_default_notes = 1;
strbuf_addstr(&buf, arg+13); strbuf_addstr(&buf, optarg);
}
else
strbuf_addstr(&buf, arg+8);
expand_notes_ref(&buf); expand_notes_ref(&buf);
string_list_append(&revs->notes_opt.extra_notes_refs, string_list_append(&revs->notes_opt.extra_notes_refs,
strbuf_detach(&buf, NULL)); strbuf_detach(&buf, NULL));
@ -1940,8 +1938,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->abbrev = 0; revs->abbrev = 0;
} else if (!strcmp(arg, "--abbrev")) { } else if (!strcmp(arg, "--abbrev")) {
revs->abbrev = DEFAULT_ABBREV; revs->abbrev = DEFAULT_ABBREV;
} else if (starts_with(arg, "--abbrev=")) { } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
revs->abbrev = strtoul(arg + 9, NULL, 10); revs->abbrev = strtoul(optarg, NULL, 10);
if (revs->abbrev < MINIMUM_ABBREV) if (revs->abbrev < MINIMUM_ABBREV)
revs->abbrev = MINIMUM_ABBREV; revs->abbrev = MINIMUM_ABBREV;
else if (revs->abbrev > 40) else if (revs->abbrev > 40)