microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'jn/maint-notes-avoid-va-args' into maint 

* jn/maint-notes-avoid-va-args:
  notes merge: eliminate OUTPUT macro

Conflicts:
	notes-merge.c
This commit is contained in:
Junio C Hamano 2011-11-18 11:11:50 -08:00
Родитель 487da9cdf4 5f9f8d15f1
Коммит 01e0f162a7
1 изменённых файлов: 61 добавлений и 43 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

104
notes-merge.c
Просмотреть файл

@ -21,14 +21,6 @@ void init_notes_merge_options(struct notes_merge_options *o)
o->verbosity = NOTES_MERGE_VERBOSITY_DEFAULT; o->verbosity = NOTES_MERGE_VERBOSITY_DEFAULT;
} }
#define OUTPUT(o, v, ...) \
do { \
if ((o)->verbosity >= (v)) { \
printf(__VA_ARGS__); \
puts(""); \
} \
} while (0)
static int path_to_sha1(const char *path, unsigned char *sha1) static int path_to_sha1(const char *path, unsigned char *sha1)
{ {
char hex_sha1[40]; char hex_sha1[40];
@ -392,21 +384,26 @@ static int merge_one_change_manual(struct notes_merge_options *o,
strbuf_addf(&(o->commit_msg), "\t%s\n", sha1_to_hex(p->obj)); strbuf_addf(&(o->commit_msg), "\t%s\n", sha1_to_hex(p->obj));
OUTPUT(o, 2, "Auto-merging notes for %s", sha1_to_hex(p->obj)); if (o->verbosity >= 2)
printf("Auto-merging notes for %s\n", sha1_to_hex(p->obj));
check_notes_merge_worktree(o); check_notes_merge_worktree(o);
if (is_null_sha1(p->local)) { if (is_null_sha1(p->local)) {
/* D/F conflict, checkout p->remote */ /* D/F conflict, checkout p->remote */
assert(!is_null_sha1(p->remote)); assert(!is_null_sha1(p->remote));
OUTPUT(o, 1, "CONFLICT (delete/modify): Notes for object %s " if (o->verbosity >= 1)
"deleted in %s and modified in %s. Version from %s " printf("CONFLICT (delete/modify): Notes for object %s "
"left in tree.", sha1_to_hex(p->obj), lref, rref, rref); "deleted in %s and modified in %s. Version from %s "
"left in tree.\n",
sha1_to_hex(p->obj), lref, rref, rref);
write_note_to_worktree(p->obj, p->remote); write_note_to_worktree(p->obj, p->remote);
} else if (is_null_sha1(p->remote)) { } else if (is_null_sha1(p->remote)) {
/* D/F conflict, checkout p->local */ /* D/F conflict, checkout p->local */
assert(!is_null_sha1(p->local)); assert(!is_null_sha1(p->local));
OUTPUT(o, 1, "CONFLICT (delete/modify): Notes for object %s " if (o->verbosity >= 1)
"deleted in %s and modified in %s. Version from %s " printf("CONFLICT (delete/modify): Notes for object %s "
"left in tree.", sha1_to_hex(p->obj), rref, lref, lref); "deleted in %s and modified in %s. Version from %s "
"left in tree.\n",
sha1_to_hex(p->obj), rref, lref, lref);
write_note_to_worktree(p->obj, p->local); write_note_to_worktree(p->obj, p->local);
} else { } else {
/* "regular" conflict, checkout result of ll_merge() */ /* "regular" conflict, checkout result of ll_merge() */
@ -415,8 +412,9 @@ static int merge_one_change_manual(struct notes_merge_options *o,
reason = "add/add"; reason = "add/add";
assert(!is_null_sha1(p->local)); assert(!is_null_sha1(p->local));
assert(!is_null_sha1(p->remote)); assert(!is_null_sha1(p->remote));
OUTPUT(o, 1, "CONFLICT (%s): Merge conflict in notes for " if (o->verbosity >= 1)
"object %s", reason, sha1_to_hex(p->obj)); printf("CONFLICT (%s): Merge conflict in notes for "
"object %s\n", reason, sha1_to_hex(p->obj));
ll_merge_in_worktree(o, p); ll_merge_in_worktree(o, p);
} }
@ -438,24 +436,30 @@ static int merge_one_change(struct notes_merge_options *o,
case NOTES_MERGE_RESOLVE_MANUAL: case NOTES_MERGE_RESOLVE_MANUAL:
return merge_one_change_manual(o, p, t); return merge_one_change_manual(o, p, t);
case NOTES_MERGE_RESOLVE_OURS: case NOTES_MERGE_RESOLVE_OURS:
OUTPUT(o, 2, "Using local notes for %s", sha1_to_hex(p->obj)); if (o->verbosity >= 2)
printf("Using local notes for %s\n",
sha1_to_hex(p->obj));
/* nothing to do */ /* nothing to do */
return 0; return 0;
case NOTES_MERGE_RESOLVE_THEIRS: case NOTES_MERGE_RESOLVE_THEIRS:
OUTPUT(o, 2, "Using remote notes for %s", sha1_to_hex(p->obj)); if (o->verbosity >= 2)
printf("Using remote notes for %s\n",
sha1_to_hex(p->obj));
if (add_note(t, p->obj, p->remote, combine_notes_overwrite)) if (add_note(t, p->obj, p->remote, combine_notes_overwrite))
die("BUG: combine_notes_overwrite failed"); die("BUG: combine_notes_overwrite failed");
return 0; return 0;
case NOTES_MERGE_RESOLVE_UNION: case NOTES_MERGE_RESOLVE_UNION:
OUTPUT(o, 2, "Concatenating local and remote notes for %s", if (o->verbosity >= 2)
sha1_to_hex(p->obj)); printf("Concatenating local and remote notes for %s\n",
sha1_to_hex(p->obj));
if (add_note(t, p->obj, p->remote, combine_notes_concatenate)) if (add_note(t, p->obj, p->remote, combine_notes_concatenate))
die("failed to concatenate notes " die("failed to concatenate notes "
"(combine_notes_concatenate)"); "(combine_notes_concatenate)");
return 0; return 0;
case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ: case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ:
OUTPUT(o, 2, "Concatenating unique lines in local and remote " if (o->verbosity >= 2)
"notes for %s", sha1_to_hex(p->obj)); printf("Concatenating unique lines in local and remote "
"notes for %s\n", sha1_to_hex(p->obj));
if (add_note(t, p->obj, p->remote, combine_notes_cat_sort_uniq)) if (add_note(t, p->obj, p->remote, combine_notes_cat_sort_uniq))
die("failed to concatenate notes " die("failed to concatenate notes "
"(combine_notes_cat_sort_uniq)"); "(combine_notes_cat_sort_uniq)");
@ -518,8 +522,9 @@ static int merge_from_diffs(struct notes_merge_options *o,
conflicts = merge_changes(o, changes, &num_changes, t); conflicts = merge_changes(o, changes, &num_changes, t);
free(changes); free(changes);
OUTPUT(o, 4, "Merge result: %i unmerged notes and a %s notes tree", if (o->verbosity >= 4)
conflicts, t->dirty ? "dirty" : "clean"); printf("Merge result: %i unmerged notes and a %s notes tree\n",
conflicts, t->dirty ? "dirty" : "clean");
return conflicts ? -1 : 1; return conflicts ? -1 : 1;
} }
@ -616,33 +621,40 @@ int notes_merge(struct notes_merge_options *o,
if (!bases) { if (!bases) {
base_sha1 = null_sha1; base_sha1 = null_sha1;
base_tree_sha1 = EMPTY_TREE_SHA1_BIN; base_tree_sha1 = EMPTY_TREE_SHA1_BIN;
OUTPUT(o, 4, "No merge base found; doing history-less merge"); if (o->verbosity >= 4)
printf("No merge base found; doing history-less merge\n");
} else if (!bases->next) { } else if (!bases->next) {
base_sha1 = bases->item->object.sha1; base_sha1 = bases->item->object.sha1;
base_tree_sha1 = bases->item->tree->object.sha1; base_tree_sha1 = bases->item->tree->object.sha1;
OUTPUT(o, 4, "One merge base found (%.7s)", if (o->verbosity >= 4)
sha1_to_hex(base_sha1)); printf("One merge base found (%.7s)\n",
sha1_to_hex(base_sha1));
} else { } else {
/* TODO: How to handle multiple merge-bases? */ /* TODO: How to handle multiple merge-bases? */
base_sha1 = bases->item->object.sha1; base_sha1 = bases->item->object.sha1;
base_tree_sha1 = bases->item->tree->object.sha1; base_tree_sha1 = bases->item->tree->object.sha1;
OUTPUT(o, 3, "Multiple merge bases found. Using the first " if (o->verbosity >= 3)
"(%.7s)", sha1_to_hex(base_sha1)); printf("Multiple merge bases found. Using the first "
"(%.7s)\n", sha1_to_hex(base_sha1));
} }
OUTPUT(o, 4, "Merging remote commit %.7s into local commit %.7s with " if (o->verbosity >= 4)
"merge-base %.7s", sha1_to_hex(remote->object.sha1), printf("Merging remote commit %.7s into local commit %.7s with "
sha1_to_hex(local->object.sha1), sha1_to_hex(base_sha1)); "merge-base %.7s\n", sha1_to_hex(remote->object.sha1),
sha1_to_hex(local->object.sha1),
sha1_to_hex(base_sha1));
if (!hashcmp(remote->object.sha1, base_sha1)) { if (!hashcmp(remote->object.sha1, base_sha1)) {
/* Already merged; result == local commit */ /* Already merged; result == local commit */
OUTPUT(o, 2, "Already up-to-date!"); if (o->verbosity >= 2)
printf("Already up-to-date!\n");
hashcpy(result_sha1, local->object.sha1); hashcpy(result_sha1, local->object.sha1);
goto found_result; goto found_result;
} }
if (!hashcmp(local->object.sha1, base_sha1)) { if (!hashcmp(local->object.sha1, base_sha1)) {
/* Fast-forward; result == remote commit */ /* Fast-forward; result == remote commit */
OUTPUT(o, 2, "Fast-forward"); if (o->verbosity >= 2)
printf("Fast-forward\n");
hashcpy(result_sha1, remote->object.sha1); hashcpy(result_sha1, remote->object.sha1);
goto found_result; goto found_result;
} }
@ -684,8 +696,9 @@ int notes_merge_commit(struct notes_merge_options *o,
int path_len = strlen(path), i; int path_len = strlen(path), i;
const char *msg = strstr(partial_commit->buffer, "\n\n"); const char *msg = strstr(partial_commit->buffer, "\n\n");
OUTPUT(o, 3, "Committing notes in notes merge worktree at %.*s", if (o->verbosity >= 3)
path_len - 1, path); printf("Committing notes in notes merge worktree at %.*s\n",
path_len - 1, path);
if (!msg || msg[2] == '\0') if (!msg || msg[2] == '\0')
die("partial notes commit has empty message"); die("partial notes commit has empty message");
@ -700,7 +713,9 @@ int notes_merge_commit(struct notes_merge_options *o,
unsigned char obj_sha1[20], blob_sha1[20]; unsigned char obj_sha1[20], blob_sha1[20];
if (ent->len - path_len != 40 || get_sha1_hex(relpath, obj_sha1)) { if (ent->len - path_len != 40 || get_sha1_hex(relpath, obj_sha1)) {
OUTPUT(o, 3, "Skipping non-SHA1 entry '%s'", ent->name); if (o->verbosity >= 3)
printf("Skipping non-SHA1 entry '%s'\n",
ent->name);
continue; continue;
} }
@ -712,14 +727,16 @@ int notes_merge_commit(struct notes_merge_options *o,
if (add_note(partial_tree, obj_sha1, blob_sha1, NULL)) if (add_note(partial_tree, obj_sha1, blob_sha1, NULL))
die("Failed to add resolved note '%s' to notes tree", die("Failed to add resolved note '%s' to notes tree",
ent->name); ent->name);
OUTPUT(o, 4, "Added resolved note for object %s: %s", if (o->verbosity >= 4)
sha1_to_hex(obj_sha1), sha1_to_hex(blob_sha1)); printf("Added resolved note for object %s: %s\n",
sha1_to_hex(obj_sha1), sha1_to_hex(blob_sha1));
} }
create_notes_commit(partial_tree, partial_commit->parents, msg, create_notes_commit(partial_tree, partial_commit->parents, msg,
result_sha1); result_sha1);
OUTPUT(o, 4, "Finalized notes merge commit: %s", if (o->verbosity >= 4)
sha1_to_hex(result_sha1)); printf("Finalized notes merge commit: %s\n",
sha1_to_hex(result_sha1));
free(path); free(path);
return 0; return 0;
} }
@ -731,7 +748,8 @@ int notes_merge_abort(struct notes_merge_options *o)
int ret; int ret;
strbuf_addstr(&buf, git_path(NOTES_MERGE_WORKTREE)); strbuf_addstr(&buf, git_path(NOTES_MERGE_WORKTREE));
OUTPUT(o, 3, "Removing notes merge worktree at %s", buf.buf); if (o->verbosity >= 3)
printf("Removing notes merge worktree at %s\n", buf.buf);
ret = remove_dir_recursively(&buf, 0); ret = remove_dir_recursively(&buf, 0);
strbuf_release(&buf); strbuf_release(&buf);
return ret; return ret;