Re: [PATCH] combine-diff: use diff_opts->a_prefix
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 27, 2007, 00:57 UTC
- Message-ID
- <7vodcdkl82.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <477109A5.9040000@gmail.com>
Salikh Zakirov <salikh@gmail.com> writes:
Show 9 quoted lines
> The introduction of configurable dir prefix for diff headers in commit > eab9a40b 'Teach diff machinery to display other prefixes than "a/" and "b/"' > missed combined diff generation. > > Signed-off-by: Salikh Zakirov <salikh@gmail.com> > --- > > I realize that this fix is ugly, so I am all ears for a suggestion > of a better fix.
It is not so ugly, but I think the original code is broken wrt its calling of quote_c_style(). It will output "a/" literally and then would spit out the path with quoting. IOW, you would get something like:
--- a/"foo\tbar"
+++ b/"foo\tbar"when it should show:
--- "a/foo\tbar"
+++ "b/foo\tbar"Incidentally, I just noticed that diff.c::emit_rewrite_diff() has the same bug.
Here is a fix to combine-diff.c
-- >8 -- [PATCH] combine-diff: Fix path quoting
Earlier when showing combined diff, the filenames on the ---/+++ header lines were quoted incorrectly. a/ (or b/) prefix was output literally and then the path was output, with c-quoting.
This fixes the quoting logic, and while at it, adjusts the code to use the customizable prefix (a_prefix and b_prefix) introduced recently.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- combine-diff.c | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/combine-diff.c b/combine-diff.c index e22db89..7d71033 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -646,12 +646,28 @@ static void reuse_combine_diff(struct sline *sline, unsigned long cnt, sline->p_lno[i] = sline->p_lno[j]; } -static void dump_quoted_path(const char *prefix, const char *path, +static void dump_quoted_path(const char *head, + const char *prefix, + const char *path, const char *c_meta, const char *c_reset) { - printf("%s%s", c_meta, prefix); - quote_c_style(path, NULL, stdout, 0); - printf("%s\n", c_reset); + static struct strbuf buf = STRBUF_INIT; + + strbuf_reset(&buf); + strbuf_addstr(&buf, c_meta); + strbuf_addstr(&buf, head); + if (quote_c_style(prefix, NULL, NULL, 0) || + quote_c_style(path, NULL, NULL, 0)) { + strbuf_addch(&buf, '"'); + quote_c_style(prefix, &buf, NULL, 1); + quote_c_style(path, &buf, NULL, 1); + strbuf_addch(&buf, '"'); + } else { + strbuf_addstr(&buf, prefix); + strbuf_addstr(&buf, path); + } + strbuf_addstr(&buf, c_reset); + puts(buf.buf); } static void show_patch_diff(struct combine_diff_path *elem, int num_parent, @@ -793,7 +809,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, if (rev->loginfo && !rev->no_commit_id) show_log(rev, opt->msg_sep); dump_quoted_path(dense ? "diff --cc " : "diff --combined ", - elem->path, c_meta, c_reset); + "", elem->path, c_meta, c_reset); printf("%sindex ", c_meta); for (i = 0; i < num_parent; i++) { abb = find_unique_abbrev(elem->parent[i].sha1, @@ -829,14 +845,19 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, printf("%s\n", c_reset); } if (added) - dump_quoted_path("--- /dev/", "null", c_meta, c_reset); + dump_quoted_path("--- ", "", "/dev/null", + c_meta, c_reset); else - dump_quoted_path("--- a/", elem->path, c_meta, c_reset); + dump_quoted_path("--- ", opt->a_prefix, elem->path, + c_meta, c_reset); if (deleted) - dump_quoted_path("+++ /dev/", "null", c_meta, c_reset); + dump_quoted_path("+++ ", "", "/dev/null", + c_meta, c_reset); else - dump_quoted_path("+++ b/", elem->path, c_meta, c_reset); - dump_sline(sline, cnt, num_parent, DIFF_OPT_TST(opt, COLOR_DIFF)); + dump_quoted_path("+++ ", opt->b_prefix, elem->path, + c_meta, c_reset); + dump_sline(sline, cnt, num_parent, + DIFF_OPT_TST(opt, COLOR_DIFF)); } free(result);
-- 1.5.4.rc1.23.g3a969