2006-12-19 23:34:12 +01:00
|
|
|
#include "cache.h"
|
2006-09-08 10:05:34 +02:00
|
|
|
#include "wt-status.h"
|
|
|
|
#include "color.h"
|
|
|
|
#include "object.h"
|
|
|
|
#include "dir.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
|
|
|
#include "diffcore.h"
|
|
|
|
|
|
|
|
int wt_status_use_color = 0;
|
|
|
|
static char wt_status_colors[][COLOR_MAXLEN] = {
|
|
|
|
"", /* WT_STATUS_HEADER: normal */
|
|
|
|
"\033[32m", /* WT_STATUS_UPDATED: green */
|
|
|
|
"\033[31m", /* WT_STATUS_CHANGED: red */
|
|
|
|
"\033[31m", /* WT_STATUS_UNTRACKED: red */
|
|
|
|
};
|
2007-01-02 20:26:20 +01:00
|
|
|
static const char* use_add_msg = "use \"git add <file>...\" to incrementally add content to commit";
|
2006-09-08 10:05:34 +02:00
|
|
|
|
|
|
|
static int parse_status_slot(const char *var, int offset)
|
|
|
|
{
|
|
|
|
if (!strcasecmp(var+offset, "header"))
|
|
|
|
return WT_STATUS_HEADER;
|
2006-12-16 03:53:13 +01:00
|
|
|
if (!strcasecmp(var+offset, "updated")
|
|
|
|
|| !strcasecmp(var+offset, "added"))
|
2006-09-08 10:05:34 +02:00
|
|
|
return WT_STATUS_UPDATED;
|
|
|
|
if (!strcasecmp(var+offset, "changed"))
|
|
|
|
return WT_STATUS_CHANGED;
|
|
|
|
if (!strcasecmp(var+offset, "untracked"))
|
|
|
|
return WT_STATUS_UNTRACKED;
|
|
|
|
die("bad config variable '%s'", var);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char* color(int slot)
|
|
|
|
{
|
|
|
|
return wt_status_use_color ? wt_status_colors[slot] : "";
|
|
|
|
}
|
|
|
|
|
|
|
|
void wt_status_prepare(struct wt_status *s)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
const char *head;
|
|
|
|
|
2006-09-21 07:02:01 +02:00
|
|
|
head = resolve_ref("HEAD", sha1, 0, NULL);
|
2006-09-18 04:13:56 +02:00
|
|
|
s->branch = head ? xstrdup(head) : NULL;
|
2006-09-08 10:05:34 +02:00
|
|
|
|
|
|
|
s->reference = "HEAD";
|
|
|
|
s->amend = 0;
|
|
|
|
s->verbose = 0;
|
|
|
|
s->commitable = 0;
|
2006-09-12 22:45:12 +02:00
|
|
|
s->untracked = 0;
|
2007-01-02 20:26:22 +01:00
|
|
|
|
|
|
|
s->workdir_clean = 1;
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
2007-01-02 20:26:21 +01:00
|
|
|
static void wt_status_print_cached_header(const char *reference)
|
|
|
|
{
|
|
|
|
const char *c = color(WT_STATUS_HEADER);
|
|
|
|
color_printf_ln(c, "# Cached changes to be committed:");
|
|
|
|
if (reference) {
|
|
|
|
color_printf_ln(c, "# (use \"git reset %s <file>...\" and \"git rm --cached <file>...\" to unstage)", reference);
|
|
|
|
} else {
|
|
|
|
color_printf_ln(c, "# (use \"git rm --cached <file>...\" to unstage)");
|
|
|
|
}
|
|
|
|
color_printf_ln(c, "#");
|
|
|
|
}
|
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
static void wt_status_print_header(const char *main, const char *sub)
|
|
|
|
{
|
|
|
|
const char *c = color(WT_STATUS_HEADER);
|
|
|
|
color_printf_ln(c, "# %s:", main);
|
|
|
|
color_printf_ln(c, "# (%s)", sub);
|
|
|
|
color_printf_ln(c, "#");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_trailer(void)
|
|
|
|
{
|
|
|
|
color_printf_ln(color(WT_STATUS_HEADER), "#");
|
|
|
|
}
|
|
|
|
|
2006-11-08 22:20:46 +01:00
|
|
|
static const char *quote_crlf(const char *in, char *buf, size_t sz)
|
|
|
|
{
|
|
|
|
const char *scan;
|
|
|
|
char *out;
|
|
|
|
const char *ret = in;
|
|
|
|
|
|
|
|
for (scan = in, out = buf; *scan; scan++) {
|
|
|
|
int ch = *scan;
|
|
|
|
int quoted;
|
|
|
|
|
|
|
|
switch (ch) {
|
|
|
|
case '\n':
|
|
|
|
quoted = 'n';
|
|
|
|
break;
|
|
|
|
case '\r':
|
|
|
|
quoted = 'r';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
*out++ = ch;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
*out++ = '\\';
|
|
|
|
*out++ = quoted;
|
|
|
|
ret = buf;
|
|
|
|
}
|
|
|
|
*out = '\0';
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
static void wt_status_print_filepair(int t, struct diff_filepair *p)
|
|
|
|
{
|
|
|
|
const char *c = color(t);
|
2006-11-08 22:20:46 +01:00
|
|
|
const char *one, *two;
|
|
|
|
char onebuf[PATH_MAX], twobuf[PATH_MAX];
|
|
|
|
|
|
|
|
one = quote_crlf(p->one->path, onebuf, sizeof(onebuf));
|
|
|
|
two = quote_crlf(p->two->path, twobuf, sizeof(twobuf));
|
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
color_printf(color(WT_STATUS_HEADER), "#\t");
|
|
|
|
switch (p->status) {
|
|
|
|
case DIFF_STATUS_ADDED:
|
2006-11-08 22:20:46 +01:00
|
|
|
color_printf(c, "new file: %s", one);
|
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_COPIED:
|
2006-11-08 22:20:46 +01:00
|
|
|
color_printf(c, "copied: %s -> %s", one, two);
|
2006-09-08 10:05:34 +02:00
|
|
|
break;
|
|
|
|
case DIFF_STATUS_DELETED:
|
2006-11-08 22:20:46 +01:00
|
|
|
color_printf(c, "deleted: %s", one);
|
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_MODIFIED:
|
2006-11-08 22:20:46 +01:00
|
|
|
color_printf(c, "modified: %s", one);
|
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_RENAMED:
|
2006-11-08 22:20:46 +01:00
|
|
|
color_printf(c, "renamed: %s -> %s", one, two);
|
2006-09-08 10:05:34 +02:00
|
|
|
break;
|
|
|
|
case DIFF_STATUS_TYPE_CHANGED:
|
2006-11-08 22:20:46 +01:00
|
|
|
color_printf(c, "typechange: %s", one);
|
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_UNKNOWN:
|
2006-11-08 22:20:46 +01:00
|
|
|
color_printf(c, "unknown: %s", one);
|
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
case DIFF_STATUS_UNMERGED:
|
2006-11-08 22:20:46 +01:00
|
|
|
color_printf(c, "unmerged: %s", one);
|
|
|
|
break;
|
2006-09-08 10:05:34 +02:00
|
|
|
default:
|
|
|
|
die("bug: unhandled diff status %c", p->status);
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_updated_cb(struct diff_queue_struct *q,
|
|
|
|
struct diff_options *options,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct wt_status *s = data;
|
|
|
|
int shown_header = 0;
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < q->nr; i++) {
|
|
|
|
if (q->queue[i]->status == 'U')
|
|
|
|
continue;
|
|
|
|
if (!shown_header) {
|
2007-01-02 20:26:21 +01:00
|
|
|
wt_status_print_cached_header(s->reference);
|
2006-09-08 10:05:34 +02:00
|
|
|
s->commitable = 1;
|
|
|
|
shown_header = 1;
|
|
|
|
}
|
|
|
|
wt_status_print_filepair(WT_STATUS_UPDATED, q->queue[i]);
|
|
|
|
}
|
|
|
|
if (shown_header)
|
|
|
|
wt_status_print_trailer();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_changed_cb(struct diff_queue_struct *q,
|
|
|
|
struct diff_options *options,
|
|
|
|
void *data)
|
|
|
|
{
|
2007-01-02 20:26:22 +01:00
|
|
|
struct wt_status *s = data;
|
2006-09-08 10:05:34 +02:00
|
|
|
int i;
|
2007-01-02 20:26:22 +01:00
|
|
|
if (q->nr) {
|
|
|
|
s->workdir_clean = 0;
|
2006-12-16 03:53:13 +01:00
|
|
|
wt_status_print_header("Changed but not added", use_add_msg);
|
2007-01-02 20:26:22 +01:00
|
|
|
}
|
2006-09-08 10:05:34 +02:00
|
|
|
for (i = 0; i < q->nr; i++)
|
|
|
|
wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]);
|
|
|
|
if (q->nr)
|
|
|
|
wt_status_print_trailer();
|
|
|
|
}
|
|
|
|
|
|
|
|
void wt_status_print_initial(struct wt_status *s)
|
|
|
|
{
|
|
|
|
int i;
|
2006-11-08 22:20:46 +01:00
|
|
|
char buf[PATH_MAX];
|
|
|
|
|
2006-09-08 10:05:34 +02:00
|
|
|
read_cache();
|
|
|
|
if (active_nr) {
|
|
|
|
s->commitable = 1;
|
2007-01-02 20:26:21 +01:00
|
|
|
wt_status_print_cached_header(NULL);
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
color_printf(color(WT_STATUS_HEADER), "#\t");
|
|
|
|
color_printf_ln(color(WT_STATUS_UPDATED), "new file: %s",
|
2006-11-08 22:20:46 +01:00
|
|
|
quote_crlf(active_cache[i]->name,
|
|
|
|
buf, sizeof(buf)));
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
if (active_nr)
|
|
|
|
wt_status_print_trailer();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_updated(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
init_revisions(&rev, NULL);
|
2006-11-05 23:22:15 +01:00
|
|
|
setup_revisions(0, NULL, &rev, s->reference);
|
2006-09-08 10:05:34 +02:00
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
|
|
|
|
rev.diffopt.format_callback = wt_status_print_updated_cb;
|
|
|
|
rev.diffopt.format_callback_data = s;
|
|
|
|
rev.diffopt.detect_rename = 1;
|
|
|
|
run_diff_index(&rev, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_changed(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
init_revisions(&rev, "");
|
2006-11-05 23:22:15 +01:00
|
|
|
setup_revisions(0, NULL, &rev, NULL);
|
2006-09-08 10:05:34 +02:00
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
|
|
|
|
rev.diffopt.format_callback = wt_status_print_changed_cb;
|
|
|
|
rev.diffopt.format_callback_data = s;
|
|
|
|
run_diff_files(&rev, 0);
|
|
|
|
}
|
|
|
|
|
2007-01-02 20:26:22 +01:00
|
|
|
static void wt_status_print_untracked(struct wt_status *s)
|
2006-09-08 10:05:34 +02:00
|
|
|
{
|
|
|
|
struct dir_struct dir;
|
|
|
|
const char *x;
|
|
|
|
int i;
|
|
|
|
int shown_header = 0;
|
|
|
|
|
|
|
|
memset(&dir, 0, sizeof(dir));
|
|
|
|
|
|
|
|
dir.exclude_per_dir = ".gitignore";
|
2006-09-12 22:45:12 +02:00
|
|
|
if (!s->untracked) {
|
|
|
|
dir.show_other_directories = 1;
|
|
|
|
dir.hide_empty_directories = 1;
|
|
|
|
}
|
2006-09-08 10:05:34 +02:00
|
|
|
x = git_path("info/exclude");
|
|
|
|
if (file_exists(x))
|
|
|
|
add_excludes_from_file(&dir, x);
|
|
|
|
|
|
|
|
read_directory(&dir, ".", "", 0);
|
|
|
|
for(i = 0; i < dir.nr; i++) {
|
|
|
|
/* check for matching entry, which is unmerged; lifted from
|
|
|
|
* builtin-ls-files:show_other_files */
|
|
|
|
struct dir_entry *ent = dir.entries[i];
|
|
|
|
int pos = cache_name_pos(ent->name, ent->len);
|
|
|
|
struct cache_entry *ce;
|
|
|
|
if (0 <= pos)
|
|
|
|
die("bug in wt_status_print_untracked");
|
|
|
|
pos = -pos - 1;
|
|
|
|
if (pos < active_nr) {
|
|
|
|
ce = active_cache[pos];
|
|
|
|
if (ce_namelen(ce) == ent->len &&
|
|
|
|
!memcmp(ce->name, ent->name, ent->len))
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!shown_header) {
|
2007-01-02 20:26:22 +01:00
|
|
|
s->workdir_clean = 0;
|
2006-12-16 03:53:09 +01:00
|
|
|
wt_status_print_header("Untracked files", use_add_msg);
|
2006-09-08 10:05:34 +02:00
|
|
|
shown_header = 1;
|
|
|
|
}
|
|
|
|
color_printf(color(WT_STATUS_HEADER), "#\t");
|
|
|
|
color_printf_ln(color(WT_STATUS_UNTRACKED), "%.*s",
|
|
|
|
ent->len, ent->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_verbose(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
init_revisions(&rev, NULL);
|
2006-11-05 23:22:15 +01:00
|
|
|
setup_revisions(0, NULL, &rev, s->reference);
|
2006-09-08 10:05:34 +02:00
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
|
|
|
|
rev.diffopt.detect_rename = 1;
|
|
|
|
run_diff_index(&rev, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void wt_status_print(struct wt_status *s)
|
|
|
|
{
|
2007-01-02 20:26:23 +01:00
|
|
|
unsigned char sha1[20];
|
|
|
|
s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
|
|
|
|
|
2006-12-14 16:25:23 +01:00
|
|
|
if (s->branch)
|
2006-09-08 10:05:34 +02:00
|
|
|
color_printf_ln(color(WT_STATUS_HEADER),
|
|
|
|
"# On branch %s", s->branch);
|
|
|
|
|
|
|
|
if (s->is_initial) {
|
|
|
|
color_printf_ln(color(WT_STATUS_HEADER), "#");
|
|
|
|
color_printf_ln(color(WT_STATUS_HEADER), "# Initial commit");
|
|
|
|
color_printf_ln(color(WT_STATUS_HEADER), "#");
|
|
|
|
wt_status_print_initial(s);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
wt_status_print_updated(s);
|
|
|
|
discard_cache();
|
|
|
|
}
|
|
|
|
|
|
|
|
wt_status_print_changed(s);
|
|
|
|
wt_status_print_untracked(s);
|
|
|
|
|
|
|
|
if (s->verbose && !s->is_initial)
|
|
|
|
wt_status_print_verbose(s);
|
2007-01-02 20:26:22 +01:00
|
|
|
if (!s->commitable) {
|
|
|
|
if (s->amend)
|
|
|
|
printf("# No changes\n");
|
|
|
|
else if (s->workdir_clean)
|
|
|
|
printf(s->is_initial
|
|
|
|
? "nothing to commit\n"
|
|
|
|
: "nothing to commit (working directory matches HEAD)\n");
|
|
|
|
else
|
|
|
|
printf("no changes added to commit (use \"git add\" and/or \"git commit [-a|-i|-o]\")\n");
|
|
|
|
}
|
2006-09-08 10:05:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int git_status_config(const char *k, const char *v)
|
|
|
|
{
|
2006-12-13 10:13:28 +01:00
|
|
|
if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
|
2006-09-08 10:05:34 +02:00
|
|
|
wt_status_use_color = git_config_colorbool(k, v);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-12-13 10:13:28 +01:00
|
|
|
if (!strncmp(k, "status.color.", 13) || !strncmp(k, "color.status", 13)) {
|
2006-09-08 10:05:34 +02:00
|
|
|
int slot = parse_status_slot(k, 13);
|
|
|
|
color_parse(v, k, wt_status_colors[slot]);
|
|
|
|
}
|
|
|
|
return git_default_config(k, v);
|
|
|
|
}
|