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"
|
2008-03-07 02:30:58 +00:00
|
|
|
#include "quote.h"
|
2008-04-12 15:05:32 +00:00
|
|
|
#include "run-command.h"
|
2008-07-02 07:52:16 +00:00
|
|
|
#include "remote.h"
|
2006-09-08 08:05:34 +00:00
|
|
|
|
2007-12-07 21:26:07 +00:00
|
|
|
int wt_status_relative_paths = 1;
|
2008-02-18 07:26:03 +00:00
|
|
|
int wt_status_use_color = -1;
|
2008-04-12 15:05:32 +00:00
|
|
|
int wt_status_submodule_summary;
|
2006-09-08 08:05:34 +00:00
|
|
|
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 */
|
2008-05-22 12:50:02 +00:00
|
|
|
"\033[31m", /* WT_STATUS_NOBRANCH: red */
|
2006-09-08 08:05:34 +00:00
|
|
|
};
|
2007-01-11 23:34:41 +00:00
|
|
|
|
2008-06-05 08:31:19 +00:00
|
|
|
enum untracked_status_type show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
|
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;
|
2008-05-22 12:50:02 +00:00
|
|
|
if (!strcasecmp(var+offset, "nobranch"))
|
|
|
|
return WT_STATUS_NOBRANCH;
|
2006-09-08 08:05:34 +00:00
|
|
|
die("bad config variable '%s'", var);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char* color(int slot)
|
|
|
|
{
|
2008-02-18 07:26:03 +00:00
|
|
|
return wt_status_use_color > 0 ? wt_status_colors[slot] : "";
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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-09-18 00:06:42 +00:00
|
|
|
s->fp = stdout;
|
2007-09-18 00:06:43 +00:00
|
|
|
s->index_file = get_index_file();
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
2007-09-18 00:06:42 +00:00
|
|
|
static void wt_status_print_cached_header(struct wt_status *s)
|
2007-01-02 19:26:21 +00:00
|
|
|
{
|
|
|
|
const char *c = color(WT_STATUS_HEADER);
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf_ln(s->fp, c, "# Changes to be committed:");
|
2008-02-12 05:45:18 +00:00
|
|
|
if (!s->is_initial) {
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference);
|
2007-01-02 19:26:21 +00:00
|
|
|
} else {
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)");
|
2007-01-02 19:26:21 +00:00
|
|
|
}
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf_ln(s->fp, c, "#");
|
2007-01-02 19:26:21 +00:00
|
|
|
}
|
|
|
|
|
2008-09-07 22:05:02 +00:00
|
|
|
static void wt_status_print_dirty_header(struct wt_status *s,
|
|
|
|
int has_deleted)
|
2006-09-08 08:05:34 +00:00
|
|
|
{
|
|
|
|
const char *c = color(WT_STATUS_HEADER);
|
2008-09-07 22:05:02 +00:00
|
|
|
color_fprintf_ln(s->fp, c, "# Changed but not updated:");
|
|
|
|
if (!has_deleted)
|
|
|
|
color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to update what will be committed)");
|
|
|
|
else
|
|
|
|
color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" to update what will be committed)");
|
2008-09-07 22:05:03 +00:00
|
|
|
color_fprintf_ln(s->fp, c, "# (use \"git checkout -- <file>...\" to discard changes in working directory)");
|
2008-09-07 22:05:02 +00:00
|
|
|
color_fprintf_ln(s->fp, c, "#");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_untracked_header(struct wt_status *s)
|
|
|
|
{
|
|
|
|
const char *c = color(WT_STATUS_HEADER);
|
|
|
|
color_fprintf_ln(s->fp, c, "# Untracked files:");
|
|
|
|
color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to include in what will be committed)");
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf_ln(s->fp, c, "#");
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
2007-09-18 00:06:42 +00:00
|
|
|
static void wt_status_print_trailer(struct wt_status *s)
|
2006-09-08 08:05:34 +00:00
|
|
|
{
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#");
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
2008-03-07 02:30:58 +00:00
|
|
|
#define quote_path quote_path_relative
|
2006-11-08 21:20:46 +00:00
|
|
|
|
2007-09-18 00:06:42 +00:00
|
|
|
static void wt_status_print_filepair(struct wt_status *s,
|
|
|
|
int t, struct diff_filepair *p)
|
2006-09-08 08:05:34 +00:00
|
|
|
{
|
|
|
|
const char *c = color(t);
|
2006-11-08 21:20:46 +00:00
|
|
|
const char *one, *two;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT;
|
2006-11-08 21:20:46 +00:00
|
|
|
|
2007-11-11 17:35:41 +00:00
|
|
|
one = quote_path(p->one->path, -1, &onebuf, s->prefix);
|
|
|
|
two = quote_path(p->two->path, -1, &twobuf, s->prefix);
|
2006-11-08 21:20:46 +00:00
|
|
|
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t");
|
2006-09-08 08:05:34 +00:00
|
|
|
switch (p->status) {
|
|
|
|
case DIFF_STATUS_ADDED:
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, c, "new file: %s", one);
|
2006-11-08 21:20:46 +00:00
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_COPIED:
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, c, "copied: %s -> %s", one, two);
|
2006-09-08 08:05:34 +00:00
|
|
|
break;
|
|
|
|
case DIFF_STATUS_DELETED:
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, c, "deleted: %s", one);
|
2006-11-08 21:20:46 +00:00
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_MODIFIED:
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, c, "modified: %s", one);
|
2006-11-08 21:20:46 +00:00
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_RENAMED:
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, c, "renamed: %s -> %s", one, two);
|
2006-09-08 08:05:34 +00:00
|
|
|
break;
|
|
|
|
case DIFF_STATUS_TYPE_CHANGED:
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, c, "typechange: %s", one);
|
2006-11-08 21:20:46 +00:00
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_UNKNOWN:
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, c, "unknown: %s", one);
|
2006-11-08 21:20:46 +00:00
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
case DIFF_STATUS_UNMERGED:
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, c, "unmerged: %s", one);
|
2006-11-08 21:20:46 +00:00
|
|
|
break;
|
2006-09-08 08:05:34 +00:00
|
|
|
default:
|
|
|
|
die("bug: unhandled diff status %c", p->status);
|
|
|
|
}
|
2007-09-18 00:06:42 +00:00
|
|
|
fprintf(s->fp, "\n");
|
2007-11-11 17:35:41 +00:00
|
|
|
strbuf_release(&onebuf);
|
|
|
|
strbuf_release(&twobuf);
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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-09-18 00:06:42 +00:00
|
|
|
wt_status_print_cached_header(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
s->commitable = 1;
|
|
|
|
shown_header = 1;
|
|
|
|
}
|
2007-09-18 00:06:42 +00:00
|
|
|
wt_status_print_filepair(s, WT_STATUS_UPDATED, q->queue[i]);
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
if (shown_header)
|
2007-09-18 00:06:42 +00:00
|
|
|
wt_status_print_trailer(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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) {
|
2008-09-07 22:05:02 +00:00
|
|
|
int has_deleted = 0;
|
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) {
|
2008-09-07 22:05:02 +00:00
|
|
|
has_deleted = 1;
|
2007-01-11 23:34:41 +00:00
|
|
|
break;
|
|
|
|
}
|
2008-09-07 22:05:02 +00:00
|
|
|
wt_status_print_dirty_header(s, has_deleted);
|
2007-01-02 19:26:22 +00:00
|
|
|
}
|
2006-09-08 08:05:34 +00:00
|
|
|
for (i = 0; i < q->nr; i++)
|
2007-09-18 00:06:42 +00:00
|
|
|
wt_status_print_filepair(s, WT_STATUS_CHANGED, q->queue[i]);
|
2006-09-08 08:05:34 +00:00
|
|
|
if (q->nr)
|
2007-09-18 00:06:42 +00:00
|
|
|
wt_status_print_trailer(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_updated(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
init_revisions(&rev, NULL);
|
2008-11-12 08:21:39 +00:00
|
|
|
setup_revisions(0, NULL, &rev,
|
|
|
|
s->is_initial ? EMPTY_TREE_SHA1_HEX : 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;
|
2008-04-30 17:24:43 +00:00
|
|
|
rev.diffopt.rename_limit = 200;
|
2007-12-03 06:58:37 +00:00
|
|
|
rev.diffopt.break_opt = 0;
|
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;
|
|
|
|
run_diff_files(&rev, 0);
|
|
|
|
}
|
|
|
|
|
2008-04-12 15:05:32 +00:00
|
|
|
static void wt_status_print_submodule_summary(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct child_process sm_summary;
|
|
|
|
char summary_limit[64];
|
|
|
|
char index[PATH_MAX];
|
|
|
|
const char *env[] = { index, NULL };
|
|
|
|
const char *argv[] = {
|
|
|
|
"submodule",
|
|
|
|
"summary",
|
|
|
|
"--cached",
|
|
|
|
"--for-status",
|
|
|
|
"--summary-limit",
|
|
|
|
summary_limit,
|
|
|
|
s->amend ? "HEAD^" : "HEAD",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
sprintf(summary_limit, "%d", wt_status_submodule_summary);
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
int i;
|
|
|
|
int shown_header = 0;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2006-09-08 08:05:34 +00:00
|
|
|
|
|
|
|
memset(&dir, 0, sizeof(dir));
|
|
|
|
|
2006-09-12 20:45:12 +00:00
|
|
|
if (!s->untracked) {
|
|
|
|
dir.show_other_directories = 1;
|
|
|
|
dir.hide_empty_directories = 1;
|
|
|
|
}
|
core.excludesfile clean-up
There are inconsistencies in the way commands currently handle
the core.excludesfile configuration variable. The problem is
the variable is too new to be noticed by anything other than
git-add and git-status.
* git-ls-files does not notice any of the "ignore" files by
default, as it predates the standardized set of ignore files.
The calling scripts established the convention to use
.git/info/exclude, .gitignore, and later core.excludesfile.
* git-add and git-status know about it because they call
add_excludes_from_file() directly with their own notion of
which standard set of ignore files to use. This is just a
stupid duplication of code that need to be updated every time
the definition of the standard set of ignore files is
changed.
* git-read-tree takes --exclude-per-directory=<gitignore>,
not because the flexibility was needed. Again, this was
because the option predates the standardization of the ignore
files.
* git-merge-recursive uses hardcoded per-directory .gitignore
and nothing else. git-clean (scripted version) does not
honor core.* because its call to underlying ls-files does not
know about it. git-clean in C (parked in 'pu') doesn't either.
We probably could change git-ls-files to use the standard set
when no excludes are specified on the command line and ignore
processing was asked, or something like that, but that will be a
change in semantics and might break people's scripts in a subtle
way. I am somewhat reluctant to make such a change.
On the other hand, I think it makes perfect sense to fix
git-read-tree, git-merge-recursive and git-clean to follow the
same rule as other commands. I do not think of a valid use case
to give an exclude-per-directory that is nonstandard to
read-tree command, outside a "negative" test in the t1004 test
script.
This patch is the first step to untangle this mess.
The next step would be to teach read-tree, merge-recursive and
clean (in C) to use setup_standard_excludes().
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-14 08:05:00 +00:00
|
|
|
setup_standard_excludes(&dir);
|
2006-09-08 08:05:34 +00:00
|
|
|
|
Optimize directory listing with pathspec limiter.
The way things are set up, you can now pass a "pathspec" to the
"read_directory()" function. If you pass NULL, it acts exactly
like it used to do (read everything). If you pass a non-NULL
pointer, it will simplify it into a "these are the prefixes
without any special characters", and stop any readdir() early if
the path in question doesn't match any of the prefixes.
NOTE! This does *not* obviate the need for the caller to do the *exact*
pathspec match later. It's a first-level filter on "read_directory()", but
it does not do the full pathspec thing. Maybe it should. But in the
meantime, builtin-add.c really does need to do first
read_directory(dir, .., pathspec);
if (pathspec)
prune_directory(dir, pathspec, baselen);
ie the "prune_directory()" part will do the *exact* pathspec pruning,
while the "read_directory()" will use the pathspec just to do some quick
high-level pruning of the directories it will recurse into.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-31 03:39:30 +00:00
|
|
|
read_directory(&dir, ".", "", 0, NULL);
|
2006-09-08 08:05:34 +00:00
|
|
|
for(i = 0; i < dir.nr; i++) {
|
|
|
|
struct dir_entry *ent = dir.entries[i];
|
2008-10-16 15:07:26 +00:00
|
|
|
if (!cache_name_is_other(ent->name, ent->len))
|
|
|
|
continue;
|
2006-09-08 08:05:34 +00:00
|
|
|
if (!shown_header) {
|
2007-01-10 22:25:03 +00:00
|
|
|
s->workdir_untracked = 1;
|
2008-09-07 22:05:02 +00:00
|
|
|
wt_status_print_untracked_header(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
shown_header = 1;
|
|
|
|
}
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t");
|
2007-11-11 17:35:41 +00:00
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED), "%s",
|
|
|
|
quote_path(ent->name, ent->len,
|
|
|
|
&buf, s->prefix));
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
2007-11-11 17:35:41 +00:00
|
|
|
strbuf_release(&buf);
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void wt_status_print_verbose(struct wt_status *s)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2007-11-22 02:54:49 +00:00
|
|
|
|
2006-09-08 08:05:34 +00:00
|
|
|
init_revisions(&rev, NULL);
|
2008-11-12 08:23:37 +00:00
|
|
|
setup_revisions(0, NULL, &rev,
|
|
|
|
s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference);
|
2006-09-08 08:05:34 +00:00
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
|
|
|
|
rev.diffopt.detect_rename = 1;
|
2008-10-26 04:50:02 +00:00
|
|
|
DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
|
2008-03-10 17:58:26 +00:00
|
|
|
rev.diffopt.file = s->fp;
|
|
|
|
rev.diffopt.close_file = 0;
|
2008-10-26 04:49:35 +00: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)
|
|
|
|
DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF);
|
2006-09-08 08:05:34 +00:00
|
|
|
run_diff_index(&rev, 1);
|
|
|
|
}
|
|
|
|
|
2008-07-02 07:52:16 +00: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)
|
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER),
|
|
|
|
"# %.*s", (int)(ep - cp), cp);
|
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#");
|
|
|
|
}
|
|
|
|
|
2006-09-08 08:05:34 +00:00
|
|
|
void wt_status_print(struct wt_status *s)
|
|
|
|
{
|
2007-01-02 19:26:23 +00:00
|
|
|
unsigned char sha1[20];
|
2008-05-22 12:50:02 +00:00
|
|
|
const char *branch_color = color(WT_STATUS_HEADER);
|
2007-01-02 19:26:23 +00:00
|
|
|
|
2008-05-22 12:50:02 +00:00
|
|
|
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 = "";
|
2008-05-22 12:50:02 +00:00
|
|
|
branch_color = color(WT_STATUS_NOBRANCH);
|
2007-01-03 09:09:34 +00:00
|
|
|
on_what = "Not currently on any branch.";
|
|
|
|
}
|
2008-05-22 12:50:02 +00:00
|
|
|
color_fprintf(s->fp, color(WT_STATUS_HEADER), "# ");
|
|
|
|
color_fprintf_ln(s->fp, branch_color, "%s%s", on_what, branch_name);
|
2008-07-02 07:52:16 +00:00
|
|
|
if (!s->is_initial)
|
|
|
|
wt_status_print_tracking(s);
|
2007-01-03 09:09:34 +00:00
|
|
|
}
|
2006-09-08 08:05:34 +00:00
|
|
|
|
|
|
|
if (s->is_initial) {
|
2007-09-18 00:06:42 +00:00
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#");
|
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "# Initial commit");
|
|
|
|
color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#");
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
|
|
|
|
2008-11-12 08:21:39 +00:00
|
|
|
wt_status_print_updated(s);
|
2006-09-08 08:05:34 +00:00
|
|
|
wt_status_print_changed(s);
|
2008-04-12 15:05:32 +00:00
|
|
|
if (wt_status_submodule_summary)
|
|
|
|
wt_status_print_submodule_summary(s);
|
2008-06-05 12:22:56 +00:00
|
|
|
if (show_untracked_files)
|
|
|
|
wt_status_print_untracked(s);
|
|
|
|
else if (s->commitable)
|
|
|
|
fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n");
|
2006-09-08 08:05:34 +00:00
|
|
|
|
2008-11-12 08:23:37 +00:00
|
|
|
if (s->verbose)
|
2006-09-08 08:05:34 +00:00
|
|
|
wt_status_print_verbose(s);
|
2007-01-02 19:26:22 +00:00
|
|
|
if (!s->commitable) {
|
|
|
|
if (s->amend)
|
2007-09-18 00:06:42 +00:00
|
|
|
fprintf(s->fp, "# No changes\n");
|
2007-12-13 03:09:16 +00:00
|
|
|
else if (s->nowarn)
|
|
|
|
; /* nothing */
|
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");
|
2008-06-05 12:22:56 +00:00
|
|
|
else if (!show_untracked_files)
|
|
|
|
printf("nothing to commit (use -u to show untracked files)\n");
|
2007-01-10 22:25:03 +00:00
|
|
|
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
|
|
|
}
|
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
int git_status_config(const char *k, const char *v, void *cb)
|
2006-09-08 08:05:34 +00:00
|
|
|
{
|
2008-04-12 15:05:32 +00:00
|
|
|
if (!strcmp(k, "status.submodulesummary")) {
|
|
|
|
int is_bool;
|
|
|
|
wt_status_submodule_summary = git_config_bool_or_int(k, v, &is_bool);
|
|
|
|
if (is_bool && wt_status_submodule_summary)
|
|
|
|
wt_status_submodule_summary = -1;
|
|
|
|
return 0;
|
|
|
|
}
|
2006-12-13 09:13:28 +00:00
|
|
|
if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
|
2007-12-06 01:26:11 +00:00
|
|
|
wt_status_use_color = git_config_colorbool(k, v, -1);
|
2006-09-08 08:05:34 +00:00
|
|
|
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);
|
2008-02-11 19:00:57 +00:00
|
|
|
if (!v)
|
|
|
|
return config_error_nonbool(k);
|
2006-09-08 08:05:34 +00:00
|
|
|
color_parse(v, k, wt_status_colors[slot]);
|
2007-12-07 21:26:07 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strcmp(k, "status.relativepaths")) {
|
|
|
|
wt_status_relative_paths = git_config_bool(k, v);
|
|
|
|
return 0;
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|
2008-06-05 12:47:50 +00:00
|
|
|
if (!strcmp(k, "status.showuntrackedfiles")) {
|
|
|
|
if (!v)
|
2008-07-06 04:10:04 +00:00
|
|
|
return config_error_nonbool(k);
|
2008-06-05 12:47:50 +00:00
|
|
|
else if (!strcmp(v, "no"))
|
|
|
|
show_untracked_files = SHOW_NO_UNTRACKED_FILES;
|
|
|
|
else if (!strcmp(v, "normal"))
|
|
|
|
show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
|
|
|
|
else if (!strcmp(v, "all"))
|
|
|
|
show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
|
|
|
|
else
|
|
|
|
return error("Invalid untracked files mode '%s'", v);
|
|
|
|
return 0;
|
|
|
|
}
|
2008-10-26 04:49:35 +00:00
|
|
|
return git_diff_ui_config(k, v, cb);
|
2006-09-08 08:05:34 +00:00
|
|
|
}
|