With this patch, you can set notes.displayRef to a glob that points at
your favourite notes refs, e.g.,
[notes]
displayRef = refs/notes/*
Then git-log and friends will show notes from all trees.
Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx>
---
Documentation/config.txt | 13 +++++-
notes.c | 104 +++++++++++++++++++++++++++++++++++++++++++---
notes.h | 7 +++
pretty.c | 6 +-
refs.c | 4 +-
refs.h | 5 ++
t/t3301-notes.sh | 65 +++++++++++++++++++++++------
t/t3306-notes-prune.sh | 6 +-
8 files changed, 181 insertions(+), 29 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4c36aa9..3c5cfec 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -517,7 +517,7 @@ core.notesRef::
after the full SHA-1 of the commit they annotate.
+
If such a file exists in the given ref, the referenced blob is read, and
-appended to the commit message, separated by a "Notes:" line. If the
+appended to the commit message, separated by a "Notes from <refname>:" line. If the
given ref itself does not exist, it is not an error, but means that no
notes should be printed.
+
@@ -1300,6 +1300,17 @@ mergetool.keepTemporaries::
mergetool.prompt::
Prompt before each invocation of the merge resolution program.
+notes.displayRef::
+ When showing commit messages, also show notes which are stored
+ in the given ref. The ref may also be a glob, in which case
+ notes from all matching refs will be shown. You may also
+ specify this configuration variable several times. If a ref
+ does not exist, it will be skipped silently.
++
+The effective value of "core.notesRef" (possibly overridden by
+GIT_NOTES_REF) is also implicitly added to the list of refs to be
+displayed.
+
pack.window::
The size of the window used by linkgit:git-pack-objects[1] when no
window size is given on the command line. Defaults to 10.
diff --git a/notes.c b/notes.c
index 3ba3e6d..d37178b 100644
--- a/notes.c
+++ b/notes.c
@@ -5,6 +5,8 @@
#include "utf8.h"
#include "strbuf.h"
#include "tree-walk.h"
+#include "string-list.h"
+#include "refs.h"
/*
* Use a non-balancing simple 16-tree structure with struct int_node as
@@ -68,6 +70,9 @@ struct non_note {
struct notes_tree default_notes_tree;
+struct string_list display_notes_refs;
+struct notes_tree **display_notes_trees;
+
static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
struct int_node *node, unsigned int n);
@@ -828,6 +833,44 @@ int combine_notes_ignore(unsigned char *cur_sha1,
return 0;
}
+static int string_list_add_one_ref(const char *path, const unsigned char *sha1,
+ int flag, void *cb)
+{
+ struct string_list *refs = cb;
+ string_list_insert(path, refs);
+ return 0;
+}
+
+void string_list_add_refs_by_glob(struct string_list *list, const char *glob)
+{
+ if (has_glob_specials(glob))
+ for_each_glob_ref(string_list_add_one_ref, glob, list);
+ else
+ string_list_insert(glob, list);
+}
+
+static int notes_display_config(const char *k, const char *v, void *cb)
+{
+ if (!strcmp(k, "notes.displayref")) {
+ string_list_add_refs_by_glob(&display_notes_refs, v);
+ return 0;
+ }
+
+ return 0;
+}
+
+static const char *default_notes_ref()
+{
+ const char *notes_ref = NULL;
+ if (!notes_ref)
+ notes_ref = getenv(GIT_NOTES_REF_ENVIRONMENT);
+ if (!notes_ref)
+ notes_ref = notes_ref_name; /* value of core.notesRef config */
+ if (!notes_ref)
+ notes_ref = GIT_NOTES_DEFAULT_REF;
+ return notes_ref;
+}
+
void init_notes(struct notes_tree *t, const char *notes_ref,
combine_notes_fn combine_notes, int flags)
{
@@ -840,11 +883,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
assert(!t->initialized);
if (!notes_ref)
- notes_ref = getenv(GIT_NOTES_REF_ENVIRONMENT);
- if (!notes_ref)
- notes_ref = notes_ref_name; /* value of core.notesRef config */
- if (!notes_ref)
- notes_ref = GIT_NOTES_DEFAULT_REF;
+ notes_ref = default_notes_ref();
if (!combine_notes)
combine_notes = combine_notes_concatenate;
@@ -868,6 +907,43 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
load_subtree(t, &root_tree, t->root, 0);
}
+struct load_notes_cb_data
+{
+ int counter;
+ struct notes_tree **trees;
+};
+
+static int load_one_display_note_ref(struct string_list_item *item,
+ void *cb_data)
+{
+ struct load_notes_cb_data *c = cb_data;
+ struct notes_tree *t = xcalloc(1, sizeof(struct notes_tree));
+ init_notes(t, item->string, combine_notes_ignore, 0);
+ c->trees[c->counter++] = t;
+ return 0;
+}
+
+struct notes_tree **load_notes_trees(struct string_list *refs)
+{
+ struct notes_tree **trees;
+ struct load_notes_cb_data cb_data;
+ trees = xmalloc((display_notes_refs.nr+1) * sizeof(struct notes_tree *));
+ cb_data.counter = 0;
+ cb_data.trees = trees;
+ for_each_string_list(load_one_display_note_ref, refs, &cb_data);
+ trees[cb_data.counter] = NULL;
+ return trees;
+}
+
+void init_display_notes()
+{
+ display_notes_refs.strdup_strings = 1;
+ string_list_insert(default_notes_ref(), &display_notes_refs);
+ git_config(notes_display_config, NULL);
+ display_notes_trees = load_notes_trees(&display_notes_refs);
+ string_list_clear(&display_notes_refs, 0);
+}
+
void add_note(struct notes_tree *t, const unsigned char *object_sha1,
const unsigned char *note_sha1, combine_notes_fn combine_notes)
{
@@ -1016,7 +1092,12 @@ void format_note(struct notes_tree *t, const unsigned char *object_sha1,
if (msglen && msg[msglen - 1] == '\n')
msglen--;
- if (flags & NOTES_SHOW_HEADER)
+ if (flags & NOTES_SHOW_HEADER_WITH_REF && t->ref) {
+ const char *ref = t->ref;
+ if (!prefixcmp(ref, "refs/"))
+ ref += 5;
+ strbuf_addf(sb, "\nNotes from %s:\n", ref);
+ } else if (flags & (NOTES_SHOW_HEADER|NOTES_SHOW_HEADER_WITH_REF))
strbuf_addstr(sb, "\nNotes:\n");
for (msg_p = msg; msg_p < msg + msglen; msg_p += linelen + 1) {
@@ -1030,3 +1111,14 @@ void format_note(struct notes_tree *t, const unsigned char *object_sha1,
free(msg);
}
+
+void format_display_notes(const unsigned char *object_sha1,
+ struct strbuf *sb, const char *output_encoding, int flags)
+{
+ int i;
+ if (!display_notes_trees)
+ init_display_notes();
+ for (i = 0; display_notes_trees[i]; i++)
+ format_note(display_notes_trees[i], object_sha1, sb,
+ output_encoding, flags);
+}
diff --git a/notes.h b/notes.h
index bad03cc..32ae2f0 100644
--- a/notes.h
+++ b/notes.h
@@ -184,6 +184,7 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
/* Flags controlling how notes are formatted */
#define NOTES_SHOW_HEADER 1
#define NOTES_INDENT 2
+#define NOTES_SHOW_HEADER_WITH_REF 4
/*
* Fill the given strbuf with the notes associated with the given object.
@@ -198,4 +199,10 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
void format_note(struct notes_tree *t, const unsigned char *object_sha1,
struct strbuf *sb, const char *output_encoding, int flags);
+void format_display_notes(const unsigned char *object_sha1,
+ struct strbuf *sb, const char *output_encoding, int flags);
+
+struct notes_tree **load_notes_trees(struct string_list *refs);
+void string_list_add_refs_by_glob(struct string_list *list, const char *glob);
+
#endif
diff --git a/pretty.c b/pretty.c
index f999485..c185fd2 100644
--- a/pretty.c
+++ b/pretty.c
@@ -775,7 +775,7 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
}
return 0; /* unknown %g placeholder */
case 'N':
- format_note(NULL, commit->object.sha1, sb,
+ format_display_notes(commit->object.sha1, sb,
git_log_output_encoding ? git_log_output_encoding
: git_commit_encoding, 0);
return 1;
@@ -1096,8 +1096,8 @@ void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
strbuf_addch(sb, '\n');
if (context->show_notes)
- format_note(NULL, commit->object.sha1, sb, encoding,
- NOTES_SHOW_HEADER | NOTES_INDENT);
+ format_display_notes(commit->object.sha1, sb, encoding,
+ NOTES_SHOW_HEADER_WITH_REF | NOTES_INDENT);
free(reencoded);
}
diff --git a/refs.c b/refs.c
index 503a8c2..6634091 100644
--- a/refs.c
+++ b/refs.c
@@ -695,7 +695,6 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
{
struct strbuf real_pattern = STRBUF_INIT;
struct ref_filter filter;
- const char *has_glob_specials;
int ret;
if (!prefix && prefixcmp(pattern, "refs/"))
@@ -704,8 +703,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
strbuf_addstr(&real_pattern, prefix);
strbuf_addstr(&real_pattern, pattern);
- has_glob_specials = strpbrk(pattern, "?*[");
- if (!has_glob_specials) {
+ if (!has_glob_specials(pattern)) {
/* Append impiled '/' '*' if not present. */
if (real_pattern.buf[real_pattern.len - 1] != '/')
strbuf_addch(&real_pattern, '/');
diff --git a/refs.h b/refs.h
index f7648b9..4a18b08 100644
--- a/refs.h
+++ b/refs.h
@@ -28,6 +28,11 @@ struct ref_lock {
extern int for_each_glob_ref(each_ref_fn, const char *pattern, void *);
extern int for_each_glob_ref_in(each_ref_fn, const char *pattern, const char* prefix, void *);
+static inline const char *has_glob_specials(const char *pattern)
+{
+ return strpbrk(pattern, "?*[");
+}
+
/* can be used to learn about broken ref and symref */
extern int for_each_rawref(each_ref_fn, void *);
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 90178f9..0dfff82 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -98,7 +98,7 @@ Date: Thu Apr 7 15:14:13 2005 -0700
2nd
-Notes:
+Notes from notes/commits:
b1
EOF
@@ -125,7 +125,7 @@ Date: Thu Apr 7 15:15:13 2005 -0700
3rd
-Notes:
+Notes from notes/commits:
b3
c3c3c3c3
d3d3d3
@@ -154,7 +154,7 @@ Date: Thu Apr 7 15:16:13 2005 -0700
4th
-Notes:
+Notes from notes/commits:
xyzzy
EOF
@@ -182,7 +182,7 @@ test_expect_success 'git log --pretty=raw does not show notes' '
cat >>expect <<EOF
-Notes:
+Notes from notes/commits:
xyzzy
EOF
test_expect_success 'git log --show-notes' '
@@ -237,7 +237,7 @@ Date: Thu Apr 7 15:17:13 2005 -0700
5th
-Notes:
+Notes from notes/commits:
spam
$whitespace
foo
@@ -415,7 +415,7 @@ Date: Thu Apr 7 15:18:13 2005 -0700
6th
-Notes:
+Notes from notes/other:
other note
EOF
@@ -448,7 +448,46 @@ test_expect_success 'Do not show note when core.notesRef is overridden' '
test_cmp expect-not-other output
'
+cat > expect-both << EOF
+commit 387a89921c73d7ed72cd94d179c1c7048ca47756
+Author: A U Thor <author@xxxxxxxxxxx>
+Date: Thu Apr 7 15:18:13 2005 -0700
+
+ 6th
+
+Notes from notes/other:
+ other note
+
+commit bd1753200303d0a0344be813e504253b3d98e74d
+Author: A U Thor <author@xxxxxxxxxxx>
+Date: Thu Apr 7 15:17:13 2005 -0700
+
+ 5th
+EOF
+
+test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' '
+ git config --unset core.notesRef &&
+ git config notes.displayRef "refs/notes/*" &&
+ git log -2 > output &&
+ test_cmp expect-both output
+'
+
+test_expect_success 'core.notesRef is implicitly in notes.displayRef' '
+ git config core.notesRef refs/notes/other &&
+ git config notes.displayRef refs/notes/commits &&
+ git log -2 > output &&
+ test_cmp expect-both output
+'
+
+test_expect_success 'notes.displayRef can be given more than once' '
+ git config --unset core.notesRef &&
+ git config --add notes.displayRef refs/notes/other &&
+ git log -2 > output &&
+ test_cmp expect-both output
+'
+
test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' '
+ git config core.notesRef refs/notes/other &&
echo "Note on a tree" > expect
git notes add -m "Note on a tree" HEAD: &&
git notes show HEAD: > actual &&
@@ -472,7 +511,7 @@ Date: Thu Apr 7 15:19:13 2005 -0700
7th
-Notes:
+Notes from notes/other:
other note
EOF
@@ -503,7 +542,7 @@ Date: Thu Apr 7 15:21:13 2005 -0700
9th
-Notes:
+Notes from notes/other:
yet another note
EOF
@@ -533,7 +572,7 @@ Date: Thu Apr 7 15:21:13 2005 -0700
9th
-Notes:
+Notes from notes/other:
yet another note
$whitespace
yet another note
@@ -552,7 +591,7 @@ Date: Thu Apr 7 15:22:13 2005 -0700
10th
-Notes:
+Notes from notes/other:
other note
EOF
@@ -569,7 +608,7 @@ Date: Thu Apr 7 15:22:13 2005 -0700
10th
-Notes:
+Notes from notes/other:
other note
$whitespace
yet another note
@@ -588,7 +627,7 @@ Date: Thu Apr 7 15:23:13 2005 -0700
11th
-Notes:
+Notes from notes/other:
other note
$whitespace
yet another note
@@ -619,7 +658,7 @@ Date: Thu Apr 7 15:23:13 2005 -0700
11th
-Notes:
+Notes from notes/other:
yet another note
$whitespace
yet another note
diff --git a/t/t3306-notes-prune.sh b/t/t3306-notes-prune.sh
index a0ed035..24dd503 100755
--- a/t/t3306-notes-prune.sh
+++ b/t/t3306-notes-prune.sh
@@ -30,7 +30,7 @@ Date: Thu Apr 7 15:15:13 2005 -0700
3rd
-Notes:
+Notes from notes/commits:
Note #3
commit 08341ad9e94faa089d60fd3f523affb25c6da189
@@ -39,7 +39,7 @@ Date: Thu Apr 7 15:14:13 2005 -0700
2nd
-Notes:
+Notes from notes/commits:
Note #2
commit ab5f302035f2e7aaf04265f08b42034c23256e1f
@@ -48,7 +48,7 @@ Date: Thu Apr 7 15:13:13 2005 -0700
1st
-Notes:
+Notes from notes/commits:
Note #1
END_OF_LOG
--
1.7.0.59.g783f8
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html