undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'am/status'

Browse Source 
* am/status:
  wt-status: Teach how to discard changes in the working directory
  wt-status: Split header generation into three functions
This commit is contained in:
Shawn O. Pearce 2008-09-25 09:32:49 -07:00
commit 6ef1daf772
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t7502-status.sh
View File

@ -46,6 +46,7 @@ cat > expect << \EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #
@ -76,6 +77,7 @@ cat >expect <<EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #
@ -104,6 +106,7 @@ cat >expect <<EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #
@ -138,6 +141,7 @@ cat >expect <<EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #
@ -174,6 +178,7 @@ cat > expect << \EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: modified # modified: modified
# #
@ -204,6 +209,7 @@ cat > expect << \EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #
@ -267,6 +273,7 @@ cat >expect <<EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #
@ -297,6 +304,7 @@ cat >expect <<EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #
@ -326,6 +334,7 @@ cat >expect <<EOF
# On branch master # On branch master
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #
@ -357,6 +366,7 @@ cat >expect <<EOF
# #
# Changed but not updated: # Changed but not updated:
# (use "git add <file>..." to update what will be committed) # (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# #
# modified: dir1/modified # modified: dir1/modified
# #

35
wt-status.c
View File

@ -22,12 +22,6 @@ static char wt_status_colors[][COLOR_MAXLEN] = {
"\033[31m", /* WT_STATUS_NOBRANCH: red */ "\033[31m", /* WT_STATUS_NOBRANCH: red */
}; };
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";
enum untracked_status_type show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; enum untracked_status_type show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
static int parse_status_slot(const char *var, int offset) static int parse_status_slot(const char *var, int offset)
@ -76,12 +70,24 @@ static void wt_status_print_cached_header(struct wt_status *s)
color_fprintf_ln(s->fp, c, "#"); color_fprintf_ln(s->fp, c, "#");
} }
static void wt_status_print_header(struct wt_status *s, static void wt_status_print_dirty_header(struct wt_status *s,
const char *main, const char *sub) int has_deleted)
{ {
const char *c = color(WT_STATUS_HEADER); const char *c = color(WT_STATUS_HEADER);
color_fprintf_ln(s->fp, c, "# %s:", main); color_fprintf_ln(s->fp, c, "# Changed but not updated:");
color_fprintf_ln(s->fp, c, "# (%s)", sub); 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)");
color_fprintf_ln(s->fp, c, "# (use \"git checkout -- <file>...\" to discard changes in working directory)");
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)");
color_fprintf_ln(s->fp, c, "#"); color_fprintf_ln(s->fp, c, "#");
} }
@ -166,14 +172,14 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q,
struct wt_status *s = data; struct wt_status *s = data;
int i; int i;
if (q->nr) { if (q->nr) {
const char *msg = use_add_msg; int has_deleted = 0;
s->workdir_dirty = 1; s->workdir_dirty = 1;
for (i = 0; i < q->nr; i++) for (i = 0; i < q->nr; i++)
if (q->queue[i]->status == DIFF_STATUS_DELETED) { if (q->queue[i]->status == DIFF_STATUS_DELETED) {
msg = use_add_rm_msg; has_deleted = 1;
break; break;
} }
wt_status_print_header(s, "Changed but not updated", msg); wt_status_print_dirty_header(s, has_deleted);
} }
for (i = 0; i < q->nr; i++) for (i = 0; i < q->nr; i++)
wt_status_print_filepair(s, WT_STATUS_CHANGED, q->queue[i]); wt_status_print_filepair(s, WT_STATUS_CHANGED, q->queue[i]);
@ -291,8 +297,7 @@ static void wt_status_print_untracked(struct wt_status *s)
} }
if (!shown_header) { if (!shown_header) {
s->workdir_untracked = 1; s->workdir_untracked = 1;
wt_status_print_header(s, "Untracked files", wt_status_print_untracked_header(s);
use_add_to_include_msg);
shown_header = 1; shown_header = 1;
} }
color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t"); color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t");