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

combine-diff: use color

Browse Source 
Using the same mechanism as the regular diffs, color combined diff
output.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-08-10 00:30:33 -07:00
parent 2c71810b90
commit 567a03d14c
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
combine-diff.c
View File

@ -497,11 +497,17 @@ static void show_parent_lno(struct sline *sline, unsigned long l0, unsigned long
printf(" -%lu,%lu", l0, l1-l0); printf(" -%lu,%lu", l0, l1-l0);
} }
static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent) static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
int use_color)
{ {
unsigned long mark = (1UL<<num_parent); unsigned long mark = (1UL<<num_parent);
int i; int i;
unsigned long lno = 0; unsigned long lno = 0;
const char *c_frag = diff_get_color(use_color, DIFF_FRAGINFO);
const char *c_new = diff_get_color(use_color, DIFF_FILE_NEW);
const char *c_old = diff_get_color(use_color, DIFF_FILE_OLD);
const char *c_plain = diff_get_color(use_color, DIFF_PLAIN);
const char *c_reset = diff_get_color(use_color, DIFF_RESET);
if (!cnt) if (!cnt)
return; /* result deleted */ return; /* result deleted */
@ -522,12 +528,13 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent)
rlines = hunk_end - lno; rlines = hunk_end - lno;
if (cnt < hunk_end) if (cnt < hunk_end)
rlines--; /* pointing at the last delete hunk */ rlines--; /* pointing at the last delete hunk */
fputs(c_frag, stdout);
for (i = 0; i <= num_parent; i++) putchar(combine_marker); for (i = 0; i <= num_parent; i++) putchar(combine_marker);
for (i = 0; i < num_parent; i++) for (i = 0; i < num_parent; i++)
show_parent_lno(sline, lno, hunk_end, i); show_parent_lno(sline, lno, hunk_end, i);
printf(" +%lu,%lu ", lno+1, rlines); printf(" +%lu,%lu ", lno+1, rlines);
for (i = 0; i <= num_parent; i++) putchar(combine_marker); for (i = 0; i <= num_parent; i++) putchar(combine_marker);
putchar('\n'); printf("%s\n", c_reset);
while (lno < hunk_end) { while (lno < hunk_end) {
struct lline *ll; struct lline *ll;
int j; int j;
@ -535,18 +542,23 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent)
sl = &sline[lno++]; sl = &sline[lno++];
ll = sl->lost_head; ll = sl->lost_head;
while (ll) { while (ll) {
fputs(c_old, stdout);
for (j = 0; j < num_parent; j++) { for (j = 0; j < num_parent; j++) {
if (ll->parent_map & (1UL<<j)) if (ll->parent_map & (1UL<<j))
putchar('-'); putchar('-');
else else
putchar(' '); putchar(' ');
} }
puts(ll->line); printf("%s%s\n", ll->line, c_reset);
ll = ll->next; ll = ll->next;
} }
if (cnt < lno) if (cnt < lno)
break; break;
p_mask = 1; p_mask = 1;
if (!(sl->flag & (mark-1)))
fputs(c_plain, stdout);
else
fputs(c_new, stdout);
for (j = 0; j < num_parent; j++) { for (j = 0; j < num_parent; j++) {
if (p_mask & sl->flag) if (p_mask & sl->flag)
putchar('+'); putchar('+');
@ -554,7 +566,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent)
putchar(' '); putchar(' ');
p_mask <<= 1; p_mask <<= 1;
} }
printf("%.*s\n", sl->len, sl->bol); printf("%.*s%s\n", sl->len, sl->bol, c_reset);
} }
} }
} }
@ -586,14 +598,15 @@ static void reuse_combine_diff(struct sline *sline, unsigned long cnt,
sline->p_lno[i] = sline->p_lno[j]; 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 *prefix, const char *path,
const char *c_meta, const char *c_reset)
{ {
fputs(prefix, stdout); printf("%s%s", c_meta, prefix);
if (quote_c_style(path, NULL, NULL, 0)) if (quote_c_style(path, NULL, NULL, 0))
quote_c_style(path, NULL, stdout, 0); quote_c_style(path, NULL, stdout, 0);
else else
printf("%s", path); printf("%s", path);
putchar('\n'); printf("%s\n", c_reset);
} }
static int show_patch_diff(struct combine_diff_path *elem, int num_parent, static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
@ -699,18 +712,22 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (show_hunks || mode_differs || working_tree_file) { if (show_hunks || mode_differs || working_tree_file) {
const char *abb; const char *abb;
int use_color = opt->color_diff;
const char *c_meta = diff_get_color(use_color, DIFF_METAINFO);
const char *c_reset = diff_get_color(use_color, DIFF_RESET);
if (rev->loginfo) if (rev->loginfo)
show_log(rev, opt->msg_sep); show_log(rev, opt->msg_sep);
dump_quoted_path(dense ? "diff --cc " : "diff --combined ", elem->path); dump_quoted_path(dense ? "diff --cc " : "diff --combined ",
printf("index "); elem->path, c_meta, c_reset);
printf("%sindex ", c_meta);
for (i = 0; i < num_parent; i++) { for (i = 0; i < num_parent; i++) {
abb = find_unique_abbrev(elem->parent[i].sha1, abb = find_unique_abbrev(elem->parent[i].sha1,
abbrev); abbrev);
printf("%s%s", i ? "," : "", abb); printf("%s%s", i ? "," : "", abb);
} }
abb = find_unique_abbrev(elem->sha1, abbrev); abb = find_unique_abbrev(elem->sha1, abbrev);
printf("..%s\n", abb); printf("..%s%s\n", abb, c_reset);
if (mode_differs) { if (mode_differs) {
int added = !!elem->mode; int added = !!elem->mode;
@ -719,10 +736,11 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
DIFF_STATUS_ADDED) DIFF_STATUS_ADDED)
added = 0; added = 0;
if (added) if (added)
printf("new file mode %06o", elem->mode); printf("%snew file mode %06o",
c_meta, elem->mode);
else { else {
if (!elem->mode) if (!elem->mode)
printf("deleted file "); printf("%sdeleted file ", c_meta);
printf("mode "); printf("mode ");
for (i = 0; i < num_parent; i++) { for (i = 0; i < num_parent; i++) {
printf("%s%06o", i ? "," : "", printf("%s%06o", i ? "," : "",
@ -731,11 +749,11 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (elem->mode) if (elem->mode)
printf("..%06o", elem->mode); printf("..%06o", elem->mode);
} }
putchar('\n'); printf("%s\n", c_reset);
} }
dump_quoted_path("--- a/", elem->path); dump_quoted_path("--- a/", elem->path, c_meta, c_reset);
dump_quoted_path("+++ b/", elem->path); dump_quoted_path("+++ b/", elem->path, c_meta, c_reset);
dump_sline(sline, cnt, num_parent); dump_sline(sline, cnt, num_parent, opt->color_diff);
} }
free(result); free(result);