unpack_trees: group error messages by type

When an error is encountered, it calls add_rejected_file() which either
- directly displays the error message and stops if in plumbing mode
  (i.e. if show_all_errors is not initialized at 1)
- or stores it so that it will be displayed at the end with display_error_msgs(),

Storing the files by error type permits to have a list of files for
which there is the same error instead of having a serie of almost
identical errors.

As each bind_overlap error combines a file and an old file, a list cannot be
done, therefore, theses errors are not stored but directly displayed.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2010-08-11 10:38:07 +02:00 committed by Junio C Hamano
parent 08402b0409
commit e6c111b4c0
11 changed files with 123 additions and 17 deletions

View File

@ -42,6 +42,8 @@ information.
* `data` can be anything the `fn` callback would want to use. * `data` can be anything the `fn` callback would want to use.
* `show_all_errors` tells whether to stop at the first error or not.
Initializing Initializing
------------ ------------

View File

@ -392,6 +392,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.dir = xcalloc(1, sizeof(*topts.dir)); topts.dir = xcalloc(1, sizeof(*topts.dir));
topts.dir->flags |= DIR_SHOW_IGNORED; topts.dir->flags |= DIR_SHOW_IGNORED;
topts.dir->exclude_per_dir = ".gitignore"; topts.dir->exclude_per_dir = ".gitignore";
topts.show_all_errors = 1;
tree = parse_tree_indirect(old->commit ? tree = parse_tree_indirect(old->commit ?
old->commit->object.sha1 : old->commit->object.sha1 :
(unsigned char *)EMPTY_TREE_SHA1_BIN); (unsigned char *)EMPTY_TREE_SHA1_BIN);

View File

@ -704,6 +704,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
opts.verbose_update = 1; opts.verbose_update = 1;
opts.merge = 1; opts.merge = 1;
opts.fn = twoway_merge; opts.fn = twoway_merge;
opts.show_all_errors = 1;
set_porcelain_error_msgs(opts.msgs, "merge"); set_porcelain_error_msgs(opts.msgs, "merge");
trees[nr_trees] = parse_tree_indirect(head); trees[nr_trees] = parse_tree_indirect(head);

View File

@ -1184,29 +1184,42 @@ void set_porcelain_error_msgs(const char **msgs, const char *cmd)
char *tmp; char *tmp;
const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches"; const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
if (advice_commit_before_merge) if (advice_commit_before_merge)
msg = "Your local changes to '%%s' would be overwritten by %s. Aborting.\n" msg = "Your local changes to the following files would be overwritten by %s:\n%%s"
"Please, commit your changes or stash them before you can %s."; "Please, commit your changes or stash them before you can %s.";
else else
msg = "Your local changes to '%%s' would be overwritten by %s. Aborting."; msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 3); tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 2);
sprintf(tmp, msg, cmd, cmd2); sprintf(tmp, msg, cmd, cmd2);
msgs[ERROR_WOULD_OVERWRITE] = tmp; msgs[ERROR_WOULD_OVERWRITE] = tmp;
msgs[ERROR_NOT_UPTODATE_FILE] = tmp; msgs[ERROR_NOT_UPTODATE_FILE] = tmp;
msgs[ERROR_NOT_UPTODATE_DIR] = msgs[ERROR_NOT_UPTODATE_DIR] =
"Updating '%s' would lose untracked files in it. Aborting."; "Updating the following directories would lose untracked files in it:\n%s";
if (advice_commit_before_merge) if (advice_commit_before_merge)
msg = "Untracked working tree file '%%s' would be %s by %s. Aborting" msg = "The following untracked working tree files would be %s by %s:\n%%s"
"Please move or remove them before you can %s."; "Please move or remove them before you can %s.";
else else
msg = "Untracked working tree file '%%s' would be %s by %s. Aborting"; msg = "The following untracked working tree files would be %s by %s:\n%%s";
tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("removed") + strlen(cmd2) - 4); tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("removed") + strlen(cmd2) - 4);
sprintf(tmp, msg, "removed", cmd, cmd2); sprintf(tmp, msg, "removed", cmd, cmd2);
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp; msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp;
tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4); tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4);
sprintf(tmp, msg, "overwritten", cmd, cmd2); sprintf(tmp, msg, "overwritten", cmd, cmd2);
msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = tmp; msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = tmp;
/*
* Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
* cannot easily display it as a list.
*/
msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind.";
msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
"Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
"The following Working tree files would be overwritten by sparse checkout update:\n%s";
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
"The following Working tree files would be removed by sparse checkout update:\n%s";
} }
int merge_trees(struct merge_options *o, int merge_trees(struct merge_options *o,

View File

@ -294,7 +294,7 @@ test_expect_success 'fail if the index has unresolved entries' '
grep "You have not concluded your merge" out && grep "You have not concluded your merge" out &&
rm -f .git/MERGE_HEAD && rm -f .git/MERGE_HEAD &&
test_must_fail git merge "$c5" 2> out && test_must_fail git merge "$c5" 2> out &&
grep "Your local changes to .* would be overwritten by merge." out grep "Your local changes to the following files would be overwritten by merge:" out
' '
test_expect_success 'merge-recursive remove conflict' ' test_expect_success 'merge-recursive remove conflict' '

View File

@ -129,7 +129,8 @@ test_expect_success 'rebase a single mode change' '
test_expect_success 'Show verbose error when HEAD could not be detached' ' test_expect_success 'Show verbose error when HEAD could not be detached' '
: > B && : > B &&
test_must_fail git rebase topic 2> output.err > output.out && test_must_fail git rebase topic 2> output.err > output.out &&
grep "Untracked working tree file .B. would be overwritten" output.err grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
grep B output.err
' '
rm -f B rm -f B

View File

@ -150,8 +150,9 @@ test_expect_success 'abort with error when new base cannot be checked out' '
git rm --cached file1 && git rm --cached file1 &&
git commit -m "remove file in base" && git commit -m "remove file in base" &&
test_must_fail git rebase -i master > output 2>&1 && test_must_fail git rebase -i master > output 2>&1 &&
grep "Untracked working tree file .file1. would be overwritten" \ grep "The following untracked working tree files would be overwritten by checkout:" \
output && output &&
grep "file1" output &&
! test -d .git/rebase-merge && ! test -d .git/rebase-merge &&
git reset --hard HEAD^ git reset --hard HEAD^
' '

View File

@ -1,5 +1,6 @@
#include "cache.h" #include "cache.h"
#include "tree-walk.h" #include "tree-walk.h"
#include "unpack-trees.h"
#include "tree.h" #include "tree.h"
static const char *get_mode(const char *str, unsigned int *modep) static const char *get_mode(const char *str, unsigned int *modep)
@ -310,6 +311,7 @@ static void free_extended_entry(struct tree_desc_x *t)
int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info) int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
{ {
int ret = 0; int ret = 0;
int error = 0;
struct name_entry *entry = xmalloc(n*sizeof(*entry)); struct name_entry *entry = xmalloc(n*sizeof(*entry));
int i; int i;
struct tree_desc_x *tx = xcalloc(n, sizeof(*tx)); struct tree_desc_x *tx = xcalloc(n, sizeof(*tx));
@ -377,8 +379,11 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
if (!mask) if (!mask)
break; break;
ret = info->fn(n, mask, dirmask, entry, info); ret = info->fn(n, mask, dirmask, entry, info);
if (ret < 0) if (ret < 0) {
break; error = ret;
if (!info->show_all_errors)
break;
}
mask &= ret; mask &= ret;
ret = 0; ret = 0;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
@ -389,7 +394,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
free_extended_entry(tx + i); free_extended_entry(tx + i);
free(tx); free(tx);
return ret; return error;
} }
static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result, unsigned *mode) static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result, unsigned *mode)

View File

@ -45,6 +45,7 @@ struct traverse_info {
unsigned long conflicts; unsigned long conflicts;
traverse_callback_t fn; traverse_callback_t fn;
void *data; void *data;
int show_all_errors;
}; };
int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *); int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);

View File

@ -64,6 +64,73 @@ static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
} }
/*
* add error messages on path <path>
* corresponding to the type <e> with the message <msg>
* indicating if it should be display in porcelain or not
*/
static int add_rejected_path(struct unpack_trees_options *o,
enum unpack_trees_error_types e,
const char *path)
{
struct rejected_paths_list *newentry;
int porcelain = o && (o)->msgs[e];
/*
* simply display the given error message if in plumbing mode
*/
if (!porcelain)
o->show_all_errors = 0;
if (!o->show_all_errors)
return error(ERRORMSG(o, e), path);
/*
* Otherwise, insert in a list for future display by
* display_error_msgs()
*/
newentry = xmalloc(sizeof(struct rejected_paths_list));
newentry->path = (char *)path;
newentry->next = o->unpack_rejects[e];
o->unpack_rejects[e] = newentry;
return -1;
}
/*
* free all the structures allocated for the error <e>
*/
static void free_rejected_paths(struct unpack_trees_options *o,
enum unpack_trees_error_types e)
{
while (o->unpack_rejects[e]) {
struct rejected_paths_list *del = o->unpack_rejects[e];
o->unpack_rejects[e] = o->unpack_rejects[e]->next;
free(del);
}
free(o->unpack_rejects[e]);
}
/*
* display all the error messages stored in a nice way
*/
static void display_error_msgs(struct unpack_trees_options *o)
{
int e;
int something_displayed = 0;
for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
if (o->unpack_rejects[e]) {
struct rejected_paths_list *rp;
struct strbuf path = STRBUF_INIT;
something_displayed = 1;
for (rp = o->unpack_rejects[e]; rp; rp = rp->next)
strbuf_addf(&path, "\t%s\n", rp->path);
error(ERRORMSG(o, e), path.buf);
strbuf_release(&path);
free_rejected_paths(o, e);
}
}
if (something_displayed)
printf("Aborting\n");
}
/* /*
* Unlink the last component and schedule the leading directories for * Unlink the last component and schedule the leading directories for
* removal, such that empty directories get removed. * removal, such that empty directories get removed.
@ -755,6 +822,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
setup_traverse_info(&info, prefix); setup_traverse_info(&info, prefix);
info.fn = unpack_callback; info.fn = unpack_callback;
info.data = o; info.data = o;
info.show_all_errors = o->show_all_errors;
if (o->prefix) { if (o->prefix) {
/* /*
@ -834,6 +902,8 @@ done:
return ret; return ret;
return_failed: return_failed:
if (o->show_all_errors)
display_error_msgs(o);
mark_all_ce_unused(o->src_index); mark_all_ce_unused(o->src_index);
ret = unpack_failed(o, NULL); ret = unpack_failed(o, NULL);
goto done; goto done;
@ -843,7 +913,7 @@ return_failed:
static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o) static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o)
{ {
return error(ERRORMSG(o, ERROR_WOULD_OVERWRITE), ce->name); return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
} }
static int same(struct cache_entry *a, struct cache_entry *b) static int same(struct cache_entry *a, struct cache_entry *b)
@ -890,7 +960,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
if (errno == ENOENT) if (errno == ENOENT)
return 0; return 0;
return o->gently ? -1 : return o->gently ? -1 :
error(ERRORMSG(o, error_type), ce->name); add_rejected_path(o, error_type, ce->name);
} }
static int verify_uptodate(struct cache_entry *ce, static int verify_uptodate(struct cache_entry *ce,
@ -993,7 +1063,7 @@ static int verify_clean_subdirectory(struct cache_entry *ce,
i = read_directory(&d, pathbuf, namelen+1, NULL); i = read_directory(&d, pathbuf, namelen+1, NULL);
if (i) if (i)
return o->gently ? -1 : return o->gently ? -1 :
error(ERRORMSG(o, ERROR_NOT_UPTODATE_DIR), ce->name); add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
free(pathbuf); free(pathbuf);
return cnt; return cnt;
} }
@ -1075,7 +1145,7 @@ static int verify_absent_1(struct cache_entry *ce,
} }
return o->gently ? -1 : return o->gently ? -1 :
error(ERRORMSG(o, error_type), ce->name); add_rejected_path(o, error_type, ce->name);
} }
return 0; return 0;
} }

View File

@ -22,6 +22,11 @@ enum unpack_trees_error_types {
NB_UNPACK_TREES_ERROR_TYPES NB_UNPACK_TREES_ERROR_TYPES
}; };
struct rejected_paths_list {
char *path;
struct rejected_paths_list *next;
};
struct unpack_trees_options { struct unpack_trees_options {
unsigned int reset, unsigned int reset,
merge, merge,
@ -36,12 +41,18 @@ struct unpack_trees_options {
diff_index_cached, diff_index_cached,
debug_unpack, debug_unpack,
skip_sparse_checkout, skip_sparse_checkout,
gently; gently,
show_all_errors;
const char *prefix; const char *prefix;
int cache_bottom; int cache_bottom;
struct dir_struct *dir; struct dir_struct *dir;
merge_fn_t fn; merge_fn_t fn;
const char *msgs[NB_UNPACK_TREES_ERROR_TYPES]; const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
/*
* Store error messages in an array, each case
* corresponding to a error message type
*/
struct rejected_paths_list *unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
int head_idx; int head_idx;
int merge_size; int merge_size;