Commit 07871d3adcfdaba7ad5f99f89299258d1dbd92f9
2013-01-03T07:43:27
Merge pull request #1181 from nvloff/allow_note_overwrite Allow note overwrite
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181
diff --git a/include/git2/notes.h b/include/git2/notes.h
index ae66975..ddd54b0 100644
--- a/include/git2/notes.h
+++ b/include/git2/notes.h
@@ -76,6 +76,7 @@ GIT_EXTERN(const git_oid *) git_note_oid(const git_note *note);
* defaults to "refs/notes/commits"
* @param oid OID of the git object to decorate
* @param note Content of the note to add for object oid
+ * @param force Overwrite existing note
*
* @return 0 or an error code
*/
@@ -86,7 +87,8 @@ GIT_EXTERN(int) git_note_create(
const git_signature *committer,
const char *notes_ref,
const git_oid *oid,
- const char *note);
+ const char *note,
+ int force);
/**
diff --git a/src/notes.c b/src/notes.c
index 8a27bdb..c0ff48f 100644
--- a/src/notes.c
+++ b/src/notes.c
@@ -129,10 +129,10 @@ static int manipulate_note_in_tree_r(
git_tree *parent,
git_oid *note_oid,
const char *annotated_object_sha,
- int fanout,
+ int fanout,
int (*note_exists_cb)(
- git_tree **out,
- git_repository *repo,
+ git_tree **out,
+ git_repository *repo,
git_tree *parent,
git_oid *note_oid,
const char *annotated_object_sha,
@@ -147,7 +147,7 @@ static int manipulate_note_in_tree_r(
int fanout,
int current_error))
{
- int error = -1;
+ int error = -1;
git_tree *subtree = NULL, *new = NULL;
char subtree_name[3];
@@ -270,12 +270,13 @@ static int note_write(git_oid *out,
const char *note,
git_tree *commit_tree,
const char *target,
- git_commit **parents)
+ git_commit **parents,
+ int allow_note_overwrite)
{
int error;
git_oid oid;
git_tree *tree = NULL;
-
+
// TODO: should we apply filters?
/* create note object */
if ((error = git_blob_create_frombuffer(&oid, repo, note, strlen(note))) < 0)
@@ -283,7 +284,8 @@ static int note_write(git_oid *out,
if ((error = manipulate_note_in_tree_r(
&tree, repo, commit_tree, &oid, target, 0,
- insert_note_in_tree_eexists_cb, insert_note_in_tree_enotfound_cb)) < 0)
+ allow_note_overwrite ? insert_note_in_tree_enotfound_cb : insert_note_in_tree_eexists_cb,
+ insert_note_in_tree_enotfound_cb)) < 0)
goto cleanup;
if (out)
@@ -351,7 +353,7 @@ static int note_remove(git_repository *repo,
int error;
git_tree *tree_after_removal = NULL;
git_oid oid;
-
+
if ((error = manipulate_note_in_tree_r(
&tree_after_removal, repo, tree, NULL, target, 0,
remove_note_in_tree_eexists_cb, remove_note_in_tree_enotfound_cb)) < 0)
@@ -449,7 +451,8 @@ int git_note_create(
const git_signature *committer,
const char *notes_ref,
const git_oid *oid,
- const char *note)
+ const char *note,
+ int allow_note_overwrite)
{
int error;
char *target = NULL;
@@ -465,7 +468,7 @@ int git_note_create(
goto cleanup;
error = note_write(out, repo, author, committer, notes_ref,
- note, tree, target, &commit);
+ note, tree, target, &commit, allow_note_overwrite);
cleanup:
git__free(target);
diff --git a/tests-clar/notes/notes.c b/tests-clar/notes/notes.c
index 3f5194c..ee0b6c2 100644
--- a/tests-clar/notes/notes.c
+++ b/tests-clar/notes/notes.c
@@ -34,7 +34,7 @@ static void create_note(git_oid *note_oid, const char *canonical_namespace, cons
git_oid oid;
cl_git_pass(git_oid_fromstr(&oid, target_sha));
- cl_git_pass(git_note_create(note_oid, _repo, _sig, _sig, canonical_namespace, &oid, message));
+ cl_git_pass(git_note_create(note_oid, _repo, _sig, _sig, canonical_namespace, &oid, message, 0));
}
static struct {
@@ -194,16 +194,40 @@ void test_notes_notes__creating_a_note_on_a_target_which_already_has_one_returns
cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125"));
create_note(¬e_oid, NULL, "08b041783f40edfe12bb406c9c9a8a040177c125", "hello world\n");
- error = git_note_create(¬e_oid, _repo, _sig, _sig, NULL, &target_oid, "hello world\n");
+ error = git_note_create(¬e_oid, _repo, _sig, _sig, NULL, &target_oid, "hello world\n", 0);
cl_git_fail(error);
cl_assert_equal_i(GIT_EEXISTS, error);
create_note(¬e_oid, "refs/notes/some/namespace", "08b041783f40edfe12bb406c9c9a8a040177c125", "hello world\n");
- error = git_note_create(¬e_oid, _repo, _sig, _sig, "refs/notes/some/namespace", &target_oid, "hello world\n");
+ error = git_note_create(¬e_oid, _repo, _sig, _sig, "refs/notes/some/namespace", &target_oid, "hello world\n", 0);
cl_git_fail(error);
cl_assert_equal_i(GIT_EEXISTS, error);
}
+
+void test_notes_notes__creating_a_note_on_a_target_can_overwrite_existing_note(void)
+{
+ git_oid note_oid, target_oid;
+ git_note *note, *namespace_note;
+
+ cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125"));
+
+ create_note(¬e_oid, NULL, "08b041783f40edfe12bb406c9c9a8a040177c125", "hello old world\n");
+ cl_git_pass(git_note_create(¬e_oid, _repo, _sig, _sig, NULL, &target_oid, "hello new world\n", 1));
+
+ cl_git_pass(git_note_read(¬e, _repo, NULL, &target_oid));
+ assert_note_equal(note, "hello new world\n", ¬e_oid);
+
+ create_note(¬e_oid, "refs/notes/some/namespace", "08b041783f40edfe12bb406c9c9a8a040177c125", "hello old world\n");
+ cl_git_pass(git_note_create(¬e_oid, _repo, _sig, _sig, "refs/notes/some/namespace", &target_oid, "hello new ref world\n", 1));
+
+ cl_git_pass(git_note_read(&namespace_note, _repo, "refs/notes/some/namespace", &target_oid));
+ assert_note_equal(namespace_note, "hello new ref world\n", ¬e_oid);
+
+ git_note_free(note);
+ git_note_free(namespace_note);
+}
+
static char *messages[] = {
"08c041783f40edfe12bb406c9c9a8a040177c125",
"96c45fbe09ab7445fc7c60fd8d17f32494399343",
@@ -244,7 +268,7 @@ void test_notes_notes__can_insert_a_note_in_an_existing_fanout(void)
cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125"));
for (i = 0; i < MESSAGES_COUNT; i++) {
- cl_git_pass(git_note_create(¬e_oid, _repo, _sig, _sig, "refs/notes/fanout", &target_oid, messages[i]));
+ cl_git_pass(git_note_create(¬e_oid, _repo, _sig, _sig, "refs/notes/fanout", &target_oid, messages[i], 0));
cl_git_pass(git_note_read(&_note, _repo, "refs/notes/fanout", &target_oid));
git_note_free(_note);
diff --git a/tests-clar/notes/notesref.c b/tests-clar/notes/notesref.c
index d26056f..633628c 100644
--- a/tests-clar/notes/notesref.c
+++ b/tests-clar/notes/notesref.c
@@ -42,7 +42,7 @@ void test_notes_notesref__config_corenotesref(void)
cl_git_pass(git_config_set_string(_cfg, "core.notesRef", "refs/notes/mydefaultnotesref"));
- cl_git_pass(git_note_create(¬e_oid, _repo, _sig, _sig, NULL, &oid, "test123test\n"));
+ cl_git_pass(git_note_create(¬e_oid, _repo, _sig, _sig, NULL, &oid, "test123test\n", 0));
cl_git_pass(git_note_read(&_note, _repo, NULL, &oid));
cl_assert(!strcmp(git_note_message(_note), "test123test\n"));