From: Johan Herland <johan@herland.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCHv12 00/23] git notes
Date: Thu, 28 Jan 2010 02:17:29 +0100 [thread overview]
Message-ID: <201001280217.29459.johan@herland.net> (raw)
In-Reply-To: <7vk4v3nlji.fsf@alter.siamese.dyndns.org>
On Thursday 28 January 2010, Junio C Hamano wrote:
> The earlier frustration of mine was about adding a note, not adding _to_
> a note. The semantic difference I described with add/edit was "adding
> anew" vs "modify".
>
> Once I realize that Dscho's original "edit" lacks an explicit "adding
> anew" and it simply means "replace if exists otherwise add", then I can
> agree the argument that "adding anew" mode is not necessary.
>
> The semantic difference your add/edit try to capture works at a different
> level. They are "append to it" vs "replace it". Current "edit -m 'foo'"
> that replaces feels to me quite counterintuitive.
>
> If two modes are useful, then I would suggest to deprecate the use of
> "edit" subcommand with -m/-F (because its name doesn't tell the user
> which one between "append" and "replace" it happens to implement) and
> instead introduce two more explicit subcommands, "append" and "replace".
> For the same reason, "add" would cause confusion between "is this to
> add a new note" vs "is this to add _to_ a new note", and I'd recommend
> against it.
>
> "edit" could still open an editor to "modify" existing one (and if there
> is no existing one, then the editor starts empty).
>
> On the other hand, if "replace" is not very useful, then it might be
> enough to just introduce a new "append" subcommand. Or course, we could
> redefine the useless "replace" semantics from "edit -m/-F" and change it
> to always append.
Ok, I see your point, and I largely agree with your analysis. I'll attempt
to summarize what we want from "git notes" in this regard:
- git notes add: Add a new note. Open editor for giving the note contents.
Barf if a note already exists for the given object.
Options:
-m <msg>, --message <msg>: Specify note contents on command-line instead
of opening editor. (Multiple -m options are concatenated.)
-F <file>, --file <file>: Get note contents from the given file instead
of opening editor.
-f, --force: Instead of barfing, replace/overwrite existing notes.
- git notes append: Append to an existing note; create new note if needed.
Open editor for giving the (additional) note contents.
Options:
-m <msg>, --message <msg>: (Same as above)
-F <file>, --file <file>: (Same as above)
- git notes edit: Edit an existing note. Create new note if needed (?)
Open editor for editing the existing note contents.
No options (deprecate existing -m and -F options)
Is this what you had in mind? AFAICS it should cover all interesting use
cases.
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
prev parent reply other threads:[~2010-01-28 1:17 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-27 11:51 [PATCHv12 00/23] git notes Johan Herland
2010-01-27 11:51 ` [PATCHv12 01/23] Minor non-functional fixes to notes.c Johan Herland
2010-01-27 21:20 ` Junio C Hamano
2010-01-27 22:33 ` Johan Herland
2010-01-27 11:51 ` [PATCHv12 02/23] Notes API: get_commit_notes() -> format_note() + remove the commit restriction Johan Herland
2010-01-27 11:51 ` [PATCHv12 03/23] Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef Johan Herland
2010-01-27 11:51 ` [PATCHv12 04/23] Notes API: init_notes(): Initialize the notes tree from the given notes ref Johan Herland
2010-01-27 11:51 ` [PATCHv12 05/23] Notes API: add_note(): Add note objects to the internal notes tree structure Johan Herland
2010-01-27 11:51 ` [PATCHv12 06/23] Notes API: remove_note(): Remove note objects from the " Johan Herland
2010-01-27 11:51 ` [PATCHv12 07/23] Notes API: get_note(): Return the note annotating the given object Johan Herland
2010-01-27 11:51 ` [PATCHv12 08/23] Notes API: for_each_note(): Traverse the entire notes tree with a callback Johan Herland
2010-01-27 11:51 ` [PATCHv12 09/23] Notes API: write_notes_tree(): Store the notes tree in the database Johan Herland
2010-01-27 11:51 ` [PATCHv12 10/23] Notes API: Allow multiple concurrent notes trees with new struct notes_tree Johan Herland
2010-01-27 11:51 ` [PATCHv12 11/23] Refactor notes concatenation into a flexible interface for combining notes Johan Herland
2010-01-27 11:51 ` [PATCHv12 12/23] Builtin-ify git-notes Johan Herland
2010-01-27 11:51 ` [PATCHv12 13/23] t3301: Verify successful annotation of non-commits Johan Herland
2010-01-27 11:51 ` [PATCHv12 14/23] t3305: Verify that adding many notes with git-notes triggers increased fanout Johan Herland
2010-01-27 11:51 ` [PATCHv12 15/23] Teach notes code to properly preserve non-notes in the notes tree Johan Herland
2010-01-27 11:51 ` [PATCHv12 16/23] Teach builtin-notes to remove empty notes Johan Herland
2010-01-27 11:51 ` [PATCHv12 17/23] builtin-notes: Add "remove" subcommand for removing existing notes Johan Herland
2010-01-27 11:51 ` [PATCHv12 18/23] t3305: Verify that removing notes triggers automatic fanout consolidation Johan Herland
2010-01-27 11:51 ` [PATCHv12 19/23] Notes API: prune_notes(): Prune notes that belong to non-existing objects Johan Herland
2010-01-27 11:51 ` [PATCHv12 20/23] builtin-notes: Add "prune" subcommand for removing notes for missing objects Johan Herland
2010-01-27 11:51 ` [PATCHv12 21/23] Documentation: Generalize git-notes docs to 'objects' instead of 'commits' Johan Herland
2010-01-27 11:51 ` [PATCHv12 22/23] builtin-notes: Add "list" subcommand for listing note objects Johan Herland
2010-01-27 11:52 ` [PATCHv12 23/23] builtin-notes: Add "add" subcommand for appending to " Johan Herland
2010-01-27 20:00 ` [PATCHv12 00/23] git notes Junio C Hamano
2010-01-27 20:18 ` Sverre Rabbelier
2010-01-27 23:05 ` Johan Herland
2010-01-28 0:02 ` Junio C Hamano
2010-01-28 1:17 ` Johan Herland [this message]
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=201001280217.29459.johan@herland.net \
--to=johan@herland.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).