From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johan Herland <johan@herland.net>,
Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org
Subject: [PATCH 4/6] notes: refactor display notes default handling
Date: Tue, 29 Mar 2011 16:57:27 -0400 [thread overview]
Message-ID: <20110329205727.GD23466@sigill.intra.peff.net> (raw)
In-Reply-To: <20110329205307.GA30959@sigill.intra.peff.net>
This is in preparation for more notes-related revision
command-line options.
The "suppress_default_notes" option is renamed to
"use_default_notes", and is now a tri-state with values less
than one indicating "not set". If the value is "not set",
then we show default refs if and only if no other refs were
given.
Signed-off-by: Jeff King <peff@peff.net>
---
notes.c | 3 ++-
notes.h | 2 +-
revision.c | 9 +++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/notes.c b/notes.c
index 2ec604c..f6ce848 100644
--- a/notes.c
+++ b/notes.c
@@ -1053,7 +1053,8 @@ void init_display_notes(struct display_notes_opt *opt)
assert(!display_notes_trees);
- if (!opt || !opt->suppress_default_notes) {
+ if (!opt || opt->use_default_notes > 0 ||
+ (opt->use_default_notes == -1 && !opt->extra_notes_refs.nr)) {
string_list_append(&display_notes_refs, default_notes_ref());
display_ref_env = getenv(GIT_NOTES_DISPLAY_REF_ENVIRONMENT);
if (display_ref_env) {
diff --git a/notes.h b/notes.h
index 7ae3eef..c716694 100644
--- a/notes.h
+++ b/notes.h
@@ -258,7 +258,7 @@ void format_note(struct notes_tree *t, const unsigned char *object_sha1,
struct string_list;
struct display_notes_opt {
- unsigned int suppress_default_notes:1;
+ int use_default_notes;
struct string_list extra_notes_refs;
};
diff --git a/revision.c b/revision.c
index 24b89eb..315a7f4 100644
--- a/revision.c
+++ b/revision.c
@@ -955,6 +955,8 @@ void init_revisions(struct rev_info *revs, const char *prefix)
revs->diffopt.prefix = prefix;
revs->diffopt.prefix_length = strlen(prefix);
}
+
+ revs->notes_opt.use_default_notes = -1;
}
static void add_pending_commit_list(struct rev_info *revs,
@@ -1368,10 +1370,13 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
} else if (!strcmp(arg, "--show-notes")) {
revs->show_notes = 1;
revs->show_notes_given = 1;
+ revs->notes_opt.use_default_notes = 1;
} else if (!prefixcmp(arg, "--show-notes=")) {
struct strbuf buf = STRBUF_INIT;
revs->show_notes = 1;
revs->show_notes_given = 1;
+ if (revs->notes_opt.use_default_notes < 0)
+ revs->notes_opt.use_default_notes = 1;
strbuf_addstr(&buf, arg+13);
expand_notes_ref(&buf);
string_list_append(&revs->notes_opt.extra_notes_refs,
@@ -1381,9 +1386,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->show_notes_given = 1;
} else if (!strcmp(arg, "--standard-notes")) {
revs->show_notes_given = 1;
- revs->notes_opt.suppress_default_notes = 0;
+ revs->notes_opt.use_default_notes = 1;
} else if (!strcmp(arg, "--no-standard-notes")) {
- revs->notes_opt.suppress_default_notes = 1;
+ revs->notes_opt.use_default_notes = 0;
} else if (!strcmp(arg, "--oneline")) {
revs->verbose_header = 1;
get_commit_format("oneline", revs);
--
1.7.4.2.7.g9407
next prev parent reply other threads:[~2011-03-29 20:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-29 10:05 [PATCH] revision.c: introduce --notes-ref= to use one notes ref only Michael J Gruber
2011-03-29 12:39 ` Johan Herland
2011-03-29 14:33 ` Jeff King
2011-03-29 15:16 ` Michael J Gruber
2011-03-29 18:32 ` Junio C Hamano
2011-03-29 20:53 ` Jeff King
2011-03-29 20:55 ` [PATCH 1/6] notes: make expand_notes_ref globally accessible Jeff King
2011-03-29 20:56 ` [PATCH 2/6] revision.c: refactor notes ref expansion Jeff King
2011-03-29 20:56 ` [PATCH 3/6] notes: refactor display notes extra refs field Jeff King
2011-03-29 20:57 ` Jeff King [this message]
2011-03-29 22:02 ` [PATCH 4/6] notes: refactor display notes default handling Junio C Hamano
2011-03-29 20:57 ` [PATCH 5/6] revision.c: support --notes command-line option Jeff King
2011-03-29 20:59 ` [PATCH 6/6] revision.c: make --no-notes reset --notes list Jeff King
2011-03-29 22:04 ` Junio C Hamano
2011-03-29 21:44 ` [PATCH] revision.c: introduce --notes-ref= to use one notes ref only Johan Herland
2011-03-29 22:18 ` [PATCH 7/6] log/pretty-options: Document --[no-]notes and deprecate old notes options Johan Herland
2011-03-30 0:22 ` Jeff King
2011-03-30 0:57 ` Johan Herland
2011-03-30 3:32 ` Jeff King
2011-03-29 14:35 ` [PATCH] revision.c: introduce --notes-ref= to use one notes ref only Jeff King
2011-03-29 19:01 ` Jeff King
2011-03-29 19:48 ` Michael J Gruber
2011-03-29 20:23 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110329205727.GD23466@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
/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.
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 NNTP newsgroup(s).