user/sven/git.git/parse-options.h, branch v1.6.4.5

Merge branch 'sb/parse-options-integer'

2009-06-18T17:36:22Z

* sb/parse-options-integer: parse-options: simplify usage argh handling parse-options: make OPT_INTEGER's argh explicit

show-branch: don't use LASTARG_DEFAULT with OPTARG

2009-06-09T07:15:57Z

5734365 (show-branch: migrate to parse-options API 2009-05-21) incorrectly set the --more option's flags to be PARSE_OPT_LASTARG_DEFAULT and PARSE_OPT_OPTARG. These two flags shouldn't be used together. An option taking a default should just set the default value desired and parse options will take care of the rest. Update the header comment to better convey this information. Signed-off-by: Stephen Boyd Acked-by: René Scharfe Signed-off-by: Junio C Hamano

parse-options: simplify usage argh handling

2009-06-06T20:25:34Z

Simplify the argh printing by simply calling usage_argh() if the option can take an argument. Update macros defined in parse-options.h to set the PARSE_OPT_NOARG flag. The only other user of custom non-argument taking options is git-apply (in this case OPTION_BOOLEAN for deprecated options). Update it to set the PARSE_OPT_NOARG flag. Thanks to Ren辿 Scharfe for the suggestion and starter patch. Signed-off-by: Stephen Boyd Reviewd-by: René Scharfe Signed-off-by: Junio C Hamano

parse-options: make OPT_INTEGER's argh explicit

2009-06-06T20:25:01Z

OPTION_INTEGER hardcodes its argh member to be "n", but the decision is hidden deep in usage_with_options_internal(). Make "n" the default argh for the OPT_INTEGER macro while leaving it undecided for the OPTION_INTEGER enum. This makes it less surprising to users that argh is "n" when using the OPT_INTEGER macro. Signed-off-by: Stephen Boyd Reviewed-by: René Scharfe Signed-off-by: Junio C Hamano

parse-opts: add OPT_FILENAME and transition builtins

2009-05-25T08:07:33Z

Commit dbd0f5c (Files given on the command line are relative to $cwd, 2008-08-06) introduced parse_options_fix_filename() as a minimal fix. OPT_FILENAME is intended to be a more robust fix for the same issue. OPT_FILENAME and its associated enum OPTION_FILENAME are used to represent filename options within the parse options API. This option is similar to OPTION_STRING. If --no is prefixed to the option the filename is unset. If no argument is given and the default value is set, the filename is set to the default value. The difference is that the filename is prefixed with the prefix passed to parse_options() (or parse_options_start()). Update git-apply, git-commit, git-fmt-merge-msg, and git-tag to use OPT_FILENAME with their filename options. Also, rename parse_options_fix_filename() to fix_filename() as it is no longer extern. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

parse-opts: prepare for OPT_FILENAME

2009-05-25T08:07:25Z

To give OPT_FILENAME the prefix, we pass the prefix to parse_options() which passes the prefix to parse_options_start() which sets the prefix member of parse_opts_ctx accordingly. If there isn't a prefix in the calling context, passing NULL will suffice. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Merge branch 'sb/show-branch-parse-options' into sb/opt-filename

2009-05-25T07:59:29Z

* sb/show-branch-parse-options: show-branch: migrate to parse-options API parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's Conflicts: parse-options.h

parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's

2009-05-23T05:46:04Z

Usually, the argh element in struct option points at a placeholder value (e.g. "val"), and is shown in the usage message as --option= by enclosing the string inside of angle brackets. When the option is more complex (e.g. optional arguments separated by a comma), you would want to produce a usage message that looks like --option=[,] In such a case, the caller can pass a string to argh with placeholders already enclosed in necessary angle brackets (e.g. "[,]") and set this flag. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

parseopt: add PARSE_OPT_NODASH

2009-05-09T07:29:50Z

Add support for options that don't start with a dash. Initially, they don't accept arguments and can only be short options, i.e. consist of a single character. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

parseopt: add OPT_NUMBER_CALLBACK

2009-05-09T07:29:47Z

Add a way to recognize numerical options. The number is passed to a callback function as a string. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano