mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-08 08:36:30 +02:00
Code

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>
This commit is contained in:
Junio C Hamano 2007-12-26 16:51:19 -08:00
parent 25db465a34
commit 462a15bc82
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
combine-diff.c
View File

@ -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);