mirror of
https://github.com/git/git.git
synced 2024-05-27 12:16:10 +02:00
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages: t7609-merge-co-error-msgs: test non-fast forward case too. Move "show_all_errors = 1" to setup_unpack_trees_porcelain() setup_unpack_trees_porcelain: take the whole options struct as parameter Move set_porcelain_error_msgs to unpack-trees.c and rename it Conflicts: merge-recursive.c
This commit is contained in:
commit
c208e05bd9
|
@ -380,7 +380,7 @@ static int merge_working_tree(struct checkout_opts *opts,
|
||||||
topts.src_index = &the_index;
|
topts.src_index = &the_index;
|
||||||
topts.dst_index = &the_index;
|
topts.dst_index = &the_index;
|
||||||
|
|
||||||
set_porcelain_error_msgs(topts.msgs, "checkout");
|
setup_unpack_trees_porcelain(&topts, "checkout");
|
||||||
|
|
||||||
refresh_cache(REFRESH_QUIET);
|
refresh_cache(REFRESH_QUIET);
|
||||||
|
|
||||||
|
@ -399,7 +399,6 @@ 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);
|
||||||
|
|
|
@ -718,8 +718,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;
|
setup_unpack_trees_porcelain(&opts, "merge");
|
||||||
set_porcelain_error_msgs(opts.msgs, "merge");
|
|
||||||
|
|
||||||
trees[nr_trees] = parse_tree_indirect(head);
|
trees[nr_trees] = parse_tree_indirect(head);
|
||||||
if (!trees[nr_trees++])
|
if (!trees[nr_trees++])
|
||||||
|
|
|
@ -180,7 +180,7 @@ static int git_merge_trees(int index_only,
|
||||||
opts.fn = threeway_merge;
|
opts.fn = threeway_merge;
|
||||||
opts.src_index = &the_index;
|
opts.src_index = &the_index;
|
||||||
opts.dst_index = &the_index;
|
opts.dst_index = &the_index;
|
||||||
set_porcelain_error_msgs(opts.msgs, "merge");
|
setup_unpack_trees_porcelain(&opts, "merge");
|
||||||
|
|
||||||
init_tree_desc_from_tree(t+0, common);
|
init_tree_desc_from_tree(t+0, common);
|
||||||
init_tree_desc_from_tree(t+1, head);
|
init_tree_desc_from_tree(t+1, head);
|
||||||
|
@ -1288,50 +1288,6 @@ static int process_df_entry(struct merge_options *o,
|
||||||
return clean_merge;
|
return clean_merge;
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_porcelain_error_msgs(const char **msgs, const char *cmd)
|
|
||||||
{
|
|
||||||
const char *msg;
|
|
||||||
char *tmp;
|
|
||||||
const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
|
|
||||||
if (advice_commit_before_merge)
|
|
||||||
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.";
|
|
||||||
else
|
|
||||||
msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
|
|
||||||
tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 2);
|
|
||||||
sprintf(tmp, msg, cmd, cmd2);
|
|
||||||
msgs[ERROR_WOULD_OVERWRITE] = tmp;
|
|
||||||
msgs[ERROR_NOT_UPTODATE_FILE] = tmp;
|
|
||||||
|
|
||||||
msgs[ERROR_NOT_UPTODATE_DIR] =
|
|
||||||
"Updating the following directories would lose untracked files in it:\n%s";
|
|
||||||
|
|
||||||
if (advice_commit_before_merge)
|
|
||||||
msg = "The following untracked working tree files would be %s by %s:\n%%s"
|
|
||||||
"Please move or remove them before you can %s.";
|
|
||||||
else
|
|
||||||
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);
|
|
||||||
sprintf(tmp, msg, "removed", cmd, cmd2);
|
|
||||||
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp;
|
|
||||||
tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4);
|
|
||||||
sprintf(tmp, msg, "overwritten", cmd, cmd2);
|
|
||||||
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,
|
||||||
struct tree *head,
|
struct tree *head,
|
||||||
struct tree *merge,
|
struct tree *merge,
|
||||||
|
|
|
@ -24,12 +24,6 @@ struct merge_options {
|
||||||
struct string_list current_directory_set;
|
struct string_list current_directory_set;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
|
||||||
* Sets the list of user-friendly error messages to be used by the
|
|
||||||
* command "cmd" (either merge or checkout)
|
|
||||||
*/
|
|
||||||
void set_porcelain_error_msgs(const char **msgs, const char *cmd);
|
|
||||||
|
|
||||||
/* merge_trees() but with recursive ancestor consolidation */
|
/* merge_trees() but with recursive ancestor consolidation */
|
||||||
int merge_recursive(struct merge_options *o,
|
int merge_recursive(struct merge_options *o,
|
||||||
struct commit *h1,
|
struct commit *h1,
|
||||||
|
|
|
@ -34,9 +34,17 @@ error: The following untracked working tree files would be overwritten by merge:
|
||||||
Please move or remove them before you can merge.
|
Please move or remove them before you can merge.
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
test_expect_success 'untracked files overwritten by merge' '
|
test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
|
||||||
test_must_fail git merge branch 2>out &&
|
test_must_fail git merge branch 2>out &&
|
||||||
test_cmp out expect
|
test_cmp out expect &&
|
||||||
|
git commit --allow-empty -m empty &&
|
||||||
|
(
|
||||||
|
GIT_MERGE_VERBOSITY=0 &&
|
||||||
|
export GIT_MERGE_VERBOSITY &&
|
||||||
|
test_must_fail git merge branch 2>out2
|
||||||
|
) &&
|
||||||
|
test_cmp out2 expect &&
|
||||||
|
git reset --hard HEAD^
|
||||||
'
|
'
|
||||||
|
|
||||||
cat >expect <<\EOF
|
cat >expect <<\EOF
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* read-tree. Non-scripted Porcelain is not required to use these messages
|
* read-tree. Non-scripted Porcelain is not required to use these messages
|
||||||
* and in fact are encouraged to reword them to better suit their particular
|
* and in fact are encouraged to reword them to better suit their particular
|
||||||
* situation better. See how "git checkout" and "git merge" replaces
|
* situation better. See how "git checkout" and "git merge" replaces
|
||||||
* them using set_porcelain_error_msgs(), for example.
|
* them using setup_unpack_trees_porcelain(), for example.
|
||||||
*/
|
*/
|
||||||
const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
|
const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
|
||||||
/* ERROR_WOULD_OVERWRITE */
|
/* ERROR_WOULD_OVERWRITE */
|
||||||
|
@ -50,6 +50,54 @@ const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
|
||||||
? ((o)->msgs[(type)]) \
|
? ((o)->msgs[(type)]) \
|
||||||
: (unpack_plumbing_errors[(type)]) )
|
: (unpack_plumbing_errors[(type)]) )
|
||||||
|
|
||||||
|
void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
|
||||||
|
const char *cmd)
|
||||||
|
{
|
||||||
|
const char **msgs = opts->msgs;
|
||||||
|
const char *msg;
|
||||||
|
char *tmp;
|
||||||
|
const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
|
||||||
|
if (advice_commit_before_merge)
|
||||||
|
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.";
|
||||||
|
else
|
||||||
|
msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
|
||||||
|
tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 2);
|
||||||
|
sprintf(tmp, msg, cmd, cmd2);
|
||||||
|
msgs[ERROR_WOULD_OVERWRITE] = tmp;
|
||||||
|
msgs[ERROR_NOT_UPTODATE_FILE] = tmp;
|
||||||
|
|
||||||
|
msgs[ERROR_NOT_UPTODATE_DIR] =
|
||||||
|
"Updating the following directories would lose untracked files in it:\n%s";
|
||||||
|
|
||||||
|
if (advice_commit_before_merge)
|
||||||
|
msg = "The following untracked working tree files would be %s by %s:\n%%s"
|
||||||
|
"Please move or remove them before you can %s.";
|
||||||
|
else
|
||||||
|
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);
|
||||||
|
sprintf(tmp, msg, "removed", cmd, cmd2);
|
||||||
|
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp;
|
||||||
|
tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4);
|
||||||
|
sprintf(tmp, msg, "overwritten", cmd, cmd2);
|
||||||
|
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";
|
||||||
|
|
||||||
|
opts->show_all_errors = 1;
|
||||||
|
}
|
||||||
|
|
||||||
static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
|
static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
|
||||||
unsigned int set, unsigned int clear)
|
unsigned int set, unsigned int clear)
|
||||||
{
|
{
|
||||||
|
@ -77,12 +125,6 @@ static int add_rejected_path(struct unpack_trees_options *o,
|
||||||
const char *path)
|
const char *path)
|
||||||
{
|
{
|
||||||
struct rejected_paths_list *newentry;
|
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)
|
if (!o->show_all_errors)
|
||||||
return error(ERRORMSG(o, e), path);
|
return error(ERRORMSG(o, e), path);
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,13 @@ enum unpack_trees_error_types {
|
||||||
NB_UNPACK_TREES_ERROR_TYPES
|
NB_UNPACK_TREES_ERROR_TYPES
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Sets the list of user-friendly error messages to be used by the
|
||||||
|
* command "cmd" (either merge or checkout), and show_all_errors to 1.
|
||||||
|
*/
|
||||||
|
void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
|
||||||
|
const char *cmd);
|
||||||
|
|
||||||
struct rejected_paths_list {
|
struct rejected_paths_list {
|
||||||
char *path;
|
char *path;
|
||||||
struct rejected_paths_list *next;
|
struct rejected_paths_list *next;
|
||||||
|
|
Loading…
Reference in New Issue