mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refresh_index: make porcelain output more specific

Browse Source 
If you have a deleted file and a porcelain refreshes the
cache, we print:

  Unstaged changes after reset:
  M	file

This is technically correct, in that the file is modified,
but it's friendlier to the user if we further differentiate
the case of a deleted file (especially because this output
looks a lot like "diff --name-status", which would also make
the distinction).

Similarly, we can distinguish typechanges ("T") and
intent-to-add files ("A"), both of which appear as just "M"
in the current output.

The plumbing output for all cases remains "needs update" for
historical compatibility.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2011-11-18 06:13:08 -05:00
committed by Junio C Hamano
parent 4bd4e73093
commit 73b7eae60c
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
read-cache.c
View File

@ -1106,13 +1106,20 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
int in_porcelain = (flags & REFRESH_IN_PORCELAIN); int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0; unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
const char *modified_fmt; const char *modified_fmt;
const char *deleted_fmt;
const char *typechange_fmt;
const char *added_fmt;
const char *unmerged_fmt; const char *unmerged_fmt;
modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n"); modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n"); unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
for (i = 0; i < istate->cache_nr; i++) { for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce, *new; struct cache_entry *ce, *new;
int cache_errno = 0; int cache_errno = 0;
int changed = 0;
ce = istate->cache[i]; ce = istate->cache[i];
if (ignore_submodules && S_ISGITLINK(ce->ce_mode)) if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
@ -1133,10 +1140,12 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen)) if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
continue; continue;
new = refresh_cache_ent(istate, ce, options, &cache_errno, NULL); new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
if (new == ce) if (new == ce)
continue; continue;
if (!new) { if (!new) {
const char *fmt;
if (not_new && cache_errno == ENOENT) if (not_new && cache_errno == ENOENT)
continue; continue;
if (really && cache_errno == EINVAL) { if (really && cache_errno == EINVAL) {
@ -1148,7 +1157,17 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
} }
if (quiet) if (quiet)
continue; continue;
show_file(modified_fmt, ce->name, in_porcelain, &first, header_msg);
if (cache_errno == ENOENT)
fmt = deleted_fmt;
else if (ce->ce_flags & CE_INTENT_TO_ADD)
fmt = added_fmt; /* must be before other checks */
else if (changed & TYPE_CHANGED)
fmt = typechange_fmt;
else
fmt = modified_fmt;
show_file(fmt,
ce->name, in_porcelain, &first, header_msg);
has_errors = 1; has_errors = 1;
continue; continue;
} }