2006-12-19 22:34:12 +00:00
|
|
|
#include "cache.h"
|
2006-09-08 08:05:34 +00: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-11 23:34:41 +00:00
|
|
|
|
|
|
|
static const char use_add_msg[] =
|
|
|
|
"use \"git add <file>...\" to update what will be committed";
|
|
|
|
static const char use_add_rm_msg[] =
|
|
|
|
"use \"git add/rm <file>...\" to update what will be committed";
|
|
|
|
static const char use_add_to_include_msg[] =
|
|
|
|
"use \"git add <file>...\" to include in what will be committed";
|
2006-09-08 08:05:34 +00:00
|
|
|
|
|
|
|
static int parse_status_slot(const char *var, int offset)
|
|
|
|
{
|
|
|
|
if (!strcasecmp(var+offset, "header"))
|
|
|
|
return WT_STATUS_HEADER;
|
2006-12-16 02:53:13 +00:00
|
|
|
if (!strcasecmp(var+offset, "updated")
|
|
|
|
|| !strcasecmp(var+offset, "added"))
|
2006-09-08 08:05:34 +00: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;
|
|
|
|
|
2007-02-10 00:22:42 +00:00
|
|
|
memset(s, 0, sizeof(*s));
|
2006-09-21 05:02:01 +00:00
|
|
|
head = resolve_ref("HEAD", sha1, 0, NULL);
|
2006-09-18 02:13:56 +00:00
|
|
|
s->branch = head ? xstrdup(head) : NULL;
|
2006-09-08 08:05:34 +00:00
|
|
|
s->reference = "HEAD";
|
|
|
|
}
|
|
|
|
|
2007-01-02 19:26:21 +00:00
|
|
|
static void wt_status_print_cached_header(const char *reference)
|
|
|
|
{
|
|
|
|
const char *c = color(WT_STATUS_HEADER);
|
2007-01-07 19:18:26 +00:00
|
|
|
color_printf_ln(c, "# Changes to be committed:");
|
2007-01-02 19:26:21 +00:00
|
|
|
if (reference) {
|
2007-01-07 19:18:26 +00:00
|
|
|
color_printf_ln(c, "# (use \"git reset %s <file>...\" to unstage)", reference);
|
2007-01-02 19:26:21 +00:00
|
|
|
} else {
|
|
|
|
color_printf_ln(c, "# (use \"git rm --cached <file>...\" to unstage)");
|
|
|
|
}
|
|
|
|
color_printf_ln(c, "#");
|
|
|
|
}
|
|
|
|
|
2006-09-08 08:05:34 +00: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 21:20:46 +00: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 08:05:34 +00:00
|
|
|
static void wt_status_print_filepair(int t, struct diff_filepair *p)
|
|
|
|
{
|
|
|
|
const char *c = color(t);
|
2006-11-08 21:20:46 +00: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 08:05:34 +00:00
|
|
|
color_printf(color(WT_STATUS_HEADER), "#\t");
|
|
|
|
switch (p->status) {
|
|
|
|
case DIFF_STATUS_ADDED:
|
2006-11-08 21:20:46 +00:00
|
|
|
color_printf(c, "new file: %s", one);
|
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_COPIED:
|
2006-11-08 21:20:46 +00:00
|
|
|
color_printf(c, "copied: %s -> %s", one, two);
|
2006-09-08 08:05:34 +00:00
|
|
|
break;
|
|
|
|
case DIFF_STATUS_DELETED:
|
2006-11-08 21:20:46 +00:00
|
|
|
color_printf(c, "deleted: %s", one);
|
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_MODIFIED:
|
2006-11-08 21:20:46 +00:00
|
|
|
color_printf(c, "modified: %s", one);
|
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_RENAMED:
|
2006-11-08 21:20:46 +00:00
|
|
|
color_printf(c, "renamed: %s -> %s", one, two);
|
2006-09-08 08:05:34 +00:00
|
|
|
break;
|
|
|
|
case DIFF_STATUS_TYPE_CHANGED:
|
2006-11-08 21:20:46 +00:00
|
|
|
color_printf(c, "typechange: %s", one);
|
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_UNKNOWN:
|
2006-11-08 21:20:46 +00:00
|
|
|
color_printf(c, "unknown: %s", one);
|
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_UNMERGED:
|
2006-11-08 21:20:46 +00:00
|
|
|
color_printf(c, "unmerged: %s", one);
|
|
|
|
break;
|
2006-09-08 08:05:34 +00: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 19:26:21 +00:00
|
|
|
wt_status_print_cached_header(s->reference);
|
2006-09-08 08:05:34 +00: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 19:26:22 +00:00
|
|
|
struct wt_status *s = data;
|
2006-09-08 08:05:34 +00:00
|
|
|
int i;
|
2007-01-02 19:26:22 +00:00
|
|
|
if (q->nr) {
|
2007-01-11 23:34:41 +00:00
|
|
|
const char *msg = use_add_msg;
|
2007-01-10 22:25:03 +00:00
|
|
|
s->workdir_dirty = 1;
|
2007-01-11 23:34:41 +00:00
|
|
|
for (i = 0; i < q->nr; i++)
|
|
|
|
if (q->queue[i]->status == DIFF_STATUS_DELETED) {
|
|
|
|
msg = use_add_rm_msg;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
wt_status_print_header("Changed but not updated", msg);
|
2007-01-02 19:26:22 +00:00
|
|
|
}
|
2006-09-08 08:05:34 +00: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();
|
|
|
|
}
|
|
|
|
|
2007-02-10 02:51:40 +00:00
|
|
|
static void wt_read_cache(struct wt_status *s)
|
|
|
|
{
|
|
|
|
discard_cache();
|
|
|
|
read_cache();
|
|
|
|
}
|
|
|
|
|
2006-09-08 08:05:34 +00:00
|
|
|
void wt_status_print_initial(struct wt_status *s)
|
|
|
|
{
|
|
|
|
int i;
|
2006-11-08 21:20:46 +00:00
|
|
|
char buf[PATH_MAX];
|
|
|
|
|
2007-02-10 02:51:40 +00:00
|
|
|
wt_read_cache(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
if (active_nr) {
|
|
|
|
s->commitable = 1;
|
2007-01-02 19:26:21 +00:00
|
|
|
wt_status_print_cached_header(NULL);
|
2006-09-08 08:05:34 +00: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 21:20:46 +00:00
|
|
|
quote_crlf(active_cache[i]->name,
|
|
|
|
buf, sizeof(buf)));
|
2006-09-08 08:05:34 +00: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 22:22:15 +00:00
|
|
|
setup_revisions(0, NULL, &rev, s->reference);
|
2006-09-08 08:05:34 +00: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;
|
2007-02-10 02:51:40 +00:00
|
|
|
wt_read_cache(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
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 22:22:15 +00:00
|
|
|
setup_revisions(0, NULL, &rev, NULL);
|
2006-09-08 08:05:34 +00:00
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
|
|
|
|
rev.diffopt.format_callback = wt_status_print_changed_cb;
|
|
|
|
rev.diffopt.format_callback_data = s;
|
2007-02-10 02:51:40 +00:00
|
|
|
wt_read_cache(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
run_diff_files(&rev, 0);
|
|
|
|
}
|
|
|
|
|
2007-01-02 19:26:22 +00:00
|
|
|
static void wt_status_print_untracked(struct wt_status *s)
|
2006-09-08 08:05:34 +00: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 20:45:12 +00:00
|
|
|
if (!s->untracked) {
|
|
|
|
dir.show_other_directories = 1;
|
|
|
|
dir.hide_empty_directories = 1;
|
|
|
|
}
|
2006-09-08 08:05:34 +00: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-10 22:25:03 +00:00
|
|
|
s->workdir_untracked = 1;
|
2007-01-11 23:34:41 +00:00
|
|
|
wt_status_print_header("Untracked files",
|
|
|
|
use_add_to_include_msg);
|
2006-09-08 08:05:34 +00: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 22:22:15 +00:00
|
|
|
setup_revisions(0, NULL, &rev, s->reference);
|
2006-09-08 08:05:34 +00:00
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
|
|
|
|
rev.diffopt.detect_rename = 1;
|
2007-02-10 02:51:40 +00:00
|
|
|
wt_read_cache(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
run_diff_index(&rev, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void wt_status_print(struct wt_status *s)
|
|
|
|
{
|
2007-01-02 19:26:23 +00:00
|
|
|
unsigned char sha1[20];
|
|
|
|
s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0;
|
|
|
|
|
2007-01-03 09:09:34 +00:00
|
|
|
if (s->branch) {
|
|
|
|
const char *on_what = "On branch ";
|
|
|
|
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 09:53:29 +00:00
|
|
|
if (!prefixcmp(branch_name, "refs/heads/"))
|
2007-01-03 09:09:34 +00:00
|
|
|
branch_name += 11;
|
|
|
|
else if (!strcmp(branch_name, "HEAD")) {
|
|
|
|
branch_name = "";
|
|
|
|
on_what = "Not currently on any branch.";
|
|
|
|
}
|
2006-09-08 08:05:34 +00:00
|
|
|
color_printf_ln(color(WT_STATUS_HEADER),
|
2007-01-03 09:09:34 +00:00
|
|
|
"# %s%s", on_what, branch_name);
|
|
|
|
}
|
2006-09-08 08:05:34 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
wt_status_print_changed(s);
|
|
|
|
wt_status_print_untracked(s);
|
|
|
|
|
|
|
|
if (s->verbose && !s->is_initial)
|
|
|
|
wt_status_print_verbose(s);
|
2007-01-02 19:26:22 +00:00
|
|
|
if (!s->commitable) {
|
|
|
|
if (s->amend)
|
|
|
|
printf("# No changes\n");
|
2007-01-10 22:25:03 +00:00
|
|
|
else if (s->workdir_dirty)
|
2007-01-14 02:23:55 +00:00
|
|
|
printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n");
|
2007-01-10 22:25:03 +00:00
|
|
|
else if (s->workdir_untracked)
|
|
|
|
printf("nothing added to commit but untracked files present (use \"git add\" to track)\n");
|
|
|
|
else if (s->is_initial)
|
|
|
|
printf("nothing to commit (create/copy files and use \"git add\" to track)\n");
|
|
|
|
else
|
|
|
|
printf("nothing to commit (working directory clean)\n");
|
2007-01-02 19:26:22 +00:00
|
|
|
}
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int git_status_config(const char *k, const char *v)
|
|
|
|
{
|
2006-12-13 09:13:28 +00:00
|
|
|
if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
|
2006-09-08 08:05:34 +00:00
|
|
|
wt_status_use_color = git_config_colorbool(k, v);
|
|
|
|
return 0;
|
|
|
|
}
|
2007-02-20 09:55:07 +00:00
|
|
|
if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
|
2006-09-08 08:05:34 +00:00
|
|
|
int slot = parse_status_slot(k, 13);
|
|
|
|
color_parse(v, k, wt_status_colors[slot]);
|
|
|
|
}
|
|
|
|
return git_default_config(k, v);
|
|
|
|
}
|