projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blame: allow "blame file" in the middle of a conflicted merge
[git.git]
/
wt-status.c
diff --git
a/wt-status.c
b/wt-status.c
index 9ffc535f1ab0296fd0a3330b1f136d69f9ac9bb2..bc268ceda0c639fdefd5ba70552a2ea250ddb8e6 100644
(file)
--- a/
wt-status.c
+++ b/
wt-status.c
@@
-777,7
+777,7
@@
void wt_status_print(struct wt_status *s)
}
}
}
}
-static void wt_shortstatus_unmerged(
int null_termination,
struct string_list_item *it,
+static void wt_shortstatus_unmerged(struct string_list_item *it,
struct wt_status *s)
{
struct wt_status_change_data *d = it->util;
struct wt_status *s)
{
struct wt_status_change_data *d = it->util;
@@
-793,7
+793,7
@@
static void wt_shortstatus_unmerged(int null_termination, struct string_list_ite
case 7: how = "UU"; break; /* both modified */
}
color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
case 7: how = "UU"; break; /* both modified */
}
color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
- if (null_termination) {
+ if (
s->
null_termination) {
fprintf(stdout, " %s%c", it->string, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
fprintf(stdout, " %s%c", it->string, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
@@
-804,7
+804,7
@@
static void wt_shortstatus_unmerged(int null_termination, struct string_list_ite
}
}
}
}
-static void wt_shortstatus_status(
int null_termination,
struct string_list_item *it,
+static void wt_shortstatus_status(struct string_list_item *it,
struct wt_status *s)
{
struct wt_status_change_data *d = it->util;
struct wt_status *s)
{
struct wt_status_change_data *d = it->util;
@@
-818,7
+818,7
@@
static void wt_shortstatus_status(int null_termination, struct string_list_item
else
putchar(' ');
putchar(' ');
else
putchar(' ');
putchar(' ');
- if (null_termination) {
+ if (
s->
null_termination) {
fprintf(stdout, "%s%c", it->string, 0);
if (d->head_path)
fprintf(stdout, "%s%c", d->head_path, 0);
fprintf(stdout, "%s%c", it->string, 0);
if (d->head_path)
fprintf(stdout, "%s%c", d->head_path, 0);
@@
-846,10
+846,10
@@
static void wt_shortstatus_status(int null_termination, struct string_list_item
}
}
}
}
-static void wt_shortstatus_other(
int null_termination,
struct string_list_item *it,
+static void wt_shortstatus_other(struct string_list_item *it,
struct wt_status *s, const char *sign)
{
struct wt_status *s, const char *sign)
{
- if (null_termination) {
+ if (
s->
null_termination) {
fprintf(stdout, "%s %s%c", sign, it->string, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
fprintf(stdout, "%s %s%c", sign, it->string, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
@@
-889,8
+889,8
@@
static void wt_shortstatus_print_tracking(struct wt_status *s)
if (s->is_initial)
color_fprintf(s->fp, header_color, _("Initial commit on "));
if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
if (s->is_initial)
color_fprintf(s->fp, header_color, _("Initial commit on "));
if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
- color_fprintf
_ln(s->fp, branch_color_local,
-
"%s", branch_name
);
+ color_fprintf
(s->fp, branch_color_local, "%s", branch_name);
+
fputc(s->null_termination ? '\0' : '\n', s->fp
);
return;
}
return;
}
@@
-914,14
+914,15
@@
static void wt_shortstatus_print_tracking(struct wt_status *s)
color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
}
color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
}
- color_fprintf_ln(s->fp, header_color, "]");
+ color_fprintf(s->fp, header_color, "]");
+ fputc(s->null_termination ? '\0' : '\n', s->fp);
}
}
-void wt_shortstatus_print(struct wt_status *s
, int null_termination, int show_branch
)
+void wt_shortstatus_print(struct wt_status *s)
{
int i;
{
int i;
- if (show_branch)
+ if (s
->s
how_branch)
wt_shortstatus_print_tracking(s);
for (i = 0; i < s->change.nr; i++) {
wt_shortstatus_print_tracking(s);
for (i = 0; i < s->change.nr; i++) {
@@
-931,28
+932,28
@@
void wt_shortstatus_print(struct wt_status *s, int null_termination, int show_br
it = &(s->change.items[i]);
d = it->util;
if (d->stagemask)
it = &(s->change.items[i]);
d = it->util;
if (d->stagemask)
- wt_shortstatus_unmerged(
null_termination,
it, s);
+ wt_shortstatus_unmerged(it, s);
else
else
- wt_shortstatus_status(
null_termination,
it, s);
+ wt_shortstatus_status(it, s);
}
for (i = 0; i < s->untracked.nr; i++) {
struct string_list_item *it;
it = &(s->untracked.items[i]);
}
for (i = 0; i < s->untracked.nr; i++) {
struct string_list_item *it;
it = &(s->untracked.items[i]);
- wt_shortstatus_other(
null_termination,
it, s, "??");
+ wt_shortstatus_other(it, s, "??");
}
for (i = 0; i < s->ignored.nr; i++) {
struct string_list_item *it;
it = &(s->ignored.items[i]);
}
for (i = 0; i < s->ignored.nr; i++) {
struct string_list_item *it;
it = &(s->ignored.items[i]);
- wt_shortstatus_other(
null_termination,
it, s, "!!");
+ wt_shortstatus_other(it, s, "!!");
}
}
}
}
-void wt_porcelain_print(struct wt_status *s
, int null_termination
)
+void wt_porcelain_print(struct wt_status *s)
{
s->use_color = 0;
s->relative_paths = 0;
s->prefix = NULL;
{
s->use_color = 0;
s->relative_paths = 0;
s->prefix = NULL;
- wt_shortstatus_print(s
, null_termination, 0
);
+ wt_shortstatus_print(s);
}
}