microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT 

The latter is a much more descriptive name (and we support
"color.diff.context" now). This also updates the name of any
local variables which were used to store the color.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-05-27 16:48:46 -04:00 коммит произвёл Junio C Hamano
Родитель 74b15bfbf6
Коммит 8dbf3eb685
4 изменённых файлов: 20 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
combine-diff.c
Просмотреть файл

@ -730,7 +730,7 @@ static void dump_sline(struct sline *sline, const char *line_prefix,
const char *c_func = diff_get_color(use_color, DIFF_FUNCINFO); const char *c_func = diff_get_color(use_color, DIFF_FUNCINFO);
const char *c_new = diff_get_color(use_color, DIFF_FILE_NEW); 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_old = diff_get_color(use_color, DIFF_FILE_OLD);
const char *c_plain = diff_get_color(use_color, DIFF_PLAIN); const char *c_context = diff_get_color(use_color, DIFF_CONTEXT);
const char *c_reset = diff_get_color(use_color, DIFF_RESET); const char *c_reset = diff_get_color(use_color, DIFF_RESET);
if (result_deleted) if (result_deleted)
@ -793,7 +793,7 @@ static void dump_sline(struct sline *sline, const char *line_prefix,
} }
if (comment_end) if (comment_end)
printf("%s%s %s%s", c_reset, printf("%s%s %s%s", c_reset,
c_plain, c_reset, c_context, c_reset,
c_func); c_func);
for (i = 0; i < comment_end; i++) for (i = 0; i < comment_end; i++)
putchar(hunk_comment[i]); putchar(hunk_comment[i]);
@ -828,7 +828,7 @@ static void dump_sline(struct sline *sline, const char *line_prefix,
*/ */
if (!context) if (!context)
continue; continue;
fputs(c_plain, stdout); fputs(c_context, stdout);
} }
else else
fputs(c_new, stdout); fputs(c_new, stdout);

26
diff.c
Просмотреть файл

@ -42,7 +42,7 @@ static long diff_algorithm;
static char diff_colors[][COLOR_MAXLEN] = { static char diff_colors[][COLOR_MAXLEN] = {
GIT_COLOR_RESET, GIT_COLOR_RESET,
GIT_COLOR_NORMAL, /* PLAIN */ GIT_COLOR_NORMAL, /* CONTEXT */
GIT_COLOR_BOLD, /* METAINFO */ GIT_COLOR_BOLD, /* METAINFO */
GIT_COLOR_CYAN, /* FRAGINFO */ GIT_COLOR_CYAN, /* FRAGINFO */
GIT_COLOR_RED, /* OLD */ GIT_COLOR_RED, /* OLD */
@ -55,7 +55,7 @@ static char diff_colors[][COLOR_MAXLEN] = {
static int parse_diff_color_slot(const char *var) static int parse_diff_color_slot(const char *var)
{ {
if (!strcasecmp(var, "context") || !strcasecmp(var, "plain")) if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
return DIFF_PLAIN; return DIFF_CONTEXT;
if (!strcasecmp(var, "meta")) if (!strcasecmp(var, "meta"))
return DIFF_METAINFO; return DIFF_METAINFO;
if (!strcasecmp(var, "frag")) if (!strcasecmp(var, "frag"))
@ -501,7 +501,7 @@ static void emit_add_line(const char *reset,
static void emit_hunk_header(struct emit_callback *ecbdata, static void emit_hunk_header(struct emit_callback *ecbdata,
const char *line, int len) const char *line, int len)
{ {
const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN); const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO); const char *frag = diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO);
const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO); const char *func = diff_get_color(ecbdata->color_diff, DIFF_FUNCINFO);
const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
@ -518,7 +518,7 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
if (len < 10 || if (len < 10 ||
memcmp(line, atat, 2) || memcmp(line, atat, 2) ||
!(ep = memmem(line + 2, len - 2, atat, 2))) { !(ep = memmem(line + 2, len - 2, atat, 2))) {
emit_line(ecbdata->opt, plain, reset, line, len); emit_line(ecbdata->opt, context, reset, line, len);
return; return;
} }
ep += 2; /* skip over @@ */ ep += 2; /* skip over @@ */
@ -540,7 +540,7 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
if (*ep != ' ' && *ep != '\t') if (*ep != ' ' && *ep != '\t')
break; break;
if (ep != cp) { if (ep != cp) {
strbuf_addstr(&msgbuf, plain); strbuf_addstr(&msgbuf, context);
strbuf_add(&msgbuf, cp, ep - cp); strbuf_add(&msgbuf, cp, ep - cp);
strbuf_addstr(&msgbuf, reset); strbuf_addstr(&msgbuf, reset);
} }
@ -623,10 +623,10 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
data += len; data += len;
} }
if (!endp) { if (!endp) {
const char *plain = diff_get_color(ecb->color_diff, const char *context = diff_get_color(ecb->color_diff,
DIFF_PLAIN); DIFF_CONTEXT);
putc('\n', ecb->opt->file); putc('\n', ecb->opt->file);
emit_line_0(ecb->opt, plain, reset, '\\', emit_line_0(ecb->opt, context, reset, '\\',
nneof, strlen(nneof)); nneof, strlen(nneof));
} }
} }
@ -1086,7 +1086,7 @@ static void init_diff_words_data(struct emit_callback *ecbdata,
struct diff_words_style *st = ecbdata->diff_words->style; struct diff_words_style *st = ecbdata->diff_words->style;
st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD); st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW); st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
st->ctx.color = diff_get_color_opt(o, DIFF_PLAIN); st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
} }
} }
@ -1162,7 +1162,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
{ {
struct emit_callback *ecbdata = priv; struct emit_callback *ecbdata = priv;
const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO); const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN); const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
struct diff_options *o = ecbdata->opt; struct diff_options *o = ecbdata->opt;
const char *line_prefix = diff_line_prefix(o); const char *line_prefix = diff_line_prefix(o);
@ -1233,7 +1233,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
} }
diff_words_flush(ecbdata); diff_words_flush(ecbdata);
if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) { if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
emit_line(ecbdata->opt, plain, reset, line, len); emit_line(ecbdata->opt, context, reset, line, len);
fputs("~\n", ecbdata->opt->file); fputs("~\n", ecbdata->opt->file);
} else { } else {
/* /*
@ -1245,7 +1245,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
line++; line++;
len--; len--;
} }
emit_line(ecbdata->opt, plain, reset, line, len); emit_line(ecbdata->opt, context, reset, line, len);
} }
return; return;
} }
@ -1253,7 +1253,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
if (line[0] != '+') { if (line[0] != '+') {
const char *color = const char *color =
diff_get_color(ecbdata->color_diff, diff_get_color(ecbdata->color_diff,
line[0] == '-' ? DIFF_FILE_OLD : DIFF_PLAIN); line[0] == '-' ? DIFF_FILE_OLD : DIFF_CONTEXT);
ecbdata->lno_in_preimage++; ecbdata->lno_in_preimage++;
if (line[0] == ' ') if (line[0] == ' ')
ecbdata->lno_in_postimage++; ecbdata->lno_in_postimage++;

2
diff.h
Просмотреть файл

@ -175,7 +175,7 @@ struct diff_options {
enum color_diff { enum color_diff {
DIFF_RESET = 0, DIFF_RESET = 0,
DIFF_PLAIN = 1, DIFF_CONTEXT = 1,
DIFF_METAINFO = 2, DIFF_METAINFO = 2,
DIFF_FRAGINFO = 3, DIFF_FRAGINFO = 3,
DIFF_FILE_OLD = 4, DIFF_FILE_OLD = 4,

6
line-log.c
Просмотреть файл

@ -893,7 +893,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
const char *c_meta = diff_get_color(opt->use_color, DIFF_METAINFO); const char *c_meta = diff_get_color(opt->use_color, DIFF_METAINFO);
const char *c_old = diff_get_color(opt->use_color, DIFF_FILE_OLD); const char *c_old = diff_get_color(opt->use_color, DIFF_FILE_OLD);
const char *c_new = diff_get_color(opt->use_color, DIFF_FILE_NEW); const char *c_new = diff_get_color(opt->use_color, DIFF_FILE_NEW);
const char *c_plain = diff_get_color(opt->use_color, DIFF_PLAIN); const char *c_context = diff_get_color(opt->use_color, DIFF_CONTEXT);
if (!pair || !diff) if (!pair || !diff)
return; return;
@ -957,7 +957,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
int k; int k;
for (; t_cur < diff->target.ranges[j].start; t_cur++) for (; t_cur < diff->target.ranges[j].start; t_cur++)
print_line(prefix, ' ', t_cur, t_ends, pair->two->data, print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
c_plain, c_reset); c_context, c_reset);
for (k = diff->parent.ranges[j].start; k < diff->parent.ranges[j].end; k++) for (k = diff->parent.ranges[j].start; k < diff->parent.ranges[j].end; k++)
print_line(prefix, '-', k, p_ends, pair->one->data, print_line(prefix, '-', k, p_ends, pair->one->data,
c_old, c_reset); c_old, c_reset);
@ -968,7 +968,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
} }
for (; t_cur < t_end; t_cur++) for (; t_cur < t_end; t_cur++)
print_line(prefix, ' ', t_cur, t_ends, pair->two->data, print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
c_plain, c_reset); c_context, c_reset);
} }
free(p_ends); free(p_ends);