From: Johan Herland <johan@herland.net>
To: gitster@pobox.com
Cc: git@vger.kernel.org, jrnieder@gmail.com, pclouds@gmail.com,
artagnon@gmail.com, john@keeping.me.uk, vfr@lyx.org,
peff@peff.net, felipe.contreras@gmail.com,
torvalds@linux-foundation.org, johan@herland.net
Subject: [PATCH 3/3] Move create_notes_commit() from notes-merge.c into notes-utils.c
Date: Wed, 12 Jun 2013 02:13:01 +0200 [thread overview]
Message-ID: <1370995981-1553-4-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1370995981-1553-1-git-send-email-johan@herland.net>
create_notes_commit() is needed by both the notes-merge code, and by
commit_notes() in notes-utils. Since it is generally useful, and not
bound to the notes-merge machinery, we move it from (the more specific)
notes-merge to (the more general) notes-utils.
Signed-off-by: Johan Herland <johan@herland.net>
---
notes-merge.c | 27 +--------------------------
notes-merge.h | 14 --------------
notes-utils.c | 27 ++++++++++++++++++++++++++-
notes-utils.h | 14 ++++++++++++++
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/notes-merge.c b/notes-merge.c
index 0f67bd3..ab18857 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -9,6 +9,7 @@
#include "notes.h"
#include "notes-merge.h"
#include "strbuf.h"
+#include "notes-utils.h"
struct notes_merge_pair {
unsigned char obj[20], base[20], local[20], remote[20];
@@ -530,32 +531,6 @@ static int merge_from_diffs(struct notes_merge_options *o,
return conflicts ? -1 : 1;
}
-void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
- const struct strbuf *msg, unsigned char *result_sha1)
-{
- unsigned char tree_sha1[20];
-
- assert(t->initialized);
-
- if (write_notes_tree(t, tree_sha1))
- die("Failed to write notes tree to database");
-
- if (!parents) {
- /* Deduce parent commit from t->ref */
- unsigned char parent_sha1[20];
- if (!read_ref(t->ref, parent_sha1)) {
- struct commit *parent = lookup_commit(parent_sha1);
- if (!parent || parse_commit(parent))
- die("Failed to find/parse commit %s", t->ref);
- commit_list_insert(parent, &parents);
- }
- /* else: t->ref points to nothing, assume root/orphan commit */
- }
-
- if (commit_tree(msg, tree_sha1, parents, result_sha1, NULL, NULL))
- die("Failed to commit notes tree to database");
-}
-
int notes_merge(struct notes_merge_options *o,
struct notes_tree *local_tree,
unsigned char *result_sha1)
diff --git a/notes-merge.h b/notes-merge.h
index 0c11b17..1d01f6a 100644
--- a/notes-merge.h
+++ b/notes-merge.h
@@ -26,20 +26,6 @@ struct notes_merge_options {
void init_notes_merge_options(struct notes_merge_options *o);
/*
- * Create new notes commit from the given notes tree
- *
- * Properties of the created commit:
- * - tree: the result of converting t to a tree object with write_notes_tree().
- * - parents: the given parents OR (if NULL) the commit referenced by t->ref.
- * - author/committer: the default determined by commmit_tree().
- * - commit message: msg
- *
- * The resulting commit SHA1 is stored in result_sha1.
- */
-void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
- const struct strbuf *msg, unsigned char *result_sha1);
-
-/*
* Merge notes from o->remote_ref into o->local_ref
*
* The given notes_tree 'local_tree' must be the notes_tree referenced by the
diff --git a/notes-utils.c b/notes-utils.c
index 2ae5cb2..9107c37 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -2,7 +2,32 @@
#include "commit.h"
#include "refs.h"
#include "notes-utils.h"
-#include "notes-merge.h" // need create_notes_commit()
+
+void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
+ const struct strbuf *msg, unsigned char *result_sha1)
+{
+ unsigned char tree_sha1[20];
+
+ assert(t->initialized);
+
+ if (write_notes_tree(t, tree_sha1))
+ die("Failed to write notes tree to database");
+
+ if (!parents) {
+ /* Deduce parent commit from t->ref */
+ unsigned char parent_sha1[20];
+ if (!read_ref(t->ref, parent_sha1)) {
+ struct commit *parent = lookup_commit(parent_sha1);
+ if (!parent || parse_commit(parent))
+ die("Failed to find/parse commit %s", t->ref);
+ commit_list_insert(parent, &parents);
+ }
+ /* else: t->ref points to nothing, assume root/orphan commit */
+ }
+
+ if (commit_tree(msg, tree_sha1, parents, result_sha1, NULL, NULL))
+ die("Failed to commit notes tree to database");
+}
void commit_notes(struct notes_tree *t, const char *msg)
{
diff --git a/notes-utils.h b/notes-utils.h
index 0661e99..b4cb1bf 100644
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -3,6 +3,20 @@
#include "notes.h"
+/*
+ * Create new notes commit from the given notes tree
+ *
+ * Properties of the created commit:
+ * - tree: the result of converting t to a tree object with write_notes_tree().
+ * - parents: the given parents OR (if NULL) the commit referenced by t->ref.
+ * - author/committer: the default determined by commmit_tree().
+ * - commit message: msg
+ *
+ * The resulting commit SHA1 is stored in result_sha1.
+ */
+void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
+ const struct strbuf *msg, unsigned char *result_sha1);
+
void commit_notes(struct notes_tree *t, const char *msg);
struct notes_rewrite_cfg {
--
1.8.1.3.704.g33f7d4f
next prev parent reply other threads:[~2013-06-12 0:13 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-08 17:29 [PATCH] build: get rid of the notion of a git library Felipe Contreras
2013-06-08 18:02 ` Ramkumar Ramachandra
2013-06-08 18:22 ` Felipe Contreras
2013-06-09 14:56 ` Ramkumar Ramachandra
2013-06-09 15:12 ` John Keeping
2013-06-09 15:40 ` Felipe Contreras
2013-06-09 16:02 ` John Keeping
2013-06-09 16:22 ` Felipe Contreras
2013-06-09 16:42 ` John Keeping
2013-06-09 17:03 ` Ramkumar Ramachandra
2013-06-09 17:12 ` Ramkumar Ramachandra
2013-06-09 17:13 ` Felipe Contreras
2013-06-09 17:32 ` John Keeping
2013-06-09 17:45 ` Felipe Contreras
2013-06-09 16:36 ` Ramkumar Ramachandra
2013-06-09 17:30 ` Vincent van Ravesteijn
2013-06-09 17:35 ` Felipe Contreras
2013-06-10 21:45 ` Jeff King
2013-06-10 21:52 ` Felipe Contreras
2013-06-10 22:06 ` Jeff King
2013-06-10 22:22 ` Felipe Contreras
2013-06-10 23:05 ` Junio C Hamano
2013-06-10 23:41 ` Junio C Hamano
2013-06-10 23:51 ` Felipe Contreras
2013-06-11 0:04 ` Junio C Hamano
2013-06-11 1:53 ` Junio C Hamano
2013-06-11 4:15 ` Felipe Contreras
2013-06-11 17:33 ` Junio C Hamano
2013-06-11 17:41 ` Felipe Contreras
2013-06-11 17:58 ` Junio C Hamano
2013-06-11 18:06 ` Felipe Contreras
2013-06-11 18:14 ` Linus Torvalds
2013-06-11 19:15 ` Felipe Contreras
2013-06-11 19:59 ` Junio C Hamano
2013-06-11 20:12 ` Felipe Contreras
2013-06-12 0:12 ` [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch] Johan Herland
2013-06-12 0:12 ` [PATCH 1/3] finish_copy_notes_for_rewrite(): Let caller provide commit message Johan Herland
2013-06-12 17:27 ` Junio C Hamano
2013-06-12 0:13 ` [PATCH 2/3] Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c Johan Herland
2013-06-12 0:32 ` Felipe Contreras
2013-06-12 7:10 ` Johan Herland
2013-06-12 18:28 ` Felipe Contreras
2013-06-12 19:14 ` Johan Herland
2013-06-12 19:18 ` Felipe Contreras
2013-06-13 6:45 ` Andreas Krey
2013-06-13 13:13 ` Felipe Contreras
2013-06-12 20:02 ` Junio C Hamano
2013-06-12 0:13 ` Johan Herland [this message]
2013-06-12 20:02 ` [PATCH 0/3] Refactor useful notes functions into notes-utils.[ch] Junio C Hamano
2013-06-12 20:11 ` Felipe Contreras
2013-06-13 17:24 ` Junio C Hamano
2013-06-13 18:16 ` Felipe Contreras
2013-06-13 18:50 ` Felipe Contreras
2013-06-11 18:17 ` [PATCH] build: get rid of the notion of a git library Junio C Hamano
2013-06-11 19:01 ` Felipe Contreras
2013-06-11 19:24 ` Junio C Hamano
2013-06-11 19:49 ` Felipe Contreras
2013-06-11 4:04 ` Felipe Contreras
2013-06-09 15:41 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370995981-1553-4-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=artagnon@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
--cc=vfr@lyx.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).