Re: [PATCH v2] format-patch: allow a non-integral version numbers
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 3, 2021, 03:44 UTC
- Message-ID
- <xmqqzgzklx3p.fsf@gitster.c.googlers.com>
- In-Reply-To
- <pull.885.v2.git.1614588030233.gitgitgadget@gmail.com>
"ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 12 quoted lines
> diff --git a/builtin/log.c b/builtin/log.c > index f67b67d80ed1..95c95eab5393 100644 > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -1662,13 +1662,15 @@ static void print_bases(struct base_tree_info *bases, FILE *file) > oidclr(&bases->base_commit); > } > > -static const char *diff_title(struct strbuf *sb, int reroll_count, > - const char *generic, const char *rerolled) > +static const char *diff_title(struct strbuf *sb, const char *reroll_count, int reroll_count_is_integer, > + const char*previous_count, const char *generic, const char *rerolled)
Avoid overly long lines here, but quite honestly, I find that this interface is way too ugly to live.
Can we do all the computation around previous count in the caller, so that this function only takes reroll_count and previous_count that are both "const char *", and then the body will just be:
if (!reroll_count) strbuf_addstr(sb, generic); else if (previous_count) strbuf_addf(sb, rerolled, previous_count); return sb->buf;
That way, the callers do not have to prepare two different rerolled template and switch between them based on "is_integer".
In other words, they need to care "is_integer" already, so making them responsible for preparing "previous_count" always usable by this function would be a reasonable way to partition the tasks between this callee and the caller.
That way, this function do not even need to know about "is_integer" bit.
Show 14 quoted lines
> + if (previous_count && !reroll_count)
> + usage(_("previous-count can only used when reroll-count is used"));
> + if (reroll_count) {
> struct strbuf sprefix = STRBUF_INIT;
> - strbuf_addf(&sprefix, "%s v%d",
> + char ch;
> + size_t i = 0 , reroll_count_len = strlen(reroll_count);
> +
> + for (; i != reroll_count_len; i++) {
> + ch = reroll_count[i];
> + if(!isdigit(ch))
> + break;
> + }
> + reroll_count_is_integer = i == reroll_count_len ? 1 : 0;Do not reinvent integer parsing. In our codebase, it is far more common (and it is less error prone) to do something like this:
char *endp;
count = strtoul(reroll_count_string, &endp, 10);
if (*endp) {
/* followed by non-digit: not an integer */
is_integer = 0;
} else {
is_integer = 1;
if (0 < count)
previous_count_string = xstrfmt("%d", count - 1);
}And then, you can move the "if previous is there and count is not specified" check after this block, to make sure that a non-integer reroll count is always accompanied by a previous count, for example.
Show 13 quoted lines
> + strbuf_addf(&sprefix, "%s v%s",
> rev.subject_prefix, reroll_count);
> rev.reroll_count = reroll_count;
> rev.subject_prefix = strbuf_detach(&sprefix, NULL);
> @@ -2079,8 +2095,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
> rev.idiff_oid1 = &idiff_prev.oid[idiff_prev.nr - 1];
> rev.idiff_oid2 = get_commit_tree_oid(list[0]);
> rev.idiff_title = diff_title(&idiff_title, reroll_count,
> - _("Interdiff:"),
> - _("Interdiff against v%d:"));
> + reroll_count_is_integer, previous_count, _("Interdiff:"),
> + reroll_count_is_integer ? _("Interdiff against v%d:") :
> + _("Interdiff against v%s:"));I've touched the calling convention into diff_title() function earlier.
Show 9 quoted lines
> @@ -2098,8 +2115,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
> rev.rdiff2 = rdiff2.buf;
> rev.creation_factor = creation_factor;
> rev.rdiff_title = diff_title(&rdiff_title, reroll_count,
> - _("Range-diff:"),
> - _("Range-diff against v%d:"));
> + reroll_count_is_integer, previous_count, _("Range-diff:"),
> + reroll_count_is_integer ? _("Range-diff against v%d:") :
> + _("Range-diff against v%s:"));Ditto.