| Junio C Hamano | 8502357 | 2006-12-19 22:34:12 | [diff] [blame] | 1 | #include "cache.h" |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 2 | #include "wt-status.h" |
| 3 | #include "color.h" |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 4 | #include "object.h" |
| 5 | #include "dir.h" |
| 6 | #include "commit.h" |
| 7 | #include "diff.h" |
| 8 | #include "revision.h" |
| 9 | #include "diffcore.h" |
| Dmitry Potapov | a734d0b | 2008-03-07 02:30:58 | [diff] [blame] | 10 | #include "quote.h" |
| Ping Yin | ac8d5af | 2008-04-12 15:05:32 | [diff] [blame] | 11 | #include "run-command.h" |
| Junio C Hamano | b6975ab | 2008-07-02 07:52:16 | [diff] [blame] | 12 | #include "remote.h" |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 13 | |
| Jeff King | 46f721c | 2007-12-07 21:26:07 | [diff] [blame] | 14 | int wt_status_relative_paths = 1; |
| Matthias Kestenholz | 6b2f2d9 | 2008-02-18 07:26:03 | [diff] [blame] | 15 | int wt_status_use_color = -1; |
| Ping Yin | ac8d5af | 2008-04-12 15:05:32 | [diff] [blame] | 16 | int wt_status_submodule_summary; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 17 | static char wt_status_colors[][COLOR_MAXLEN] = { |
| 18 | "", /* WT_STATUS_HEADER: normal */ |
| 19 | "\033[32m", /* WT_STATUS_UPDATED: green */ |
| 20 | "\033[31m", /* WT_STATUS_CHANGED: red */ |
| 21 | "\033[31m", /* WT_STATUS_UNTRACKED: red */ |
| Chris Parsons | 950ce2e | 2008-05-22 12:50:02 | [diff] [blame] | 22 | "\033[31m", /* WT_STATUS_NOBRANCH: red */ |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 23 | }; |
| Junio C Hamano | 4d22965 | 2007-01-11 23:34:41 | [diff] [blame] | 24 | |
| Marius Storm-Olsen | 4bfee30 | 2008-06-05 08:31:19 | [diff] [blame] | 25 | enum untracked_status_type show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 26 | |
| 27 | static int parse_status_slot(const char *var, int offset) |
| 28 | { |
| 29 | if (!strcasecmp(var+offset, "header")) |
| 30 | return WT_STATUS_HEADER; |
| Shawn O. Pearce | 82dca84 | 2006-12-16 02:53:13 | [diff] [blame] | 31 | if (!strcasecmp(var+offset, "updated") |
| 32 | || !strcasecmp(var+offset, "added")) |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 33 | return WT_STATUS_UPDATED; |
| 34 | if (!strcasecmp(var+offset, "changed")) |
| 35 | return WT_STATUS_CHANGED; |
| 36 | if (!strcasecmp(var+offset, "untracked")) |
| 37 | return WT_STATUS_UNTRACKED; |
| Chris Parsons | 950ce2e | 2008-05-22 12:50:02 | [diff] [blame] | 38 | if (!strcasecmp(var+offset, "nobranch")) |
| 39 | return WT_STATUS_NOBRANCH; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 40 | die("bad config variable '%s'", var); |
| 41 | } |
| 42 | |
| 43 | static const char* color(int slot) |
| 44 | { |
| Matthias Kestenholz | 6b2f2d9 | 2008-02-18 07:26:03 | [diff] [blame] | 45 | return wt_status_use_color > 0 ? wt_status_colors[slot] : ""; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 46 | } |
| 47 | |
| 48 | void wt_status_prepare(struct wt_status *s) |
| 49 | { |
| 50 | unsigned char sha1[20]; |
| 51 | const char *head; |
| 52 | |
| Junio C Hamano | cc46a74 | 2007-02-10 00:22:42 | [diff] [blame] | 53 | memset(s, 0, sizeof(*s)); |
| Junio C Hamano | 8da1977 | 2006-09-21 05:02:01 | [diff] [blame] | 54 | head = resolve_ref("HEAD", sha1, 0, NULL); |
| Jeff King | f62363f | 2006-09-18 02:13:56 | [diff] [blame] | 55 | s->branch = head ? xstrdup(head) : NULL; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 56 | s->reference = "HEAD"; |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 57 | s->fp = stdout; |
| Kristian Høgsberg | 0f729f2 | 2007-09-18 00:06:43 | [diff] [blame] | 58 | s->index_file = get_index_file(); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 59 | } |
| 60 | |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 61 | static void wt_status_print_cached_header(struct wt_status *s) |
| Jürgen Rühle | 3c1eb9c | 2007-01-02 19:26:21 | [diff] [blame] | 62 | { |
| 63 | const char *c = color(WT_STATUS_HEADER); |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 64 | color_fprintf_ln(s->fp, c, "# Changes to be committed:"); |
| Jeff King | ff58b9a | 2008-02-12 05:45:18 | [diff] [blame] | 65 | if (!s->is_initial) { |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 66 | color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference); |
| Jürgen Rühle | 3c1eb9c | 2007-01-02 19:26:21 | [diff] [blame] | 67 | } else { |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 68 | color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)"); |
| Jürgen Rühle | 3c1eb9c | 2007-01-02 19:26:21 | [diff] [blame] | 69 | } |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 70 | color_fprintf_ln(s->fp, c, "#"); |
| Jürgen Rühle | 3c1eb9c | 2007-01-02 19:26:21 | [diff] [blame] | 71 | } |
| 72 | |
| Anders Melchiorsen | bb914b1 | 2008-09-07 22:05:02 | [diff] [blame] | 73 | static void wt_status_print_dirty_header(struct wt_status *s, |
| 74 | int has_deleted) |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 75 | { |
| 76 | const char *c = color(WT_STATUS_HEADER); |
| Anders Melchiorsen | bb914b1 | 2008-09-07 22:05:02 | [diff] [blame] | 77 | color_fprintf_ln(s->fp, c, "# Changed but not updated:"); |
| 78 | if (!has_deleted) |
| 79 | color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to update what will be committed)"); |
| 80 | else |
| 81 | color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" to update what will be committed)"); |
| Anders Melchiorsen | 4d6e4c4 | 2008-09-07 22:05:03 | [diff] [blame] | 82 | color_fprintf_ln(s->fp, c, "# (use \"git checkout -- <file>...\" to discard changes in working directory)"); |
| Anders Melchiorsen | bb914b1 | 2008-09-07 22:05:02 | [diff] [blame] | 83 | color_fprintf_ln(s->fp, c, "#"); |
| 84 | } |
| 85 | |
| 86 | static void wt_status_print_untracked_header(struct wt_status *s) |
| 87 | { |
| 88 | const char *c = color(WT_STATUS_HEADER); |
| 89 | color_fprintf_ln(s->fp, c, "# Untracked files:"); |
| 90 | color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to include in what will be committed)"); |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 91 | color_fprintf_ln(s->fp, c, "#"); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 92 | } |
| 93 | |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 94 | static void wt_status_print_trailer(struct wt_status *s) |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 95 | { |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 96 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 97 | } |
| 98 | |
| Dmitry Potapov | a734d0b | 2008-03-07 02:30:58 | [diff] [blame] | 99 | #define quote_path quote_path_relative |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 100 | |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 101 | static void wt_status_print_filepair(struct wt_status *s, |
| 102 | int t, struct diff_filepair *p) |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 103 | { |
| 104 | const char *c = color(t); |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 105 | const char *one, *two; |
| Brandon Casey | f285a2d | 2008-10-09 19:12:12 | [diff] [blame] | 106 | struct strbuf onebuf = STRBUF_INIT, twobuf = STRBUF_INIT; |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 107 | |
| Johannes Schindelin | 367c988 | 2007-11-11 17:35:41 | [diff] [blame] | 108 | one = quote_path(p->one->path, -1, &onebuf, s->prefix); |
| 109 | two = quote_path(p->two->path, -1, &twobuf, s->prefix); |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 110 | |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 111 | color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t"); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 112 | switch (p->status) { |
| 113 | case DIFF_STATUS_ADDED: |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 114 | color_fprintf(s->fp, c, "new file: %s", one); |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 115 | break; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 116 | case DIFF_STATUS_COPIED: |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 117 | color_fprintf(s->fp, c, "copied: %s -> %s", one, two); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 118 | break; |
| 119 | case DIFF_STATUS_DELETED: |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 120 | color_fprintf(s->fp, c, "deleted: %s", one); |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 121 | break; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 122 | case DIFF_STATUS_MODIFIED: |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 123 | color_fprintf(s->fp, c, "modified: %s", one); |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 124 | break; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 125 | case DIFF_STATUS_RENAMED: |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 126 | color_fprintf(s->fp, c, "renamed: %s -> %s", one, two); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 127 | break; |
| 128 | case DIFF_STATUS_TYPE_CHANGED: |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 129 | color_fprintf(s->fp, c, "typechange: %s", one); |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 130 | break; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 131 | case DIFF_STATUS_UNKNOWN: |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 132 | color_fprintf(s->fp, c, "unknown: %s", one); |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 133 | break; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 134 | case DIFF_STATUS_UNMERGED: |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 135 | color_fprintf(s->fp, c, "unmerged: %s", one); |
| Junio C Hamano | 3a94680 | 2006-11-08 21:20:46 | [diff] [blame] | 136 | break; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 137 | default: |
| 138 | die("bug: unhandled diff status %c", p->status); |
| 139 | } |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 140 | fprintf(s->fp, "\n"); |
| Johannes Schindelin | 367c988 | 2007-11-11 17:35:41 | [diff] [blame] | 141 | strbuf_release(&onebuf); |
| 142 | strbuf_release(&twobuf); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 143 | } |
| 144 | |
| 145 | static void wt_status_print_updated_cb(struct diff_queue_struct *q, |
| 146 | struct diff_options *options, |
| 147 | void *data) |
| 148 | { |
| 149 | struct wt_status *s = data; |
| 150 | int shown_header = 0; |
| 151 | int i; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 152 | for (i = 0; i < q->nr; i++) { |
| 153 | if (q->queue[i]->status == 'U') |
| 154 | continue; |
| 155 | if (!shown_header) { |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 156 | wt_status_print_cached_header(s); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 157 | s->commitable = 1; |
| 158 | shown_header = 1; |
| 159 | } |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 160 | wt_status_print_filepair(s, WT_STATUS_UPDATED, q->queue[i]); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 161 | } |
| 162 | if (shown_header) |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 163 | wt_status_print_trailer(s); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 164 | } |
| 165 | |
| 166 | static void wt_status_print_changed_cb(struct diff_queue_struct *q, |
| 167 | struct diff_options *options, |
| 168 | void *data) |
| 169 | { |
| Jürgen Rühle | 6e458bf | 2007-01-02 19:26:22 | [diff] [blame] | 170 | struct wt_status *s = data; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 171 | int i; |
| Jürgen Rühle | 6e458bf | 2007-01-02 19:26:22 | [diff] [blame] | 172 | if (q->nr) { |
| Anders Melchiorsen | bb914b1 | 2008-09-07 22:05:02 | [diff] [blame] | 173 | int has_deleted = 0; |
| Jürgen Rühle | 2a3a3c2 | 2007-01-10 22:25:03 | [diff] [blame] | 174 | s->workdir_dirty = 1; |
| Junio C Hamano | 4d22965 | 2007-01-11 23:34:41 | [diff] [blame] | 175 | for (i = 0; i < q->nr; i++) |
| 176 | if (q->queue[i]->status == DIFF_STATUS_DELETED) { |
| Anders Melchiorsen | bb914b1 | 2008-09-07 22:05:02 | [diff] [blame] | 177 | has_deleted = 1; |
| Junio C Hamano | 4d22965 | 2007-01-11 23:34:41 | [diff] [blame] | 178 | break; |
| 179 | } |
| Anders Melchiorsen | bb914b1 | 2008-09-07 22:05:02 | [diff] [blame] | 180 | wt_status_print_dirty_header(s, has_deleted); |
| Jürgen Rühle | 6e458bf | 2007-01-02 19:26:22 | [diff] [blame] | 181 | } |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 182 | for (i = 0; i < q->nr; i++) |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 183 | wt_status_print_filepair(s, WT_STATUS_CHANGED, q->queue[i]); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 184 | if (q->nr) |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 185 | wt_status_print_trailer(s); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 186 | } |
| 187 | |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 188 | static void wt_status_print_updated(struct wt_status *s) |
| 189 | { |
| 190 | struct rev_info rev; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 191 | init_revisions(&rev, NULL); |
| Jeff King | c1e255b | 2008-11-12 08:21:39 | [diff] [blame] | 192 | setup_revisions(0, NULL, &rev, |
| 193 | s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 194 | rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; |
| 195 | rev.diffopt.format_callback = wt_status_print_updated_cb; |
| 196 | rev.diffopt.format_callback_data = s; |
| 197 | rev.diffopt.detect_rename = 1; |
| Jeff King | 5070591 | 2008-04-30 17:24:43 | [diff] [blame] | 198 | rev.diffopt.rename_limit = 200; |
| Jeff King | f714fb8 | 2007-12-03 06:58:37 | [diff] [blame] | 199 | rev.diffopt.break_opt = 0; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 200 | run_diff_index(&rev, 1); |
| 201 | } |
| 202 | |
| 203 | static void wt_status_print_changed(struct wt_status *s) |
| 204 | { |
| 205 | struct rev_info rev; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 206 | init_revisions(&rev, ""); |
| Jeff King | 49b8b29 | 2006-11-05 22:22:15 | [diff] [blame] | 207 | setup_revisions(0, NULL, &rev, NULL); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 208 | rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; |
| 209 | rev.diffopt.format_callback = wt_status_print_changed_cb; |
| 210 | rev.diffopt.format_callback_data = s; |
| 211 | run_diff_files(&rev, 0); |
| 212 | } |
| 213 | |
| Ping Yin | ac8d5af | 2008-04-12 15:05:32 | [diff] [blame] | 214 | static void wt_status_print_submodule_summary(struct wt_status *s) |
| 215 | { |
| 216 | struct child_process sm_summary; |
| 217 | char summary_limit[64]; |
| 218 | char index[PATH_MAX]; |
| 219 | const char *env[] = { index, NULL }; |
| 220 | const char *argv[] = { |
| 221 | "submodule", |
| 222 | "summary", |
| 223 | "--cached", |
| 224 | "--for-status", |
| 225 | "--summary-limit", |
| 226 | summary_limit, |
| 227 | s->amend ? "HEAD^" : "HEAD", |
| 228 | NULL |
| 229 | }; |
| 230 | |
| 231 | sprintf(summary_limit, "%d", wt_status_submodule_summary); |
| 232 | snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file); |
| 233 | |
| 234 | memset(&sm_summary, 0, sizeof(sm_summary)); |
| 235 | sm_summary.argv = argv; |
| 236 | sm_summary.env = env; |
| 237 | sm_summary.git_cmd = 1; |
| 238 | sm_summary.no_stdin = 1; |
| 239 | fflush(s->fp); |
| 240 | sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */ |
| 241 | run_command(&sm_summary); |
| 242 | } |
| 243 | |
| Jürgen Rühle | 6e458bf | 2007-01-02 19:26:22 | [diff] [blame] | 244 | static void wt_status_print_untracked(struct wt_status *s) |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 245 | { |
| 246 | struct dir_struct dir; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 247 | int i; |
| 248 | int shown_header = 0; |
| Brandon Casey | f285a2d | 2008-10-09 19:12:12 | [diff] [blame] | 249 | struct strbuf buf = STRBUF_INIT; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 250 | |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 251 | memset(&dir, 0, sizeof(dir)); |
| 252 | |
| Johannes Schindelin | 2074cb0 | 2006-09-12 20:45:12 | [diff] [blame] | 253 | if (!s->untracked) { |
| 254 | dir.show_other_directories = 1; |
| 255 | dir.hide_empty_directories = 1; |
| 256 | } |
| Junio C Hamano | 039bc64 | 2007-11-14 08:05:00 | [diff] [blame] | 257 | setup_standard_excludes(&dir); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 258 | |
| Linus Torvalds | 9fc42d6 | 2007-03-31 03:39:30 | [diff] [blame] | 259 | read_directory(&dir, ".", "", 0, NULL); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 260 | for(i = 0; i < dir.nr; i++) { |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 261 | struct dir_entry *ent = dir.entries[i]; |
| Jeff King | 98fa473 | 2008-10-16 15:07:26 | [diff] [blame] | 262 | if (!cache_name_is_other(ent->name, ent->len)) |
| 263 | continue; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 264 | if (!shown_header) { |
| Jürgen Rühle | 2a3a3c2 | 2007-01-10 22:25:03 | [diff] [blame] | 265 | s->workdir_untracked = 1; |
| Anders Melchiorsen | bb914b1 | 2008-09-07 22:05:02 | [diff] [blame] | 266 | wt_status_print_untracked_header(s); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 267 | shown_header = 1; |
| 268 | } |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 269 | color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t"); |
| Johannes Schindelin | 367c988 | 2007-11-11 17:35:41 | [diff] [blame] | 270 | color_fprintf_ln(s->fp, color(WT_STATUS_UNTRACKED), "%s", |
| 271 | quote_path(ent->name, ent->len, |
| 272 | &buf, s->prefix)); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 273 | } |
| Johannes Schindelin | 367c988 | 2007-11-11 17:35:41 | [diff] [blame] | 274 | strbuf_release(&buf); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 275 | } |
| 276 | |
| 277 | static void wt_status_print_verbose(struct wt_status *s) |
| 278 | { |
| 279 | struct rev_info rev; |
| Kristian Høgsberg | 99a1269 | 2007-11-22 02:54:49 | [diff] [blame] | 280 | |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 281 | init_revisions(&rev, NULL); |
| Jeff King | 5ec11af | 2008-12-08 02:54:17 | [diff] [blame] | 282 | DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV); |
| Jeff King | 1324fb6 | 2008-11-12 08:23:37 | [diff] [blame] | 283 | setup_revisions(0, NULL, &rev, |
| 284 | s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 285 | rev.diffopt.output_format |= DIFF_FORMAT_PATCH; |
| 286 | rev.diffopt.detect_rename = 1; |
| Kristian Høgsberg | 4ba0cb2 | 2008-03-10 17:58:26 | [diff] [blame] | 287 | rev.diffopt.file = s->fp; |
| 288 | rev.diffopt.close_file = 0; |
| Jeff King | 4f672ad | 2008-10-26 04:49:35 | [diff] [blame] | 289 | /* |
| 290 | * If we're not going to stdout, then we definitely don't |
| 291 | * want color, since we are going to the commit message |
| 292 | * file (and even the "auto" setting won't work, since it |
| 293 | * will have checked isatty on stdout). |
| 294 | */ |
| 295 | if (s->fp != stdout) |
| 296 | DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 297 | run_diff_index(&rev, 1); |
| 298 | } |
| 299 | |
| Junio C Hamano | b6975ab | 2008-07-02 07:52:16 | [diff] [blame] | 300 | static void wt_status_print_tracking(struct wt_status *s) |
| 301 | { |
| 302 | struct strbuf sb = STRBUF_INIT; |
| 303 | const char *cp, *ep; |
| 304 | struct branch *branch; |
| 305 | |
| 306 | assert(s->branch && !s->is_initial); |
| 307 | if (prefixcmp(s->branch, "refs/heads/")) |
| 308 | return; |
| 309 | branch = branch_get(s->branch + 11); |
| 310 | if (!format_tracking_info(branch, &sb)) |
| 311 | return; |
| 312 | |
| 313 | for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1) |
| 314 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), |
| 315 | "# %.*s", (int)(ep - cp), cp); |
| 316 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); |
| 317 | } |
| 318 | |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 319 | void wt_status_print(struct wt_status *s) |
| 320 | { |
| Jürgen Rühle | 98bf8a4 | 2007-01-02 19:26:23 | [diff] [blame] | 321 | unsigned char sha1[20]; |
| Chris Parsons | 950ce2e | 2008-05-22 12:50:02 | [diff] [blame] | 322 | const char *branch_color = color(WT_STATUS_HEADER); |
| Jürgen Rühle | 98bf8a4 | 2007-01-02 19:26:23 | [diff] [blame] | 323 | |
| Chris Parsons | 950ce2e | 2008-05-22 12:50:02 | [diff] [blame] | 324 | s->is_initial = get_sha1(s->reference, sha1) ? 1 : 0; |
| Junio C Hamano | bda324c | 2007-01-03 09:09:34 | [diff] [blame] | 325 | if (s->branch) { |
| 326 | const char *on_what = "On branch "; |
| 327 | const char *branch_name = s->branch; |
| Junio C Hamano | cc44c76 | 2007-02-20 09:53:29 | [diff] [blame] | 328 | if (!prefixcmp(branch_name, "refs/heads/")) |
| Junio C Hamano | bda324c | 2007-01-03 09:09:34 | [diff] [blame] | 329 | branch_name += 11; |
| 330 | else if (!strcmp(branch_name, "HEAD")) { |
| 331 | branch_name = ""; |
| Chris Parsons | 950ce2e | 2008-05-22 12:50:02 | [diff] [blame] | 332 | branch_color = color(WT_STATUS_NOBRANCH); |
| Junio C Hamano | bda324c | 2007-01-03 09:09:34 | [diff] [blame] | 333 | on_what = "Not currently on any branch."; |
| 334 | } |
| Chris Parsons | 950ce2e | 2008-05-22 12:50:02 | [diff] [blame] | 335 | color_fprintf(s->fp, color(WT_STATUS_HEADER), "# "); |
| 336 | color_fprintf_ln(s->fp, branch_color, "%s%s", on_what, branch_name); |
| Junio C Hamano | b6975ab | 2008-07-02 07:52:16 | [diff] [blame] | 337 | if (!s->is_initial) |
| 338 | wt_status_print_tracking(s); |
| Junio C Hamano | bda324c | 2007-01-03 09:09:34 | [diff] [blame] | 339 | } |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 340 | |
| 341 | if (s->is_initial) { |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 342 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); |
| 343 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "# Initial commit"); |
| 344 | color_fprintf_ln(s->fp, color(WT_STATUS_HEADER), "#"); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 345 | } |
| 346 | |
| Jeff King | c1e255b | 2008-11-12 08:21:39 | [diff] [blame] | 347 | wt_status_print_updated(s); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 348 | wt_status_print_changed(s); |
| Ping Yin | ac8d5af | 2008-04-12 15:05:32 | [diff] [blame] | 349 | if (wt_status_submodule_summary) |
| 350 | wt_status_print_submodule_summary(s); |
| Marius Storm-Olsen | 6c2ce04 | 2008-06-05 12:22:56 | [diff] [blame] | 351 | if (show_untracked_files) |
| 352 | wt_status_print_untracked(s); |
| 353 | else if (s->commitable) |
| 354 | fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n"); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 355 | |
| Jeff King | 1324fb6 | 2008-11-12 08:23:37 | [diff] [blame] | 356 | if (s->verbose) |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 357 | wt_status_print_verbose(s); |
| Jürgen Rühle | 6e458bf | 2007-01-02 19:26:22 | [diff] [blame] | 358 | if (!s->commitable) { |
| 359 | if (s->amend) |
| Kristian Høgsberg | f26a001 | 2007-09-18 00:06:42 | [diff] [blame] | 360 | fprintf(s->fp, "# No changes\n"); |
| Junio C Hamano | 37d07f8 | 2007-12-13 03:09:16 | [diff] [blame] | 361 | else if (s->nowarn) |
| 362 | ; /* nothing */ |
| Jürgen Rühle | 2a3a3c2 | 2007-01-10 22:25:03 | [diff] [blame] | 363 | else if (s->workdir_dirty) |
| Nicolas Pitre | dcbc7bb | 2007-01-14 02:23:55 | [diff] [blame] | 364 | printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"); |
| Jürgen Rühle | 2a3a3c2 | 2007-01-10 22:25:03 | [diff] [blame] | 365 | else if (s->workdir_untracked) |
| 366 | printf("nothing added to commit but untracked files present (use \"git add\" to track)\n"); |
| 367 | else if (s->is_initial) |
| 368 | printf("nothing to commit (create/copy files and use \"git add\" to track)\n"); |
| Marius Storm-Olsen | 6c2ce04 | 2008-06-05 12:22:56 | [diff] [blame] | 369 | else if (!show_untracked_files) |
| 370 | printf("nothing to commit (use -u to show untracked files)\n"); |
| Jürgen Rühle | 2a3a3c2 | 2007-01-10 22:25:03 | [diff] [blame] | 371 | else |
| 372 | printf("nothing to commit (working directory clean)\n"); |
| Jürgen Rühle | 6e458bf | 2007-01-02 19:26:22 | [diff] [blame] | 373 | } |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 374 | } |
| 375 | |
| Johannes Schindelin | ef90d6d | 2008-05-14 17:46:53 | [diff] [blame] | 376 | int git_status_config(const char *k, const char *v, void *cb) |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 377 | { |
| Ping Yin | ac8d5af | 2008-04-12 15:05:32 | [diff] [blame] | 378 | if (!strcmp(k, "status.submodulesummary")) { |
| 379 | int is_bool; |
| 380 | wt_status_submodule_summary = git_config_bool_or_int(k, v, &is_bool); |
| 381 | if (is_bool && wt_status_submodule_summary) |
| 382 | wt_status_submodule_summary = -1; |
| 383 | return 0; |
| 384 | } |
| Andy Parkins | a159ca0 | 2006-12-13 09:13:28 | [diff] [blame] | 385 | if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) { |
| Junio C Hamano | 0f6f5a4 | 2007-12-06 01:26:11 | [diff] [blame] | 386 | wt_status_use_color = git_config_colorbool(k, v, -1); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 387 | return 0; |
| 388 | } |
| Junio C Hamano | 1968d77 | 2007-02-20 09:55:07 | [diff] [blame] | 389 | if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) { |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 390 | int slot = parse_status_slot(k, 13); |
| Junio C Hamano | 451d36b | 2008-02-11 19:00:57 | [diff] [blame] | 391 | if (!v) |
| 392 | return config_error_nonbool(k); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 393 | color_parse(v, k, wt_status_colors[slot]); |
| Jeff King | 46f721c | 2007-12-07 21:26:07 | [diff] [blame] | 394 | return 0; |
| 395 | } |
| 396 | if (!strcmp(k, "status.relativepaths")) { |
| 397 | wt_status_relative_paths = git_config_bool(k, v); |
| 398 | return 0; |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 399 | } |
| Marius Storm-Olsen | d6293d1 | 2008-06-05 12:47:50 | [diff] [blame] | 400 | if (!strcmp(k, "status.showuntrackedfiles")) { |
| 401 | if (!v) |
| Christian Couder | c96a6d3 | 2008-07-06 04:10:04 | [diff] [blame] | 402 | return config_error_nonbool(k); |
| Marius Storm-Olsen | d6293d1 | 2008-06-05 12:47:50 | [diff] [blame] | 403 | else if (!strcmp(v, "no")) |
| 404 | show_untracked_files = SHOW_NO_UNTRACKED_FILES; |
| 405 | else if (!strcmp(v, "normal")) |
| 406 | show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; |
| 407 | else if (!strcmp(v, "all")) |
| 408 | show_untracked_files = SHOW_ALL_UNTRACKED_FILES; |
| 409 | else |
| 410 | return error("Invalid untracked files mode '%s'", v); |
| 411 | return 0; |
| 412 | } |
| Jeff King | 4f672ad | 2008-10-26 04:49:35 | [diff] [blame] | 413 | return git_diff_ui_config(k, v, cb); |
| Jeff King | c91f0d9 | 2006-09-08 08:05:34 | [diff] [blame] | 414 | } |