mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 16:56:15 +02:00
Code

Turn unpack_trees_options.msgs into an array + enum 

The list of error messages was introduced as a structure, but an array
indexed over an enum is more flexible, since it allows one to store a
type of error message (index in the array) in a variable.

This change needs to rename would_lose_untracked ->
would_lose_untracked_file to avoid a clash with the function
would_lose_untracked in merge-recursive.c.

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:04 +02:00 committed by Junio C Hamano
parent 64fdc08dac
commit 08353ebbab
6 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/checkout.c
View File

@ -373,7 +373,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;
topts.msgs.not_uptodate_file = "You have local changes to '%s'; cannot switch branches."; topts.msgs[ERROR_NOT_UPTODATE_FILE] = "You have local changes to '%s'; cannot switch branches.";
refresh_cache(REFRESH_QUIET); refresh_cache(REFRESH_QUIET);

2
builtin/merge.c
View File

@ -704,7 +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.msgs = get_porcelain_error_msgs(); set_porcelain_error_msgs(opts.msgs);
trees[nr_trees] = parse_tree_indirect(head); trees[nr_trees] = parse_tree_indirect(head);
if (!trees[nr_trees++]) if (!trees[nr_trees++])

29
merge-recursive.c
View File

@ -185,7 +185,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;
opts.msgs = get_porcelain_error_msgs(); set_porcelain_error_msgs(opts.msgs);
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);
@ -1178,26 +1178,19 @@ static int process_entry(struct merge_options *o,
return clean_merge; return clean_merge;
} }
struct unpack_trees_error_msgs get_porcelain_error_msgs(void) void set_porcelain_error_msgs(const char **msgs)
{ {
struct unpack_trees_error_msgs msgs = { if (advice_commit_before_merge)
/* would_overwrite */ msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
"Your local changes to '%s' would be overwritten by merge. Aborting.",
/* not_uptodate_file */
"Your local changes to '%s' would be overwritten by merge. Aborting.",
/* not_uptodate_dir */
"Updating '%s' would lose untracked files in it. Aborting.",
/* would_lose_untracked */
"Untracked working tree file '%s' would be %s by merge. Aborting",
/* bind_overlap -- will not happen here */
NULL,
};
if (advice_commit_before_merge) {
msgs.would_overwrite = msgs.not_uptodate_file =
"Your local changes to '%s' would be overwritten by merge. Aborting.\n" "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
"Please, commit your changes or stash them before you can merge."; "Please, commit your changes or stash them before you can merge.";
} else
return msgs; msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
"Your local changes to '%s' would be overwritten by merge. Aborting.";
msgs[ERROR_NOT_UPTODATE_DIR] =
"Updating '%s' would lose untracked files in it. Aborting.";
msgs[ERROR_WOULD_LOSE_UNTRACKED] =
"Untracked working tree file '%s' would be %s by merge. Aborting";
} }
int merge_trees(struct merge_options *o, int merge_trees(struct merge_options *o,

4
merge-recursive.h
View File

@ -23,8 +23,8 @@ struct merge_options {
struct string_list current_directory_set; struct string_list current_directory_set;
}; };
/* Return a list of user-friendly error messages to be used by merge */ /* Sets the list of user-friendly error messages to be used by merge */
struct unpack_trees_error_msgs get_porcelain_error_msgs(void); void set_porcelain_error_msgs(const char **msgs);
/* 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,

42
unpack-trees.c
View File

@ -13,37 +13,37 @@
* Error messages expected by scripts out of plumbing commands such as * Error messages expected by scripts out of plumbing commands such as
* 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" replaces not_uptodate_file to * situation better. See how "git checkout" replaces ERROR_NOT_UPTODATE_FILE to
* explain why it does not allow switching between branches when you have * explain why it does not allow switching between branches when you have
* local changes, for example. * local changes, for example.
*/ */
static struct unpack_trees_error_msgs unpack_plumbing_errors = { const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
/* would_overwrite */ /* ERROR_WOULD_OVERWRITE */
"Entry '%s' would be overwritten by merge. Cannot merge.", "Entry '%s' would be overwritten by merge. Cannot merge.",
/* not_uptodate_file */ /* ERROR_NOT_UPTODATE_FILE */
"Entry '%s' not uptodate. Cannot merge.", "Entry '%s' not uptodate. Cannot merge.",
/* not_uptodate_dir */ /* ERROR_NOT_UPTODATE_DIR */
"Updating '%s' would lose untracked files in it", "Updating '%s' would lose untracked files in it",
/* would_lose_untracked */ /* ERROR_WOULD_LOSE_UNTRACKED */
"Untracked working tree file '%s' would be %s by merge.", "Untracked working tree file '%s' would be %s by merge.",
/* bind_overlap */ /* ERROR_BIND_OVERLAP */
"Entry '%s' overlaps with '%s'. Cannot bind.", "Entry '%s' overlaps with '%s'. Cannot bind.",
/* sparse_not_uptodate_file */ /* ERROR_SPARSE_NOT_UPTODATE_FILE */
"Entry '%s' not uptodate. Cannot update sparse checkout.", "Entry '%s' not uptodate. Cannot update sparse checkout.",
/* would_lose_orphaned */ /* ERROR_WOULD_LOSE_ORPHANED */
"Working tree file '%s' would be %s by sparse checkout update.", "Working tree file '%s' would be %s by sparse checkout update.",
}; };
#define ERRORMSG(o,fld) \ #define ERRORMSG(o,type) \
( ((o) && (o)->msgs.fld) \ ( ((o) && (o)->msgs[(type)]) \
? ((o)->msgs.fld) \ ? ((o)->msgs[(type)]) \
: (unpack_plumbing_errors.fld) ) : (unpack_plumbing_errors[(type)]) )
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)
@ -838,7 +838,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
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, would_overwrite), ce->name); return error(ERRORMSG(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)
@ -893,13 +893,13 @@ static int verify_uptodate(struct cache_entry *ce,
{ {
if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o)) if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o))
return 0; return 0;
return verify_uptodate_1(ce, o, ERRORMSG(o, not_uptodate_file)); return verify_uptodate_1(ce, o, ERRORMSG(o, ERROR_NOT_UPTODATE_FILE));
} }
static int verify_uptodate_sparse(struct cache_entry *ce, static int verify_uptodate_sparse(struct cache_entry *ce,
struct unpack_trees_options *o) struct unpack_trees_options *o)
{ {
return verify_uptodate_1(ce, o, ERRORMSG(o, sparse_not_uptodate_file)); return verify_uptodate_1(ce, o, ERRORMSG(o, ERROR_SPARSE_NOT_UPTODATE_FILE));
} }
static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o) static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)
@ -986,7 +986,7 @@ static int verify_clean_subdirectory(struct cache_entry *ce, const char *action,
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, not_uptodate_dir), ce->name); error(ERRORMSG(o, ERROR_NOT_UPTODATE_DIR), ce->name);
free(pathbuf); free(pathbuf);
return cnt; return cnt;
} }
@ -1068,7 +1068,7 @@ static int verify_absent_1(struct cache_entry *ce, const char *action,
} }
return o->gently ? -1 : return o->gently ? -1 :
error(ERRORMSG(o, would_lose_untracked), ce->name, action); error(ERRORMSG(o, ERROR_WOULD_LOSE_UNTRACKED), ce->name, action);
} }
return 0; return 0;
} }
@ -1077,13 +1077,13 @@ static int verify_absent(struct cache_entry *ce, const char *action,
{ {
if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o)) if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o))
return 0; return 0;
return verify_absent_1(ce, action, o, ERRORMSG(o, would_lose_untracked)); return verify_absent_1(ce, action, o, ERRORMSG(o, ERROR_WOULD_LOSE_UNTRACKED));
} }
static int verify_absent_sparse(struct cache_entry *ce, const char *action, static int verify_absent_sparse(struct cache_entry *ce, const char *action,
struct unpack_trees_options *o) struct unpack_trees_options *o)
{ {
return verify_absent_1(ce, action, o, ERRORMSG(o, would_lose_orphaned)); return verify_absent_1(ce, action, o, ERRORMSG(o, ERROR_WOULD_LOSE_ORPHANED));
} }
static int merged_entry(struct cache_entry *merge, struct cache_entry *old, static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
@ -1412,7 +1412,7 @@ int bind_merge(struct cache_entry **src,
o->merge_size); o->merge_size);
if (a && old) if (a && old)
return o->gently ? -1 : return o->gently ? -1 :
error(ERRORMSG(o, bind_overlap), a->name, old->name); error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name);
if (!a) if (!a)
return keep_entry(old, o); return keep_entry(old, o);
else else

19
unpack-trees.h
View File

@ -9,14 +9,15 @@ struct exclude_list;
typedef int (*merge_fn_t)(struct cache_entry **src, typedef int (*merge_fn_t)(struct cache_entry **src,
struct unpack_trees_options *options); struct unpack_trees_options *options);
struct unpack_trees_error_msgs { enum unpack_trees_error_types {
const char *would_overwrite; ERROR_WOULD_OVERWRITE = 0,
const char *not_uptodate_file; ERROR_NOT_UPTODATE_FILE,
const char *not_uptodate_dir; ERROR_NOT_UPTODATE_DIR,
const char *would_lose_untracked; ERROR_WOULD_LOSE_UNTRACKED,
const char *bind_overlap; ERROR_BIND_OVERLAP,
const char *sparse_not_uptodate_file; ERROR_SPARSE_NOT_UPTODATE_FILE,
const char *would_lose_orphaned; ERROR_WOULD_LOSE_ORPHANED,
NB_UNPACK_TREES_ERROR_TYPES
}; };
struct unpack_trees_options { struct unpack_trees_options {
@ -38,7 +39,7 @@ struct unpack_trees_options {
int cache_bottom; int cache_bottom;
struct dir_struct *dir; struct dir_struct *dir;
merge_fn_t fn; merge_fn_t fn;
struct unpack_trees_error_msgs msgs; const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
int head_idx; int head_idx;
int merge_size; int merge_size;