delta/git.git/builtin/notes.c, branch sb/mailsplit-dead-code-removal

Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-08-05T18:32:19+00:00

This task emerged from b04ba2bb (parse-options: deprecate OPT_BOOLEAN,
2011-09-27). All occurrences of the respective variables have
been reviewed and none of them relied on the counting up mechanism,
but all of them were using the variable as a true boolean.

This patch does not change semantics of any command intentionally.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Remove deprecated OPTION_BOOLEAN for parsing arguments

2013-08-05T18:32:17+00:00

As of b04ba2bb4 OPTION_BOOLEAN was deprecated.
This commit removes all occurrences of OPTION_BOOLEAN.
In b04ba2bb4 Junio suggested to replace it with either
OPTION_SET_INT or OPTION_COUNTUP instead. However a pattern, which
occurred often with the OPTION_BOOLEAN was a hidden boolean parameter.
So I defined OPT_HIDDEN_BOOL as an additional possible parse option
in parse-options.h to make life easy.

The OPT_HIDDEN_BOOL was used in checkout, clone, commit, show-ref.
The only exception, where there was need to fiddle with OPTION_SET_INT
was log and notes. However in these two files there is also a pattern,
so we could think of introducing OPT_NONEG_BOOL.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'

2013-06-26T22:07:48+00:00

* ph/builtin-srcs-are-in-subdir-these-days:
  fix "builtin-*" references to be "builtin/*"

fix "builtin-" references to be "builtin/"

2013-06-18T18:05:51+00:00

Documentation and some comments still refer to files in builtin/
as 'builtin-*.[cho]'.  Update these to show the correct location.

Signed-off-by: Phil Hord 
Reviewed-by: Jonathan Nieder 
Assisted-by: Junio C Hamano 
Signed-off-by: Junio C Hamano

Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c

2013-06-12T17:34:59+00:00

This is a pure code movement of the machinery for copying notes to
rewritten objects. This code was located in builtin/notes.c for
historical reasons. In order to make it available to builtin/commit.c
it was declared in builtin.h. This was more of an accident of history
than a concious design, and we now want to make this machinery more
widely available.

Hence, this patch moves the code into the new notes-utils.[hc] files
which are included into libgit.a. Except for adjusting #includes
accordingly, this patch merely moves the relevant functions verbatim
into the new files.

Cc: Thomas Rast 
Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

finish_copy_notes_for_rewrite(): Let caller provide commit message

2013-06-12T17:27:41+00:00

When copying notes for a rewritten object, the resulting notes commit
would have the following hardcoded commit message:

  Notes added by 'git notes copy'

This is obviously bogus when the notes rewriting is performed by
'git commit --amend'.

Therefore, let the caller specify an appropriate notes commit message
instead of hardcoding it. The above message is used for 'git notes copy',
but when calling finish_copy_notes_for_rewrite() from builtin/commit.c,
we use the following message instead:

  Notes added by 'git commit --amend'

Cc: Thomas Rast 
Signed-off-by: Johan Herland 
Signed-off-by: Junio C Hamano

Allow custom "comment char"

2013-01-16T20:48:22+00:00

Some users do want to write a line that begin with a pound sign, #,
in their commit log message.  Many tracking system recognise
a token of # form, for example.

The support we offer these use cases is not very friendly to the end
users.  They have a choice between

 - Don't do it.  Avoid such a line by rewrapping or indenting; and

 - Use --cleanup=whitespace but remove all the hint lines we add.

Give them a way to set a custom comment char, e.g.

    $ git -c core.commentchar="%" commit

so that they do not have to do either of the two workarounds.

[jc: although I started the topic, all the tests and documentation
updates, many of the call sites of the new strbuf_add_commented_*()
functions, and the change to git-submodule.sh scripted Porcelain are
from Ralf.]

Signed-off-by: Junio C Hamano 
Signed-off-by: Ralf Thielow 
Signed-off-by: Junio C Hamano

builtin/notes.c: mark file-scope private symbols as static

2012-09-16T05:58:20+00:00

Signed-off-by: Junio C Hamano

Reduce translations by using same terminologies

2012-08-22T19:02:28+00:00

Somewhere in help usage, we use both "message" and "msg", "command"
and "cmd", "key id" and "key-id". This patch makes all help text from
parseopt use the first form. Clearer and 3 fewer strings for
translators.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

i18n: notes: mark parseopt strings for translation

2012-08-20T19:23:18+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano