2006-12-19 23:34:12 +01:00
|
|
|
#include "cache.h"
|
2006-09-08 10:05:34 +02:00
|
|
|
#include "wt-status.h"
|
|
|
|
#include "object.h"
|
|
|
|
#include "dir.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
|
|
|
#include "diffcore.h"
|
2008-03-07 03:30:58 +01:00
|
|
|
#include "quote.h"
|
2008-04-12 17:05:32 +02:00
|
|
|
#include "run-command.h"
|
2008-07-02 09:52:16 +02:00
|
|
|
#include "remote.h"
|
2010-05-25 15:45:51 +02:00
|
|
|
#include "refs.h"
|
2010-06-25 16:56:47 +02:00
|
|
|
#include "submodule.h"
|
2012-04-13 12:54:39 +02:00
|
|
|
#include "column.h"
|
2012-06-10 13:17:38 +02:00
|
|
|
#include "strbuf.h"
|
2006-09-08 10:05:34 +02:00
|
|
|
|
2009-08-10 08:08:40 +02:00
|
|
|
static char default_wt_status_colors[][COLOR_MAXLEN] = {
|
2009-02-13 22:53:40 +01:00
|
|
|
GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
|
|
|
|
GIT_COLOR_GREEN, /* WT_STATUS_UPDATED */
|
|
|
|
GIT_COLOR_RED, /* WT_STATUS_CHANGED */
|
|
|
|
GIT_COLOR_RED, /* WT_STATUS_UNTRACKED */
|
|
|
|
GIT_COLOR_RED, /* WT_STATUS_NOBRANCH */
|
2009-08-05 09:04:51 +02:00
|
|
|
GIT_COLOR_RED, /* WT_STATUS_UNMERGED */
|
2010-05-25 15:45:51 +02:00
|
|
|
GIT_COLOR_GREEN, /* WT_STATUS_LOCAL_BRANCH */
|
|
|
|
GIT_COLOR_RED, /* WT_STATUS_REMOTE_BRANCH */
|
2010-12-09 18:27:08 +01:00
|
|
|
GIT_COLOR_NIL, /* WT_STATUS_ONBRANCH */
|
2006-09-08 10:05:34 +02:00
|
|
|
};
|
2007-01-12 00:34:41 +01:00
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
static const char *color(int slot, struct wt_status *s)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
color: delay auto-color decision until point of use
When we read a color value either from a config file or from
the command line, we use git_config_colorbool to convert it
from the tristate always/never/auto into a single yes/no
boolean value.
This has some timing implications with respect to starting
a pager.
If we start (or decide not to start) the pager before
checking the colorbool, everything is fine. Either isatty(1)
will give us the right information, or we will properly
check for pager_in_use().
However, if we decide to start a pager after we have checked
the colorbool, things are not so simple. If stdout is a tty,
then we will have already decided to use color. However, the
user may also have configured color.pager not to use color
with the pager. In this case, we need to actually turn off
color. Unfortunately, the pager code has no idea which color
variables were turned on (and there are many of them
throughout the code, and they may even have been manipulated
after the colorbool selection by something like "--color" on
the command line).
This bug can be seen any time a pager is started after
config and command line options are checked. This has
affected "git diff" since 89d07f7 (diff: don't run pager if
user asked for a diff style exit code, 2007-08-12). It has
also affect the log family since 1fda91b (Fix 'git log'
early pager startup error case, 2010-08-24).
This patch splits the notion of parsing a colorbool and
actually checking the configuration. The "use_color"
variables now have an additional possible value,
GIT_COLOR_AUTO. Users of the variable should use the new
"want_color()" wrapper, which will lazily determine and
cache the auto-color decision.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-18 07:04:23 +02:00
|
|
|
const char *c = "";
|
|
|
|
if (want_color(s->use_color))
|
|
|
|
c = s->color_palette[slot];
|
2010-12-09 18:27:08 +01:00
|
|
|
if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
|
|
|
|
c = s->color_palette[WT_STATUS_HEADER];
|
|
|
|
return c;
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2011-02-26 06:09:41 +01:00
|
|
|
static void status_vprintf(struct wt_status *s, int at_bol, const char *color,
|
|
|
|
const char *fmt, va_list ap, const char *trail)
|
|
|
|
{
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
struct strbuf linebuf = STRBUF_INIT;
|
|
|
|
const char *line, *eol;
|
|
|
|
|
|
|
|
strbuf_vaddf(&sb, fmt, ap);
|
|
|
|
if (!sb.len) {
|
2013-01-16 20:18:48 +01:00
|
|
|
strbuf_addch(&sb, comment_line_char);
|
2011-02-26 06:09:41 +01:00
|
|
|
if (!trail)
|
|
|
|
strbuf_addch(&sb, ' ');
|
|
|
|
color_print_strbuf(s->fp, color, &sb);
|
|
|
|
if (trail)
|
|
|
|
fprintf(s->fp, "%s", trail);
|
|
|
|
strbuf_release(&sb);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
for (line = sb.buf; *line; line = eol + 1) {
|
|
|
|
eol = strchr(line, '\n');
|
|
|
|
|
|
|
|
strbuf_reset(&linebuf);
|
|
|
|
if (at_bol) {
|
2013-01-16 20:18:48 +01:00
|
|
|
strbuf_addch(&linebuf, comment_line_char);
|
2011-02-26 06:09:41 +01:00
|
|
|
if (*line != '\n' && *line != '\t')
|
|
|
|
strbuf_addch(&linebuf, ' ');
|
|
|
|
}
|
|
|
|
if (eol)
|
|
|
|
strbuf_add(&linebuf, line, eol - line);
|
|
|
|
else
|
|
|
|
strbuf_addstr(&linebuf, line);
|
|
|
|
color_print_strbuf(s->fp, color, &linebuf);
|
|
|
|
if (eol)
|
|
|
|
fprintf(s->fp, "\n");
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
at_bol = 1;
|
|
|
|
}
|
|
|
|
if (trail)
|
|
|
|
fprintf(s->fp, "%s", trail);
|
|
|
|
strbuf_release(&linebuf);
|
|
|
|
strbuf_release(&sb);
|
|
|
|
}
|
|
|
|
|
|
|
|
void status_printf_ln(struct wt_status *s, const char *color,
|
|
|
|
const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
status_vprintf(s, 1, color, fmt, ap, "\n");
|
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
void status_printf(struct wt_status *s, const char *color,
|
|
|
|
const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
status_vprintf(s, 1, color, fmt, ap, NULL);
|
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
2012-09-16 07:46:26 +02:00
|
|
|
static void status_printf_more(struct wt_status *s, const char *color,
|
|
|
|
const char *fmt, ...)
|
2011-02-26 06:09:41 +01:00
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
status_vprintf(s, 0, color, fmt, ap, NULL);
|
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
void wt_status_prepare(struct wt_status *s)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
2007-02-10 01:22:42 +01:00
|
|
|
memset(s, 0, sizeof(*s));
|
2009-08-10 08:08:40 +02:00
|
|
|
memcpy(s->color_palette, default_wt_status_colors,
|
|
|
|
sizeof(default_wt_status_colors));
|
2009-08-10 06:59:30 +02:00
|
|
|
s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
|
|
|
|
s->use_color = -1;
|
|
|
|
s->relative_paths = 1;
|
2011-12-13 15:17:48 +01:00
|
|
|
s->branch = resolve_refdup("HEAD", sha1, 0, NULL);
|
2006-09-08 10:05:34 +02:00
|
|
|
s->reference = "HEAD";
|
2007-09-18 02:06:42 +02:00
|
|
|
s->fp = stdout;
|
2007-09-18 02:06:43 +02:00
|
|
|
s->index_file = get_index_file();
|
2009-08-05 08:49:33 +02:00
|
|
|
s->change.strdup_strings = 1;
|
2009-08-10 09:36:33 +02:00
|
|
|
s->untracked.strdup_strings = 1;
|
2010-04-10 09:11:53 +02:00
|
|
|
s->ignored.strdup_strings = 1;
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2009-08-05 09:04:51 +02:00
|
|
|
static void wt_status_print_unmerged_header(struct wt_status *s)
|
|
|
|
{
|
2012-06-05 22:21:26 +02:00
|
|
|
int i;
|
|
|
|
int del_mod_conflict = 0;
|
|
|
|
int both_deleted = 0;
|
|
|
|
int not_deleted = 0;
|
2009-08-10 06:59:30 +02:00
|
|
|
const char *c = color(WT_STATUS_HEADER, s);
|
2009-12-12 08:53:41 +01:00
|
|
|
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _("Unmerged paths:"));
|
2012-06-05 22:21:26 +02:00
|
|
|
|
|
|
|
for (i = 0; i < s->change.nr; i++) {
|
|
|
|
struct string_list_item *it = &(s->change.items[i]);
|
|
|
|
struct wt_status_change_data *d = it->util;
|
|
|
|
|
|
|
|
switch (d->stagemask) {
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
both_deleted = 1;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
case 5:
|
|
|
|
del_mod_conflict = 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
not_deleted = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-09 13:43:03 +02:00
|
|
|
if (!advice_status_hints)
|
|
|
|
return;
|
2011-02-20 05:12:29 +01:00
|
|
|
if (s->whence != FROM_COMMIT)
|
2009-12-12 08:53:41 +01:00
|
|
|
;
|
|
|
|
else if (!s->is_initial)
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
|
2009-08-05 09:04:51 +02:00
|
|
|
else
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
|
2012-06-05 22:21:26 +02:00
|
|
|
|
|
|
|
if (!both_deleted) {
|
|
|
|
if (!del_mod_conflict)
|
|
|
|
status_printf_ln(s, c, _(" (use \"git add <file>...\" to mark resolution)"));
|
|
|
|
else
|
|
|
|
status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
|
|
|
|
} else if (!del_mod_conflict && !not_deleted) {
|
|
|
|
status_printf_ln(s, c, _(" (use \"git rm <file>...\" to mark resolution)"));
|
|
|
|
} else {
|
|
|
|
status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" as appropriate to mark resolution)"));
|
|
|
|
}
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, c, "");
|
2009-08-05 09:04:51 +02:00
|
|
|
}
|
|
|
|
|
2007-09-18 02:06:42 +02:00
|
|
|
static void wt_status_print_cached_header(struct wt_status *s)
|
2007-01-02 20:26:21 +01:00
|
|
|
{
|
2009-08-10 06:59:30 +02:00
|
|
|
const char *c = color(WT_STATUS_HEADER, s);
|
2009-12-12 08:53:41 +01:00
|
|
|
|
2011-02-23 00:42:16 +01:00
|
|
|
status_printf_ln(s, c, _("Changes to be committed:"));
|
2009-09-09 13:43:03 +02:00
|
|
|
if (!advice_status_hints)
|
|
|
|
return;
|
2011-02-20 05:12:29 +01:00
|
|
|
if (s->whence != FROM_COMMIT)
|
2009-12-12 08:53:41 +01:00
|
|
|
; /* NEEDSWORK: use "git reset --unresolve"??? */
|
|
|
|
else if (!s->is_initial)
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _(" (use \"git reset %s <file>...\" to unstage)"), s->reference);
|
2009-12-12 08:53:41 +01:00
|
|
|
else
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _(" (use \"git rm --cached <file>...\" to unstage)"));
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, c, "");
|
2007-01-02 20:26:21 +01:00
|
|
|
}
|
|
|
|
|
2008-09-08 00:05:02 +02:00
|
|
|
static void wt_status_print_dirty_header(struct wt_status *s,
|
2010-03-08 13:53:19 +01:00
|
|
|
int has_deleted,
|
|
|
|
int has_dirty_submodules)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
2009-08-10 06:59:30 +02:00
|
|
|
const char *c = color(WT_STATUS_HEADER, s);
|
2009-12-12 08:53:41 +01:00
|
|
|
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _("Changes not staged for commit:"));
|
2009-09-09 13:43:03 +02:00
|
|
|
if (!advice_status_hints)
|
|
|
|
return;
|
2008-09-08 00:05:02 +02:00
|
|
|
if (!has_deleted)
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _(" (use \"git add <file>...\" to update what will be committed)"));
|
2008-09-08 00:05:02 +02:00
|
|
|
else
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _(" (use \"git add/rm <file>...\" to update what will be committed)"));
|
|
|
|
status_printf_ln(s, c, _(" (use \"git checkout -- <file>...\" to discard changes in working directory)"));
|
2010-03-08 13:53:19 +01:00
|
|
|
if (has_dirty_submodules)
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _(" (commit or discard the untracked or modified content in submodules)"));
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, c, "");
|
2008-09-08 00:05:02 +02:00
|
|
|
}
|
|
|
|
|
2010-04-10 09:19:46 +02:00
|
|
|
static void wt_status_print_other_header(struct wt_status *s,
|
|
|
|
const char *what,
|
|
|
|
const char *how)
|
2008-09-08 00:05:02 +02:00
|
|
|
{
|
2009-08-10 06:59:30 +02:00
|
|
|
const char *c = color(WT_STATUS_HEADER, s);
|
2012-09-06 17:16:50 +02:00
|
|
|
status_printf_ln(s, c, "%s:", what);
|
2009-09-09 13:43:03 +02:00
|
|
|
if (!advice_status_hints)
|
|
|
|
return;
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how);
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, c, "");
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2007-09-18 02:06:42 +02:00
|
|
|
static void wt_status_print_trailer(struct wt_status *s)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2008-03-07 03:30:58 +01:00
|
|
|
#define quote_path quote_path_relative
|
2006-11-08 22:20:46 +01:00
|
|
|
|
2009-08-05 09:04:51 +02:00
|
|
|
static void wt_status_print_unmerged_data(struct wt_status *s,
|
|
|
|
struct string_list_item *it)
|
|
|
|
{
|
2009-08-10 06:59:30 +02:00
|
|
|
const char *c = color(WT_STATUS_UNMERGED, s);
|
2009-08-05 09:04:51 +02:00
|
|
|
struct wt_status_change_data *d = it->util;
|
|
|
|
struct strbuf onebuf = STRBUF_INIT;
|
2011-02-23 00:42:13 +01:00
|
|
|
const char *one, *how = _("bug");
|
2009-08-05 09:04:51 +02:00
|
|
|
|
|
|
|
one = quote_path(it->string, -1, &onebuf, s->prefix);
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf(s, color(WT_STATUS_HEADER, s), "\t");
|
2009-08-05 09:04:51 +02:00
|
|
|
switch (d->stagemask) {
|
2011-02-23 00:42:13 +01:00
|
|
|
case 1: how = _("both deleted:"); break;
|
|
|
|
case 2: how = _("added by us:"); break;
|
|
|
|
case 3: how = _("deleted by them:"); break;
|
|
|
|
case 4: how = _("added by them:"); break;
|
|
|
|
case 5: how = _("deleted by us:"); break;
|
|
|
|
case 6: how = _("both added:"); break;
|
|
|
|
case 7: how = _("both modified:"); break;
|
2009-08-05 09:04:51 +02:00
|
|
|
}
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_more(s, c, "%-20s%s\n", how, one);
|
2009-08-05 09:04:51 +02:00
|
|
|
strbuf_release(&onebuf);
|
|
|
|
}
|
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
static void wt_status_print_change_data(struct wt_status *s,
|
|
|
|
int change_type,
|
|
|
|
struct string_list_item *it)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
2009-08-05 08:49:33 +02:00
|
|
|
struct wt_status_change_data *d = it->util;
|
2009-08-10 06:59:30 +02:00
|
|
|
const char *c = color(change_type, s);
|
wt-status: fix possible use of uninitialized variable
In wt_status_print_change_data, we accept a change_type flag
that is meant to be either WT_STATUS_UPDATED or
WT_STATUS_CHANGED. We then switch() on this value to set
the local variable "status" for each case, but do not
provide a fallback "default" label to the switch statement.
As a result, the compiler realizes that "status" might be
unset, and complains with a warning. To silence this
warning, we use the "int status = status" trick. This is
correct with the current code, as all callers provide one of
the two expected change_type flags. However, it's also a
maintenance trap, as there is nothing to prevent future
callers from passing another flag, nor to document this
assumption.
Instead of using the "x = x" hack, let's handle the default
case in the switch() statement with a die("BUG"). That tells
the compiler and any readers of the code exactly what the
function's input assumptions are.
We could also convert the flag to an enum, which would
provide a compile-time check on the function input. However,
since these flags are part of a larger enum, that would make
the code unnecessarily complex (we would have to make a new
enum with just the two flags, and then convert it to the old
enum for passing to sub-functions).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-21 12:05:28 +01:00
|
|
|
int status;
|
2009-08-05 08:49:33 +02:00
|
|
|
char *one_name;
|
|
|
|
char *two_name;
|
2006-11-08 22:20:46 +01:00
|
|
|
const char *one, *two;
|
2008-10-09 21:12:12 +02:00
|
|
|
struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
|
2010-03-08 13:53:19 +01:00
|
|
|
struct strbuf extra = STRBUF_INIT;
|
2006-11-08 22:20:46 +01:00
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
one_name = two_name = it->string;
|
|
|
|
switch (change_type) {
|
|
|
|
case WT_STATUS_UPDATED:
|
|
|
|
status = d->index_status;
|
|
|
|
if (d->head_path)
|
|
|
|
one_name = d->head_path;
|
|
|
|
break;
|
|
|
|
case WT_STATUS_CHANGED:
|
2010-03-08 13:53:19 +01:00
|
|
|
if (d->new_submodule_commits || d->dirty_submodule) {
|
|
|
|
strbuf_addstr(&extra, " (");
|
|
|
|
if (d->new_submodule_commits)
|
2011-02-23 00:42:13 +01:00
|
|
|
strbuf_addf(&extra, _("new commits, "));
|
2010-03-08 13:53:19 +01:00
|
|
|
if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
|
2011-02-23 00:42:13 +01:00
|
|
|
strbuf_addf(&extra, _("modified content, "));
|
2010-03-08 13:53:19 +01:00
|
|
|
if (d->dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
|
2011-02-23 00:42:13 +01:00
|
|
|
strbuf_addf(&extra, _("untracked content, "));
|
2010-03-08 13:53:19 +01:00
|
|
|
strbuf_setlen(&extra, extra.len - 2);
|
|
|
|
strbuf_addch(&extra, ')');
|
|
|
|
}
|
2009-08-05 08:49:33 +02:00
|
|
|
status = d->worktree_status;
|
|
|
|
break;
|
wt-status: fix possible use of uninitialized variable
In wt_status_print_change_data, we accept a change_type flag
that is meant to be either WT_STATUS_UPDATED or
WT_STATUS_CHANGED. We then switch() on this value to set
the local variable "status" for each case, but do not
provide a fallback "default" label to the switch statement.
As a result, the compiler realizes that "status" might be
unset, and complains with a warning. To silence this
warning, we use the "int status = status" trick. This is
correct with the current code, as all callers provide one of
the two expected change_type flags. However, it's also a
maintenance trap, as there is nothing to prevent future
callers from passing another flag, nor to document this
assumption.
Instead of using the "x = x" hack, let's handle the default
case in the switch() statement with a die("BUG"). That tells
the compiler and any readers of the code exactly what the
function's input assumptions are.
We could also convert the flag to an enum, which would
provide a compile-time check on the function input. However,
since these flags are part of a larger enum, that would make
the code unnecessarily complex (we would have to make a new
enum with just the two flags, and then convert it to the old
enum for passing to sub-functions).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-21 12:05:28 +01:00
|
|
|
default:
|
|
|
|
die("BUG: unhandled change_type %d in wt_status_print_change_data",
|
|
|
|
change_type);
|
2009-08-05 08:49:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
one = quote_path(one_name, -1, &onebuf, s->prefix);
|
|
|
|
two = quote_path(two_name, -1, &twobuf, s->prefix);
|
2006-11-08 22:20:46 +01:00
|
|
|
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf(s, color(WT_STATUS_HEADER, s), "\t");
|
2009-08-05 08:49:33 +02:00
|
|
|
switch (status) {
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_ADDED:
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_more(s, c, _("new file: %s"), one);
|
2006-11-08 22:20:46 +01:00
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_COPIED:
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_more(s, c, _("copied: %s -> %s"), one, two);
|
2006-09-08 10:05:34 +02:00
|
|
|
break;
|
|
|
|
case DIFF_STATUS_DELETED:
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_more(s, c, _("deleted: %s"), one);
|
2006-11-08 22:20:46 +01:00
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_MODIFIED:
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_more(s, c, _("modified: %s"), one);
|
2006-11-08 22:20:46 +01:00
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_RENAMED:
|
2011-02-23 00:42:18 +01:00
|
|
|
status_printf_more(s, c, _("renamed: %s -> %s"), one, two);
|
2006-09-08 10:05:34 +02:00
|
|
|
break;
|
|
|
|
case DIFF_STATUS_TYPE_CHANGED:
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_more(s, c, _("typechange: %s"), one);
|
2006-11-08 22:20:46 +01:00
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_UNKNOWN:
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_more(s, c, _("unknown: %s"), one);
|
2006-11-08 22:20:46 +01:00
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_UNMERGED:
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_more(s, c, _("unmerged: %s"), one);
|
2006-11-08 22:20:46 +01:00
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
default:
|
2011-02-23 00:42:13 +01:00
|
|
|
die(_("bug: unhandled diff status %c"), status);
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
2010-03-08 13:53:19 +01:00
|
|
|
if (extra.len) {
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_more(s, color(WT_STATUS_HEADER, s), "%s", extra.buf);
|
2010-03-08 13:53:19 +01:00
|
|
|
strbuf_release(&extra);
|
|
|
|
}
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_more(s, GIT_COLOR_NORMAL, "\n");
|
2007-11-11 18:35:41 +01:00
|
|
|
strbuf_release(&onebuf);
|
|
|
|
strbuf_release(&twobuf);
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
|
|
|
|
struct diff_options *options,
|
|
|
|
void *data)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
|
|
|
struct wt_status *s = data;
|
|
|
|
int i;
|
2009-08-05 08:49:33 +02:00
|
|
|
|
|
|
|
if (!q->nr)
|
|
|
|
return;
|
|
|
|
s->workdir_dirty = 1;
|
2006-09-08 10:05:34 +02:00
|
|
|
for (i = 0; i < q->nr; i++) {
|
2009-08-05 08:49:33 +02:00
|
|
|
struct diff_filepair *p;
|
|
|
|
struct string_list_item *it;
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
|
|
|
|
p = q->queue[i];
|
2010-06-26 01:41:35 +02:00
|
|
|
it = string_list_insert(&s->change, p->one->path);
|
2009-08-05 08:49:33 +02:00
|
|
|
d = it->util;
|
|
|
|
if (!d) {
|
|
|
|
d = xcalloc(1, sizeof(*d));
|
|
|
|
it->util = d;
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
2009-08-05 08:49:33 +02:00
|
|
|
if (!d->worktree_status)
|
|
|
|
d->worktree_status = p->status;
|
2010-03-08 13:53:19 +01:00
|
|
|
d->dirty_submodule = p->two->dirty_submodule;
|
|
|
|
if (S_ISGITLINK(p->two->mode))
|
|
|
|
d->new_submodule_commits = !!hashcmp(p->one->sha1, p->two->sha1);
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-05 09:04:51 +02:00
|
|
|
static int unmerged_mask(const char *path)
|
|
|
|
{
|
|
|
|
int pos, mask;
|
|
|
|
struct cache_entry *ce;
|
|
|
|
|
|
|
|
pos = cache_name_pos(path, strlen(path));
|
|
|
|
if (0 <= pos)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
mask = 0;
|
|
|
|
pos = -pos-1;
|
|
|
|
while (pos < active_nr) {
|
|
|
|
ce = active_cache[pos++];
|
|
|
|
if (strcmp(ce->name, path) || !ce_stage(ce))
|
|
|
|
break;
|
|
|
|
mask |= (1 << (ce_stage(ce) - 1));
|
|
|
|
}
|
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
|
|
|
|
struct diff_options *options,
|
|
|
|
void *data)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
2007-01-02 20:26:22 +01:00
|
|
|
struct wt_status *s = data;
|
2006-09-08 10:05:34 +02:00
|
|
|
int i;
|
2009-08-05 08:49:33 +02:00
|
|
|
|
|
|
|
for (i = 0; i < q->nr; i++) {
|
|
|
|
struct diff_filepair *p;
|
|
|
|
struct string_list_item *it;
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
|
|
|
|
p = q->queue[i];
|
2010-06-26 01:41:35 +02:00
|
|
|
it = string_list_insert(&s->change, p->two->path);
|
2009-08-05 08:49:33 +02:00
|
|
|
d = it->util;
|
|
|
|
if (!d) {
|
|
|
|
d = xcalloc(1, sizeof(*d));
|
|
|
|
it->util = d;
|
|
|
|
}
|
|
|
|
if (!d->index_status)
|
|
|
|
d->index_status = p->status;
|
|
|
|
switch (p->status) {
|
|
|
|
case DIFF_STATUS_COPIED:
|
|
|
|
case DIFF_STATUS_RENAMED:
|
|
|
|
d->head_path = xstrdup(p->one->path);
|
|
|
|
break;
|
2009-08-05 09:04:51 +02:00
|
|
|
case DIFF_STATUS_UNMERGED:
|
|
|
|
d->stagemask = unmerged_mask(p->two->path);
|
|
|
|
break;
|
2009-08-05 08:49:33 +02:00
|
|
|
}
|
2007-01-02 20:26:22 +01:00
|
|
|
}
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
static void wt_status_collect_changes_worktree(struct wt_status *s)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2009-08-05 08:49:33 +02:00
|
|
|
|
|
|
|
init_revisions(&rev, NULL);
|
|
|
|
setup_revisions(0, NULL, &rev, NULL);
|
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
|
2010-03-08 13:53:19 +01:00
|
|
|
DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
|
2010-03-13 23:00:27 +01:00
|
|
|
if (!s->show_untracked_files)
|
|
|
|
DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
|
2010-08-06 00:39:25 +02:00
|
|
|
if (s->ignore_submodule_arg) {
|
|
|
|
DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
|
2010-06-25 16:56:47 +02:00
|
|
|
handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
|
2011-10-24 06:24:51 +02:00
|
|
|
}
|
2009-08-05 08:49:33 +02:00
|
|
|
rev.diffopt.format_callback = wt_status_collect_changed_cb;
|
|
|
|
rev.diffopt.format_callback_data = s;
|
2010-12-17 13:43:06 +01:00
|
|
|
init_pathspec(&rev.prune_data, s->pathspec);
|
2009-08-05 08:49:33 +02:00
|
|
|
run_diff_files(&rev, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_collect_changes_index(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2010-03-09 07:58:09 +01:00
|
|
|
struct setup_revision_opt opt;
|
2009-08-05 08:49:33 +02:00
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
init_revisions(&rev, NULL);
|
2010-03-09 07:58:09 +01:00
|
|
|
memset(&opt, 0, sizeof(opt));
|
|
|
|
opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
|
|
|
|
setup_revisions(0, NULL, &rev, &opt);
|
|
|
|
|
2010-08-06 00:39:25 +02:00
|
|
|
if (s->ignore_submodule_arg) {
|
|
|
|
DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
|
2010-06-25 16:56:47 +02:00
|
|
|
handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
|
2010-08-06 00:39:25 +02:00
|
|
|
}
|
2010-06-25 16:56:47 +02:00
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
|
2009-08-05 08:49:33 +02:00
|
|
|
rev.diffopt.format_callback = wt_status_collect_updated_cb;
|
2006-09-08 10:05:34 +02:00
|
|
|
rev.diffopt.format_callback_data = s;
|
|
|
|
rev.diffopt.detect_rename = 1;
|
2008-04-30 19:24:43 +02:00
|
|
|
rev.diffopt.rename_limit = 200;
|
2007-12-03 07:58:37 +01:00
|
|
|
rev.diffopt.break_opt = 0;
|
2010-12-17 13:43:06 +01:00
|
|
|
init_pathspec(&rev.prune_data, s->pathspec);
|
2006-09-08 10:05:34 +02:00
|
|
|
run_diff_index(&rev, 1);
|
|
|
|
}
|
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
static void wt_status_collect_changes_initial(struct wt_status *s)
|
|
|
|
{
|
2010-12-17 13:43:07 +01:00
|
|
|
struct pathspec pathspec;
|
2009-08-05 08:49:33 +02:00
|
|
|
int i;
|
|
|
|
|
2010-12-17 13:43:07 +01:00
|
|
|
init_pathspec(&pathspec, s->pathspec);
|
2009-08-05 08:49:33 +02:00
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
struct string_list_item *it;
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
|
|
|
|
2010-12-17 13:43:07 +01:00
|
|
|
if (!ce_path_match(ce, &pathspec))
|
2009-08-08 08:31:57 +02:00
|
|
|
continue;
|
2010-06-26 01:41:35 +02:00
|
|
|
it = string_list_insert(&s->change, ce->name);
|
2009-08-05 08:49:33 +02:00
|
|
|
d = it->util;
|
|
|
|
if (!d) {
|
|
|
|
d = xcalloc(1, sizeof(*d));
|
|
|
|
it->util = d;
|
|
|
|
}
|
2009-08-05 09:04:51 +02:00
|
|
|
if (ce_stage(ce)) {
|
2009-08-05 08:49:33 +02:00
|
|
|
d->index_status = DIFF_STATUS_UNMERGED;
|
2009-08-05 09:04:51 +02:00
|
|
|
d->stagemask |= (1 << (ce_stage(ce) - 1));
|
|
|
|
}
|
2009-08-05 08:49:33 +02:00
|
|
|
else
|
|
|
|
d->index_status = DIFF_STATUS_ADDED;
|
|
|
|
}
|
2010-12-17 13:43:07 +01:00
|
|
|
free_pathspec(&pathspec);
|
2009-08-05 08:49:33 +02:00
|
|
|
}
|
|
|
|
|
2009-08-10 09:36:33 +02:00
|
|
|
static void wt_status_collect_untracked(struct wt_status *s)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct dir_struct dir;
|
2013-03-13 13:59:16 +01:00
|
|
|
struct timeval t_begin;
|
2009-08-10 09:36:33 +02:00
|
|
|
|
|
|
|
if (!s->show_untracked_files)
|
|
|
|
return;
|
2013-03-13 13:59:16 +01:00
|
|
|
|
|
|
|
if (advice_status_u_option)
|
|
|
|
gettimeofday(&t_begin, NULL);
|
|
|
|
|
2009-08-10 09:36:33 +02:00
|
|
|
memset(&dir, 0, sizeof(dir));
|
|
|
|
if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
|
|
|
|
dir.flags |=
|
|
|
|
DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
|
|
|
|
setup_standard_excludes(&dir);
|
|
|
|
|
2010-01-14 16:02:21 +01:00
|
|
|
fill_directory(&dir, s->pathspec);
|
2009-09-01 07:35:10 +02:00
|
|
|
for (i = 0; i < dir.nr; i++) {
|
2009-08-10 09:36:33 +02:00
|
|
|
struct dir_entry *ent = dir.entries[i];
|
2010-09-27 04:49:13 +02:00
|
|
|
if (cache_name_is_other(ent->name, ent->len) &&
|
|
|
|
match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
|
|
|
|
string_list_insert(&s->untracked, ent->name);
|
2010-04-10 08:58:27 +02:00
|
|
|
free(ent);
|
2009-08-10 09:36:33 +02:00
|
|
|
}
|
2010-04-10 08:58:27 +02:00
|
|
|
|
2010-04-10 09:11:53 +02:00
|
|
|
if (s->show_ignored_files) {
|
|
|
|
dir.nr = 0;
|
2012-12-30 15:39:00 +01:00
|
|
|
dir.flags = DIR_SHOW_IGNORED;
|
|
|
|
if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
|
|
|
|
dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
|
2010-04-10 09:11:53 +02:00
|
|
|
fill_directory(&dir, s->pathspec);
|
|
|
|
for (i = 0; i < dir.nr; i++) {
|
|
|
|
struct dir_entry *ent = dir.entries[i];
|
2010-09-27 04:49:13 +02:00
|
|
|
if (cache_name_is_other(ent->name, ent->len) &&
|
|
|
|
match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
|
|
|
|
string_list_insert(&s->ignored, ent->name);
|
2010-04-10 09:11:53 +02:00
|
|
|
free(ent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-04-10 08:58:27 +02:00
|
|
|
free(dir.entries);
|
2013-03-13 13:59:16 +01:00
|
|
|
|
|
|
|
if (advice_status_u_option) {
|
|
|
|
struct timeval t_end;
|
|
|
|
gettimeofday(&t_end, NULL);
|
|
|
|
s->untracked_in_ms =
|
|
|
|
(uint64_t)t_end.tv_sec * 1000 + t_end.tv_usec / 1000 -
|
|
|
|
((uint64_t)t_begin.tv_sec * 1000 + t_begin.tv_usec / 1000);
|
|
|
|
}
|
2009-08-10 09:36:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void wt_status_collect(struct wt_status *s)
|
2009-08-05 08:49:33 +02:00
|
|
|
{
|
|
|
|
wt_status_collect_changes_worktree(s);
|
|
|
|
|
|
|
|
if (s->is_initial)
|
|
|
|
wt_status_collect_changes_initial(s);
|
|
|
|
else
|
|
|
|
wt_status_collect_changes_index(s);
|
2009-08-10 09:36:33 +02:00
|
|
|
wt_status_collect_untracked(s);
|
2009-08-05 08:49:33 +02:00
|
|
|
}
|
|
|
|
|
2009-08-05 09:04:51 +02:00
|
|
|
static void wt_status_print_unmerged(struct wt_status *s)
|
|
|
|
{
|
|
|
|
int shown_header = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < s->change.nr; i++) {
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
struct string_list_item *it;
|
|
|
|
it = &(s->change.items[i]);
|
|
|
|
d = it->util;
|
|
|
|
if (!d->stagemask)
|
|
|
|
continue;
|
|
|
|
if (!shown_header) {
|
|
|
|
wt_status_print_unmerged_header(s);
|
|
|
|
shown_header = 1;
|
|
|
|
}
|
|
|
|
wt_status_print_unmerged_data(s, it);
|
|
|
|
}
|
|
|
|
if (shown_header)
|
|
|
|
wt_status_print_trailer(s);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
static void wt_status_print_updated(struct wt_status *s)
|
|
|
|
{
|
|
|
|
int shown_header = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < s->change.nr; i++) {
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
struct string_list_item *it;
|
|
|
|
it = &(s->change.items[i]);
|
|
|
|
d = it->util;
|
|
|
|
if (!d->index_status ||
|
|
|
|
d->index_status == DIFF_STATUS_UNMERGED)
|
|
|
|
continue;
|
|
|
|
if (!shown_header) {
|
|
|
|
wt_status_print_cached_header(s);
|
|
|
|
s->commitable = 1;
|
|
|
|
shown_header = 1;
|
|
|
|
}
|
|
|
|
wt_status_print_change_data(s, WT_STATUS_UPDATED, it);
|
|
|
|
}
|
|
|
|
if (shown_header)
|
|
|
|
wt_status_print_trailer(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* -1 : has delete
|
|
|
|
* 0 : no change
|
|
|
|
* 1 : some change but no delete
|
|
|
|
*/
|
2010-03-08 13:53:19 +01:00
|
|
|
static int wt_status_check_worktree_changes(struct wt_status *s,
|
|
|
|
int *dirty_submodules)
|
2009-08-05 08:49:33 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int changes = 0;
|
|
|
|
|
2010-03-08 13:53:19 +01:00
|
|
|
*dirty_submodules = 0;
|
|
|
|
|
2009-08-05 08:49:33 +02:00
|
|
|
for (i = 0; i < s->change.nr; i++) {
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
d = s->change.items[i].util;
|
2009-08-05 09:04:51 +02:00
|
|
|
if (!d->worktree_status ||
|
|
|
|
d->worktree_status == DIFF_STATUS_UNMERGED)
|
2009-08-05 08:49:33 +02:00
|
|
|
continue;
|
2010-03-08 13:53:19 +01:00
|
|
|
if (!changes)
|
|
|
|
changes = 1;
|
|
|
|
if (d->dirty_submodule)
|
|
|
|
*dirty_submodules = 1;
|
2009-08-05 08:49:33 +02:00
|
|
|
if (d->worktree_status == DIFF_STATUS_DELETED)
|
2010-03-08 13:53:19 +01:00
|
|
|
changes = -1;
|
2009-08-05 08:49:33 +02:00
|
|
|
}
|
|
|
|
return changes;
|
|
|
|
}
|
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
static void wt_status_print_changed(struct wt_status *s)
|
|
|
|
{
|
2010-03-08 13:53:19 +01:00
|
|
|
int i, dirty_submodules;
|
|
|
|
int worktree_changes = wt_status_check_worktree_changes(s, &dirty_submodules);
|
2009-08-05 08:49:33 +02:00
|
|
|
|
|
|
|
if (!worktree_changes)
|
|
|
|
return;
|
|
|
|
|
2010-03-08 13:53:19 +01:00
|
|
|
wt_status_print_dirty_header(s, worktree_changes < 0, dirty_submodules);
|
2009-08-05 08:49:33 +02:00
|
|
|
|
|
|
|
for (i = 0; i < s->change.nr; i++) {
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
struct string_list_item *it;
|
|
|
|
it = &(s->change.items[i]);
|
|
|
|
d = it->util;
|
2009-08-05 09:04:51 +02:00
|
|
|
if (!d->worktree_status ||
|
|
|
|
d->worktree_status == DIFF_STATUS_UNMERGED)
|
2009-08-05 08:49:33 +02:00
|
|
|
continue;
|
|
|
|
wt_status_print_change_data(s, WT_STATUS_CHANGED, it);
|
|
|
|
}
|
|
|
|
wt_status_print_trailer(s);
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2010-01-17 20:42:31 +01:00
|
|
|
static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitted)
|
2008-04-12 17:05:32 +02:00
|
|
|
{
|
|
|
|
struct child_process sm_summary;
|
|
|
|
char summary_limit[64];
|
|
|
|
char index[PATH_MAX];
|
2010-05-14 11:31:33 +02:00
|
|
|
const char *env[] = { NULL, NULL };
|
|
|
|
const char *argv[8];
|
|
|
|
|
|
|
|
env[0] = index;
|
|
|
|
argv[0] = "submodule";
|
|
|
|
argv[1] = "summary";
|
|
|
|
argv[2] = uncommitted ? "--files" : "--cached";
|
|
|
|
argv[3] = "--for-status";
|
|
|
|
argv[4] = "--summary-limit";
|
|
|
|
argv[5] = summary_limit;
|
|
|
|
argv[6] = uncommitted ? NULL : (s->amend ? "HEAD^" : "HEAD");
|
|
|
|
argv[7] = NULL;
|
2008-04-12 17:05:32 +02:00
|
|
|
|
2009-08-10 06:59:30 +02:00
|
|
|
sprintf(summary_limit, "%d", s->submodule_summary);
|
2008-04-12 17:05:32 +02:00
|
|
|
snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
|
|
|
|
|
|
|
|
memset(&sm_summary, 0, sizeof(sm_summary));
|
|
|
|
sm_summary.argv = argv;
|
|
|
|
sm_summary.env = env;
|
|
|
|
sm_summary.git_cmd = 1;
|
|
|
|
sm_summary.no_stdin = 1;
|
|
|
|
fflush(s->fp);
|
|
|
|
sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */
|
|
|
|
run_command(&sm_summary);
|
|
|
|
}
|
|
|
|
|
2010-04-10 09:19:46 +02:00
|
|
|
static void wt_status_print_other(struct wt_status *s,
|
|
|
|
struct string_list *l,
|
|
|
|
const char *what,
|
|
|
|
const char *how)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
|
|
|
int i;
|
2008-10-09 21:12:12 +02:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2012-04-13 12:54:39 +02:00
|
|
|
static struct string_list output = STRING_LIST_INIT_DUP;
|
|
|
|
struct column_options copts;
|
2006-09-08 10:05:34 +02:00
|
|
|
|
2011-06-02 07:54:49 +02:00
|
|
|
if (!l->nr)
|
2009-08-10 09:36:33 +02:00
|
|
|
return;
|
2006-09-08 10:05:34 +02:00
|
|
|
|
2010-04-10 09:19:46 +02:00
|
|
|
wt_status_print_other_header(s, what, how);
|
|
|
|
|
|
|
|
for (i = 0; i < l->nr; i++) {
|
2009-08-10 09:36:33 +02:00
|
|
|
struct string_list_item *it;
|
2012-04-13 12:54:39 +02:00
|
|
|
const char *path;
|
2010-04-10 09:19:46 +02:00
|
|
|
it = &(l->items[i]);
|
2012-04-13 12:54:39 +02:00
|
|
|
path = quote_path(it->string, strlen(it->string),
|
|
|
|
&buf, s->prefix);
|
|
|
|
if (column_active(s->colopts)) {
|
|
|
|
string_list_append(&output, path);
|
|
|
|
continue;
|
|
|
|
}
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf(s, color(WT_STATUS_HEADER, s), "\t");
|
|
|
|
status_printf_more(s, color(WT_STATUS_UNTRACKED, s),
|
2012-04-13 12:54:39 +02:00
|
|
|
"%s\n", path);
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
2012-04-13 12:54:39 +02:00
|
|
|
|
|
|
|
strbuf_release(&buf);
|
|
|
|
if (!column_active(s->colopts))
|
|
|
|
return;
|
|
|
|
|
|
|
|
strbuf_addf(&buf, "%s#\t%s",
|
|
|
|
color(WT_STATUS_HEADER, s),
|
|
|
|
color(WT_STATUS_UNTRACKED, s));
|
|
|
|
memset(&copts, 0, sizeof(copts));
|
|
|
|
copts.padding = 1;
|
|
|
|
copts.indent = buf.buf;
|
|
|
|
if (want_color(s->use_color))
|
|
|
|
copts.nl = GIT_COLOR_RESET "\n";
|
|
|
|
print_columns(&output, s->colopts, &copts);
|
|
|
|
string_list_clear(&output, 0);
|
2007-11-11 18:35:41 +01:00
|
|
|
strbuf_release(&buf);
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_verbose(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2010-03-09 07:58:09 +01:00
|
|
|
struct setup_revision_opt opt;
|
2007-11-22 03:54:49 +01:00
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
init_revisions(&rev, NULL);
|
2008-12-08 03:54:17 +01:00
|
|
|
DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
|
2010-03-09 07:58:09 +01:00
|
|
|
|
|
|
|
memset(&opt, 0, sizeof(opt));
|
|
|
|
opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
|
|
|
|
setup_revisions(0, NULL, &rev, &opt);
|
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
|
|
|
|
rev.diffopt.detect_rename = 1;
|
2008-03-10 18:58:26 +01:00
|
|
|
rev.diffopt.file = s->fp;
|
|
|
|
rev.diffopt.close_file = 0;
|
2008-10-26 05:49:35 +01:00
|
|
|
/*
|
|
|
|
* If we're not going to stdout, then we definitely don't
|
|
|
|
* want color, since we are going to the commit message
|
|
|
|
* file (and even the "auto" setting won't work, since it
|
|
|
|
* will have checked isatty on stdout).
|
|
|
|
*/
|
|
|
|
if (s->fp != stdout)
|
2011-08-18 07:03:12 +02:00
|
|
|
rev.diffopt.use_color = 0;
|
2006-09-08 10:05:34 +02:00
|
|
|
run_diff_index(&rev, 1);
|
|
|
|
}
|
|
|
|
|
2008-07-02 09:52:16 +02:00
|
|
|
static void wt_status_print_tracking(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
const char *cp, *ep;
|
|
|
|
struct branch *branch;
|
|
|
|
|
|
|
|
assert(s->branch && !s->is_initial);
|
|
|
|
if (prefixcmp(s->branch, "refs/heads/"))
|
|
|
|
return;
|
|
|
|
branch = branch_get(s->branch + 11);
|
|
|
|
if (!format_tracking_info(branch, &sb))
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1)
|
2009-08-10 06:59:30 +02:00
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s),
|
2013-01-16 20:18:48 +01:00
|
|
|
"%c %.*s", comment_line_char,
|
|
|
|
(int)(ep - cp), cp);
|
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
|
|
|
|
comment_line_char);
|
2008-07-02 09:52:16 +02:00
|
|
|
}
|
|
|
|
|
2012-06-05 22:21:24 +02:00
|
|
|
static int has_unmerged(struct wt_status *s)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < s->change.nr; i++) {
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
d = s->change.items[i].util;
|
|
|
|
if (d->stagemask)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void show_merge_in_progress(struct wt_status *s,
|
|
|
|
struct wt_status_state *state,
|
|
|
|
const char *color)
|
|
|
|
{
|
|
|
|
if (has_unmerged(s)) {
|
|
|
|
status_printf_ln(s, color, _("You have unmerged paths."));
|
|
|
|
if (advice_status_hints)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (fix conflicts and run \"git commit\")"));
|
|
|
|
} else {
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("All conflicts fixed but you are still merging."));
|
|
|
|
if (advice_status_hints)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (use \"git commit\" to conclude merge)"));
|
|
|
|
}
|
|
|
|
wt_status_print_trailer(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void show_am_in_progress(struct wt_status *s,
|
|
|
|
struct wt_status_state *state,
|
|
|
|
const char *color)
|
|
|
|
{
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are in the middle of an am session."));
|
|
|
|
if (state->am_empty_patch)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("The current patch is empty."));
|
|
|
|
if (advice_status_hints) {
|
|
|
|
if (!state->am_empty_patch)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (fix conflicts and then run \"git am --resolved\")"));
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (use \"git am --skip\" to skip this patch)"));
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (use \"git am --abort\" to restore the original branch)"));
|
|
|
|
}
|
|
|
|
wt_status_print_trailer(s);
|
|
|
|
}
|
|
|
|
|
2012-06-10 13:17:38 +02:00
|
|
|
static char *read_line_from_git_path(const char *filename)
|
|
|
|
{
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
FILE *fp = fopen(git_path("%s", filename), "r");
|
|
|
|
if (!fp) {
|
|
|
|
strbuf_release(&buf);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
strbuf_getline(&buf, fp, '\n');
|
|
|
|
if (!fclose(fp)) {
|
|
|
|
return strbuf_detach(&buf, NULL);
|
|
|
|
} else {
|
|
|
|
strbuf_release(&buf);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int split_commit_in_progress(struct wt_status *s)
|
|
|
|
{
|
|
|
|
int split_in_progress = 0;
|
|
|
|
char *head = read_line_from_git_path("HEAD");
|
|
|
|
char *orig_head = read_line_from_git_path("ORIG_HEAD");
|
|
|
|
char *rebase_amend = read_line_from_git_path("rebase-merge/amend");
|
|
|
|
char *rebase_orig_head = read_line_from_git_path("rebase-merge/orig-head");
|
|
|
|
|
|
|
|
if (!head || !orig_head || !rebase_amend || !rebase_orig_head ||
|
|
|
|
!s->branch || strcmp(s->branch, "HEAD"))
|
|
|
|
return split_in_progress;
|
|
|
|
|
|
|
|
if (!strcmp(rebase_amend, rebase_orig_head)) {
|
|
|
|
if (strcmp(head, rebase_amend))
|
|
|
|
split_in_progress = 1;
|
|
|
|
} else if (strcmp(orig_head, rebase_orig_head)) {
|
|
|
|
split_in_progress = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!s->amend && !s->nowarn && !s->workdir_dirty)
|
|
|
|
split_in_progress = 0;
|
|
|
|
|
|
|
|
free(head);
|
|
|
|
free(orig_head);
|
|
|
|
free(rebase_amend);
|
|
|
|
free(rebase_orig_head);
|
|
|
|
return split_in_progress;
|
|
|
|
}
|
|
|
|
|
2012-06-05 22:21:24 +02:00
|
|
|
static void show_rebase_in_progress(struct wt_status *s,
|
|
|
|
struct wt_status_state *state,
|
|
|
|
const char *color)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (has_unmerged(s)) {
|
2013-02-03 06:53:27 +01:00
|
|
|
if (state->branch)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently rebasing branch '%s' on '%s'."),
|
|
|
|
state->branch,
|
|
|
|
state->onto);
|
|
|
|
else
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently rebasing."));
|
2012-06-05 22:21:24 +02:00
|
|
|
if (advice_status_hints) {
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (fix conflicts and then run \"git rebase --continue\")"));
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (use \"git rebase --skip\" to skip this patch)"));
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (use \"git rebase --abort\" to check out the original branch)"));
|
|
|
|
}
|
|
|
|
} else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
|
2013-02-03 06:53:27 +01:00
|
|
|
if (state->branch)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently rebasing branch '%s' on '%s'."),
|
|
|
|
state->branch,
|
|
|
|
state->onto);
|
|
|
|
else
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently rebasing."));
|
2012-06-05 22:21:24 +02:00
|
|
|
if (advice_status_hints)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (all conflicts fixed: run \"git rebase --continue\")"));
|
2012-06-10 13:17:38 +02:00
|
|
|
} else if (split_commit_in_progress(s)) {
|
2013-02-03 06:53:27 +01:00
|
|
|
if (state->branch)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently splitting a commit while rebasing branch '%s' on '%s'."),
|
|
|
|
state->branch,
|
|
|
|
state->onto);
|
|
|
|
else
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently splitting a commit during a rebase."));
|
2012-06-10 13:17:38 +02:00
|
|
|
if (advice_status_hints)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (Once your working directory is clean, run \"git rebase --continue\")"));
|
2012-06-05 22:21:24 +02:00
|
|
|
} else {
|
2013-02-03 06:53:27 +01:00
|
|
|
if (state->branch)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently editing a commit while rebasing branch '%s' on '%s'."),
|
|
|
|
state->branch,
|
|
|
|
state->onto);
|
|
|
|
else
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently editing a commit during a rebase."));
|
2012-06-05 22:21:24 +02:00
|
|
|
if (advice_status_hints && !s->amend) {
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (use \"git commit --amend\" to amend the current commit)"));
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (use \"git rebase --continue\" once you are satisfied with your changes)"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
wt_status_print_trailer(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void show_cherry_pick_in_progress(struct wt_status *s,
|
|
|
|
struct wt_status_state *state,
|
|
|
|
const char *color)
|
|
|
|
{
|
|
|
|
status_printf_ln(s, color, _("You are currently cherry-picking."));
|
|
|
|
if (advice_status_hints) {
|
|
|
|
if (has_unmerged(s))
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (fix conflicts and run \"git commit\")"));
|
|
|
|
else
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (all conflicts fixed: run \"git commit\")"));
|
|
|
|
}
|
|
|
|
wt_status_print_trailer(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void show_bisect_in_progress(struct wt_status *s,
|
|
|
|
struct wt_status_state *state,
|
|
|
|
const char *color)
|
|
|
|
{
|
2013-02-03 06:53:27 +01:00
|
|
|
if (state->branch)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently bisecting branch '%s'."),
|
|
|
|
state->branch);
|
|
|
|
else
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_("You are currently bisecting."));
|
2012-06-05 22:21:24 +02:00
|
|
|
if (advice_status_hints)
|
|
|
|
status_printf_ln(s, color,
|
|
|
|
_(" (use \"git bisect reset\" to get back to the original branch)"));
|
|
|
|
wt_status_print_trailer(s);
|
|
|
|
}
|
|
|
|
|
2013-02-03 06:53:27 +01:00
|
|
|
/*
|
|
|
|
* Extract branch information from rebase/bisect
|
|
|
|
*/
|
|
|
|
static void read_and_strip_branch(struct strbuf *sb,
|
|
|
|
const char **branch,
|
|
|
|
const char *path)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
strbuf_reset(sb);
|
|
|
|
if (strbuf_read_file(sb, git_path("%s", path), 0) <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
while (sb->len && sb->buf[sb->len - 1] == '\n')
|
|
|
|
strbuf_setlen(sb, sb->len - 1);
|
|
|
|
if (!sb->len)
|
|
|
|
return;
|
|
|
|
if (!prefixcmp(sb->buf, "refs/heads/"))
|
|
|
|
*branch = sb->buf + strlen("refs/heads/");
|
|
|
|
else if (!prefixcmp(sb->buf, "refs/"))
|
|
|
|
*branch = sb->buf;
|
|
|
|
else if (!get_sha1_hex(sb->buf, sha1)) {
|
|
|
|
const char *abbrev;
|
|
|
|
abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
|
|
|
|
strbuf_reset(sb);
|
|
|
|
strbuf_addstr(sb, abbrev);
|
|
|
|
*branch = sb->buf;
|
|
|
|
} else if (!strcmp(sb->buf, "detached HEAD")) /* rebase */
|
|
|
|
;
|
|
|
|
else /* bisect */
|
|
|
|
*branch = sb->buf;
|
|
|
|
}
|
|
|
|
|
2012-06-05 22:21:24 +02:00
|
|
|
static void wt_status_print_state(struct wt_status *s)
|
|
|
|
{
|
status: color in-progress message like other header messages
The "status" command recently learned to describe the
in-progress operation in its long output format (e.g.,
rebasing, am, etc). This message gets its own slot in the
color table, even though it is not configurable. As a
result, if the user has set color.status.header to a
non-default value, this message will not match (and cannot
be made to match, as there is no config option).
It is probably more sane to just color it like the rest of
the text (i.e., just use color.status.header). This would
not allow users to customize the color of this message
independently, but they cannot do that with the current code
anyway, and if somebody wants to build customizable
colorization later, this patch does not make it much harder
to do so.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-07-16 13:39:54 +02:00
|
|
|
const char *state_color = color(WT_STATUS_HEADER, s);
|
2013-02-03 06:53:27 +01:00
|
|
|
struct strbuf branch = STRBUF_INIT;
|
|
|
|
struct strbuf onto = STRBUF_INIT;
|
2012-06-05 22:21:24 +02:00
|
|
|
struct wt_status_state state;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
memset(&state, 0, sizeof(state));
|
|
|
|
|
|
|
|
if (!stat(git_path("MERGE_HEAD"), &st)) {
|
|
|
|
state.merge_in_progress = 1;
|
|
|
|
} else if (!stat(git_path("rebase-apply"), &st)) {
|
|
|
|
if (!stat(git_path("rebase-apply/applying"), &st)) {
|
|
|
|
state.am_in_progress = 1;
|
|
|
|
if (!stat(git_path("rebase-apply/patch"), &st) && !st.st_size)
|
|
|
|
state.am_empty_patch = 1;
|
|
|
|
} else {
|
|
|
|
state.rebase_in_progress = 1;
|
2013-02-03 06:53:27 +01:00
|
|
|
read_and_strip_branch(&branch, &state.branch,
|
|
|
|
"rebase-apply/head-name");
|
|
|
|
read_and_strip_branch(&onto, &state.onto,
|
|
|
|
"rebase-apply/onto");
|
2012-06-05 22:21:24 +02:00
|
|
|
}
|
|
|
|
} else if (!stat(git_path("rebase-merge"), &st)) {
|
|
|
|
if (!stat(git_path("rebase-merge/interactive"), &st))
|
|
|
|
state.rebase_interactive_in_progress = 1;
|
|
|
|
else
|
|
|
|
state.rebase_in_progress = 1;
|
2013-02-03 06:53:27 +01:00
|
|
|
read_and_strip_branch(&branch, &state.branch,
|
|
|
|
"rebase-merge/head-name");
|
|
|
|
read_and_strip_branch(&onto, &state.onto,
|
|
|
|
"rebase-merge/onto");
|
2012-06-05 22:21:24 +02:00
|
|
|
} else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) {
|
|
|
|
state.cherry_pick_in_progress = 1;
|
|
|
|
}
|
2013-02-03 06:53:27 +01:00
|
|
|
if (!stat(git_path("BISECT_LOG"), &st)) {
|
2012-06-05 22:21:24 +02:00
|
|
|
state.bisect_in_progress = 1;
|
2013-02-03 06:53:27 +01:00
|
|
|
read_and_strip_branch(&branch, &state.branch,
|
|
|
|
"BISECT_START");
|
|
|
|
}
|
2012-06-05 22:21:24 +02:00
|
|
|
|
|
|
|
if (state.merge_in_progress)
|
|
|
|
show_merge_in_progress(s, &state, state_color);
|
|
|
|
else if (state.am_in_progress)
|
|
|
|
show_am_in_progress(s, &state, state_color);
|
|
|
|
else if (state.rebase_in_progress || state.rebase_interactive_in_progress)
|
|
|
|
show_rebase_in_progress(s, &state, state_color);
|
|
|
|
else if (state.cherry_pick_in_progress)
|
|
|
|
show_cherry_pick_in_progress(s, &state, state_color);
|
|
|
|
if (state.bisect_in_progress)
|
|
|
|
show_bisect_in_progress(s, &state, state_color);
|
2013-02-03 06:53:27 +01:00
|
|
|
strbuf_release(&branch);
|
|
|
|
strbuf_release(&onto);
|
2012-06-05 22:21:24 +02:00
|
|
|
}
|
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
void wt_status_print(struct wt_status *s)
|
|
|
|
{
|
2010-11-18 00:40:05 +01:00
|
|
|
const char *branch_color = color(WT_STATUS_ONBRANCH, s);
|
|
|
|
const char *branch_status_color = color(WT_STATUS_HEADER, s);
|
2007-01-02 20:26:23 +01:00
|
|
|
|
2007-01-03 10:09:34 +01:00
|
|
|
if (s->branch) {
|
2011-02-23 00:42:13 +01:00
|
|
|
const char *on_what = _("On branch ");
|
2007-01-03 10:09:34 +01:00
|
|
|
const char *branch_name = s->branch;
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 10:53:29 +01:00
|
|
|
if (!prefixcmp(branch_name, "refs/heads/"))
|
2007-01-03 10:09:34 +01:00
|
|
|
branch_name += 11;
|
|
|
|
else if (!strcmp(branch_name, "HEAD")) {
|
|
|
|
branch_name = "";
|
2010-11-18 00:40:05 +01:00
|
|
|
branch_status_color = color(WT_STATUS_NOBRANCH, s);
|
2011-02-23 00:42:13 +01:00
|
|
|
on_what = _("Not currently on any branch.");
|
2007-01-03 10:09:34 +01:00
|
|
|
}
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf(s, color(WT_STATUS_HEADER, s), "");
|
|
|
|
status_printf_more(s, branch_status_color, "%s", on_what);
|
|
|
|
status_printf_more(s, branch_color, "%s\n", branch_name);
|
2008-07-02 09:52:16 +02:00
|
|
|
if (!s->is_initial)
|
|
|
|
wt_status_print_tracking(s);
|
2007-01-03 10:09:34 +01:00
|
|
|
}
|
2006-09-08 10:05:34 +02:00
|
|
|
|
2012-06-05 22:21:24 +02:00
|
|
|
wt_status_print_state(s);
|
2006-09-08 10:05:34 +02:00
|
|
|
if (s->is_initial) {
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
|
2011-02-23 00:42:17 +01:00
|
|
|
status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
|
2011-02-26 06:11:37 +01:00
|
|
|
status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2008-11-12 09:21:39 +01:00
|
|
|
wt_status_print_updated(s);
|
2009-09-01 22:13:53 +02:00
|
|
|
wt_status_print_unmerged(s);
|
2006-09-08 10:05:34 +02:00
|
|
|
wt_status_print_changed(s);
|
2010-06-25 16:56:47 +02:00
|
|
|
if (s->submodule_summary &&
|
|
|
|
(!s->ignore_submodule_arg ||
|
|
|
|
strcmp(s->ignore_submodule_arg, "all"))) {
|
2010-01-17 20:42:31 +01:00
|
|
|
wt_status_print_submodule_summary(s, 0); /* staged */
|
|
|
|
wt_status_print_submodule_summary(s, 1); /* unstaged */
|
|
|
|
}
|
2010-04-10 09:33:17 +02:00
|
|
|
if (s->show_untracked_files) {
|
2012-09-06 17:16:50 +02:00
|
|
|
wt_status_print_other(s, &s->untracked, _("Untracked files"), "add");
|
2010-04-10 09:33:17 +02:00
|
|
|
if (s->show_ignored_files)
|
2012-09-06 17:16:50 +02:00
|
|
|
wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f");
|
2013-03-13 13:59:16 +01:00
|
|
|
if (advice_status_u_option && 2000 < s->untracked_in_ms) {
|
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL, "");
|
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL,
|
2013-04-12 05:53:01 +02:00
|
|
|
_("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
|
|
|
|
"may speed it up, but you have to be careful not to forget to add\n"
|
|
|
|
"new files yourself (see 'git help status')."),
|
|
|
|
s->untracked_in_ms / 1000.0);
|
2013-03-13 13:59:16 +01:00
|
|
|
}
|
2010-04-10 09:33:17 +02:00
|
|
|
} else if (s->commitable)
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
|
2010-04-22 22:30:20 +02:00
|
|
|
advice_status_hints
|
2011-02-23 00:42:13 +01:00
|
|
|
? _(" (use -u option to show untracked files)") : "");
|
2006-09-08 10:05:34 +02:00
|
|
|
|
2008-11-12 09:23:37 +01:00
|
|
|
if (s->verbose)
|
2006-09-08 10:05:34 +02:00
|
|
|
wt_status_print_verbose(s);
|
2007-01-02 20:26:22 +01:00
|
|
|
if (!s->commitable) {
|
|
|
|
if (s->amend)
|
2011-02-23 00:42:13 +01:00
|
|
|
status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes"));
|
2007-12-13 04:09:16 +01:00
|
|
|
else if (s->nowarn)
|
|
|
|
; /* nothing */
|
2012-09-06 17:16:50 +02:00
|
|
|
else if (s->workdir_dirty) {
|
|
|
|
if (advice_status_hints)
|
|
|
|
printf(_("no changes added to commit "
|
|
|
|
"(use \"git add\" and/or \"git commit -a\")\n"));
|
|
|
|
else
|
|
|
|
printf(_("no changes added to commit\n"));
|
|
|
|
} else if (s->untracked.nr) {
|
|
|
|
if (advice_status_hints)
|
|
|
|
printf(_("nothing added to commit but untracked files "
|
|
|
|
"present (use \"git add\" to track)\n"));
|
|
|
|
else
|
|
|
|
printf(_("nothing added to commit but untracked files present\n"));
|
|
|
|
} else if (s->is_initial) {
|
|
|
|
if (advice_status_hints)
|
|
|
|
printf(_("nothing to commit (create/copy files "
|
|
|
|
"and use \"git add\" to track)\n"));
|
|
|
|
else
|
|
|
|
printf(_("nothing to commit\n"));
|
|
|
|
} else if (!s->show_untracked_files) {
|
|
|
|
if (advice_status_hints)
|
|
|
|
printf(_("nothing to commit (use -u to show untracked files)\n"));
|
|
|
|
else
|
|
|
|
printf(_("nothing to commit\n"));
|
|
|
|
} else
|
|
|
|
printf(_("nothing to commit, working directory clean\n"));
|
2007-01-02 20:26:22 +01:00
|
|
|
}
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
2009-12-05 16:04:37 +01:00
|
|
|
|
2012-05-07 21:44:44 +02:00
|
|
|
static void wt_shortstatus_unmerged(struct string_list_item *it,
|
2009-12-05 16:04:37 +01:00
|
|
|
struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct wt_status_change_data *d = it->util;
|
|
|
|
const char *how = "??";
|
|
|
|
|
|
|
|
switch (d->stagemask) {
|
|
|
|
case 1: how = "DD"; break; /* both deleted */
|
|
|
|
case 2: how = "AU"; break; /* added by us */
|
|
|
|
case 3: how = "UD"; break; /* deleted by them */
|
|
|
|
case 4: how = "UA"; break; /* added by them */
|
|
|
|
case 5: how = "DU"; break; /* deleted by us */
|
|
|
|
case 6: how = "AA"; break; /* both added */
|
|
|
|
case 7: how = "UU"; break; /* both modified */
|
|
|
|
}
|
2009-12-05 16:04:38 +01:00
|
|
|
color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
|
2012-05-07 21:44:44 +02:00
|
|
|
if (s->null_termination) {
|
2009-12-05 16:04:38 +01:00
|
|
|
fprintf(stdout, " %s%c", it->string, 0);
|
2009-12-05 16:04:37 +01:00
|
|
|
} else {
|
|
|
|
struct strbuf onebuf = STRBUF_INIT;
|
|
|
|
const char *one;
|
|
|
|
one = quote_path(it->string, -1, &onebuf, s->prefix);
|
2009-12-05 16:04:38 +01:00
|
|
|
printf(" %s\n", one);
|
2009-12-05 16:04:37 +01:00
|
|
|
strbuf_release(&onebuf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-07 21:44:44 +02:00
|
|
|
static void wt_shortstatus_status(struct string_list_item *it,
|
2009-12-05 16:04:37 +01:00
|
|
|
struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct wt_status_change_data *d = it->util;
|
|
|
|
|
2009-12-05 16:04:38 +01:00
|
|
|
if (d->index_status)
|
|
|
|
color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
|
|
|
|
else
|
|
|
|
putchar(' ');
|
|
|
|
if (d->worktree_status)
|
|
|
|
color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
|
|
|
|
else
|
|
|
|
putchar(' ');
|
|
|
|
putchar(' ');
|
2012-05-07 21:44:44 +02:00
|
|
|
if (s->null_termination) {
|
2009-12-05 16:04:37 +01:00
|
|
|
fprintf(stdout, "%s%c", it->string, 0);
|
|
|
|
if (d->head_path)
|
|
|
|
fprintf(stdout, "%s%c", d->head_path, 0);
|
|
|
|
} else {
|
|
|
|
struct strbuf onebuf = STRBUF_INIT;
|
|
|
|
const char *one;
|
|
|
|
if (d->head_path) {
|
|
|
|
one = quote_path(d->head_path, -1, &onebuf, s->prefix);
|
2010-11-09 03:44:38 +01:00
|
|
|
if (*one != '"' && strchr(one, ' ') != NULL) {
|
|
|
|
putchar('"');
|
|
|
|
strbuf_addch(&onebuf, '"');
|
|
|
|
one = onebuf.buf;
|
|
|
|
}
|
2009-12-05 16:04:37 +01:00
|
|
|
printf("%s -> ", one);
|
|
|
|
strbuf_release(&onebuf);
|
|
|
|
}
|
|
|
|
one = quote_path(it->string, -1, &onebuf, s->prefix);
|
2010-11-09 03:44:38 +01:00
|
|
|
if (*one != '"' && strchr(one, ' ') != NULL) {
|
|
|
|
putchar('"');
|
|
|
|
strbuf_addch(&onebuf, '"');
|
|
|
|
one = onebuf.buf;
|
|
|
|
}
|
2009-12-05 16:04:37 +01:00
|
|
|
printf("%s\n", one);
|
|
|
|
strbuf_release(&onebuf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-07 21:44:44 +02:00
|
|
|
static void wt_shortstatus_other(struct string_list_item *it,
|
2010-04-10 09:33:17 +02:00
|
|
|
struct wt_status *s, const char *sign)
|
2009-12-05 16:04:37 +01:00
|
|
|
{
|
2012-05-07 21:44:44 +02:00
|
|
|
if (s->null_termination) {
|
2010-04-10 09:33:17 +02:00
|
|
|
fprintf(stdout, "%s %s%c", sign, it->string, 0);
|
2009-12-05 16:04:37 +01:00
|
|
|
} else {
|
|
|
|
struct strbuf onebuf = STRBUF_INIT;
|
|
|
|
const char *one;
|
|
|
|
one = quote_path(it->string, -1, &onebuf, s->prefix);
|
2010-05-02 07:05:14 +02:00
|
|
|
color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
|
2009-12-05 16:04:38 +01:00
|
|
|
printf(" %s\n", one);
|
2009-12-05 16:04:37 +01:00
|
|
|
strbuf_release(&onebuf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-25 15:45:51 +02:00
|
|
|
static void wt_shortstatus_print_tracking(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct branch *branch;
|
|
|
|
const char *header_color = color(WT_STATUS_HEADER, s);
|
|
|
|
const char *branch_color_local = color(WT_STATUS_LOCAL_BRANCH, s);
|
|
|
|
const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
|
|
|
|
|
|
|
|
const char *base;
|
|
|
|
const char *branch_name;
|
|
|
|
int num_ours, num_theirs;
|
|
|
|
|
|
|
|
color_fprintf(s->fp, color(WT_STATUS_HEADER, s), "## ");
|
|
|
|
|
|
|
|
if (!s->branch)
|
|
|
|
return;
|
|
|
|
branch_name = s->branch;
|
|
|
|
|
|
|
|
if (!prefixcmp(branch_name, "refs/heads/"))
|
|
|
|
branch_name += 11;
|
|
|
|
else if (!strcmp(branch_name, "HEAD")) {
|
2011-02-23 00:42:15 +01:00
|
|
|
branch_name = _("HEAD (no branch)");
|
2010-05-25 15:45:51 +02:00
|
|
|
branch_color_local = color(WT_STATUS_NOBRANCH, s);
|
|
|
|
}
|
|
|
|
|
|
|
|
branch = branch_get(s->branch + 11);
|
|
|
|
if (s->is_initial)
|
2011-02-23 00:42:15 +01:00
|
|
|
color_fprintf(s->fp, header_color, _("Initial commit on "));
|
2010-05-25 15:45:51 +02:00
|
|
|
if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
|
2012-05-07 23:02:18 +02:00
|
|
|
color_fprintf(s->fp, branch_color_local, "%s", branch_name);
|
|
|
|
fputc(s->null_termination ? '\0' : '\n', s->fp);
|
2010-05-25 15:45:51 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
base = branch->merge[0]->dst;
|
|
|
|
base = shorten_unambiguous_ref(base, 0);
|
|
|
|
color_fprintf(s->fp, branch_color_local, "%s", branch_name);
|
|
|
|
color_fprintf(s->fp, header_color, "...");
|
|
|
|
color_fprintf(s->fp, branch_color_remote, "%s", base);
|
|
|
|
|
|
|
|
color_fprintf(s->fp, header_color, " [");
|
|
|
|
if (!num_ours) {
|
2011-02-23 00:42:15 +01:00
|
|
|
color_fprintf(s->fp, header_color, _("behind "));
|
2010-05-25 15:45:51 +02:00
|
|
|
color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
|
|
|
|
} else if (!num_theirs) {
|
2011-02-23 00:42:15 +01:00
|
|
|
color_fprintf(s->fp, header_color, _("ahead "));
|
2010-05-25 15:45:51 +02:00
|
|
|
color_fprintf(s->fp, branch_color_local, "%d", num_ours);
|
|
|
|
} else {
|
2011-02-23 00:42:15 +01:00
|
|
|
color_fprintf(s->fp, header_color, _("ahead "));
|
2010-05-25 15:45:51 +02:00
|
|
|
color_fprintf(s->fp, branch_color_local, "%d", num_ours);
|
2011-02-23 00:42:15 +01:00
|
|
|
color_fprintf(s->fp, header_color, _(", behind "));
|
2010-05-25 15:45:51 +02:00
|
|
|
color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
|
|
|
|
}
|
|
|
|
|
2012-05-07 23:02:18 +02:00
|
|
|
color_fprintf(s->fp, header_color, "]");
|
|
|
|
fputc(s->null_termination ? '\0' : '\n', s->fp);
|
2010-05-25 15:45:51 +02:00
|
|
|
}
|
|
|
|
|
2012-05-07 23:09:04 +02:00
|
|
|
void wt_shortstatus_print(struct wt_status *s)
|
2009-12-05 16:04:37 +01:00
|
|
|
{
|
|
|
|
int i;
|
2010-05-25 15:45:51 +02:00
|
|
|
|
2012-05-07 23:09:04 +02:00
|
|
|
if (s->show_branch)
|
2010-05-25 15:45:51 +02:00
|
|
|
wt_shortstatus_print_tracking(s);
|
|
|
|
|
2009-12-05 16:04:37 +01:00
|
|
|
for (i = 0; i < s->change.nr; i++) {
|
|
|
|
struct wt_status_change_data *d;
|
|
|
|
struct string_list_item *it;
|
|
|
|
|
|
|
|
it = &(s->change.items[i]);
|
|
|
|
d = it->util;
|
|
|
|
if (d->stagemask)
|
2012-05-07 21:44:44 +02:00
|
|
|
wt_shortstatus_unmerged(it, s);
|
2009-12-05 16:04:37 +01:00
|
|
|
else
|
2012-05-07 21:44:44 +02:00
|
|
|
wt_shortstatus_status(it, s);
|
2009-12-05 16:04:37 +01:00
|
|
|
}
|
|
|
|
for (i = 0; i < s->untracked.nr; i++) {
|
|
|
|
struct string_list_item *it;
|
|
|
|
|
|
|
|
it = &(s->untracked.items[i]);
|
2012-05-07 21:44:44 +02:00
|
|
|
wt_shortstatus_other(it, s, "??");
|
2010-04-10 09:33:17 +02:00
|
|
|
}
|
|
|
|
for (i = 0; i < s->ignored.nr; i++) {
|
|
|
|
struct string_list_item *it;
|
|
|
|
|
|
|
|
it = &(s->ignored.items[i]);
|
2012-05-07 21:44:44 +02:00
|
|
|
wt_shortstatus_other(it, s, "!!");
|
2009-12-05 16:04:37 +01:00
|
|
|
}
|
|
|
|
}
|
2009-12-07 06:17:15 +01:00
|
|
|
|
2012-05-07 21:44:44 +02:00
|
|
|
void wt_porcelain_print(struct wt_status *s)
|
2009-12-07 06:17:15 +01:00
|
|
|
{
|
|
|
|
s->use_color = 0;
|
2009-12-07 06:26:25 +01:00
|
|
|
s->relative_paths = 0;
|
|
|
|
s->prefix = NULL;
|
2012-05-07 23:09:04 +02:00
|
|
|
wt_shortstatus_print(s);
|
2009-12-07 06:17:15 +01:00
|
|
|
}
|