Move set_porcelain_error_msgs to unpack-trees.c and rename it
The function is currently dealing only with error messages, but the intent of calling it is really to notify the unpack-tree mechanics that it is running in porcelain mode. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
e935e62a0f
commit
dc1166e685
@ -14,7 +14,7 @@
|
||||
* 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
|
||||
* 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] = {
|
||||
/* ERROR_WOULD_OVERWRITE */
|
||||
@ -50,6 +50,50 @@ const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
|
||||
? ((o)->msgs[(type)]) \
|
||||
: (unpack_plumbing_errors[(type)]) )
|
||||
|
||||
void setup_unpack_trees_porcelain(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";
|
||||
}
|
||||
|
||||
static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
|
||||
unsigned int set, unsigned int clear)
|
||||
{
|
||||
|
Reference in New Issue
Block a user