We adopt a two pass parsing method:
1. Don't provide '-L' option to the parsing API, and invoke
API to parse all the options except the '-L' ones;
2. Parse the remaining options(only -L left) with '-L' provided.
Signed-off-by: Bo Yang <struggleyb.nku@xxxxxxxxx>
---
builtin/log.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 121 insertions(+), 1 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index f068583..f204129 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -19,6 +19,7 @@
#include "remote.h"
#include "string-list.h"
#include "parse-options.h"
+#include "line.h"
/* Set a default date-time format for git log ("log.date" config variable) */
static const char *default_date_mode = NULL;
@@ -27,11 +28,24 @@ static int default_show_root = 1;
static int decoration_style;
static const char *fmt_patch_subject_prefix = "PATCH";
static const char *fmt_pretty;
+static const char *dashdash = "--";
-static const char * const builtin_log_usage =
+static char builtin_log_usage[] =
"git log [<options>] [<since>..<until>] [[--] <path>...]\n"
+ "git log [<options>] -L n,m <path>\n"
" or: git show [options] <object>...";
+static const char *log_opt_usage[] = {
+ builtin_log_usage,
+ NULL
+};
+
+struct line_opt_callback_data {
+ struct diff_line_range **range;
+ struct parse_opt_ctx_t *ctx;
+ struct rev_info *rev;
+};
+
static int parse_decoration_style(const char *var, const char *value)
{
switch (git_config_maybe_bool(var, value)) {
@@ -49,12 +63,44 @@ static int parse_decoration_style(const char *var, const char *value)
return -1;
}
+static int log_line_range_callback(const struct option *option, const char *arg, int unset)
+{
+ struct line_opt_callback_data *data = option->value;
+ struct diff_line_range *r = *data->range;
+ struct parse_opt_ctx_t *ctx = data->ctx;
+ if (!arg)
+ return -1;
+
+ if (r->nr == 0 && r->next == NULL) {
+ ctx->out[ctx->cpidx++] = dashdash;
+ }
+
+ diff_line_range_append(r, arg);
+ data->rev->line = 1;
+ return 0;
+}
+
static void cmd_log_init(int argc, const char **argv, const char *prefix,
struct rev_info *rev, struct setup_revision_opt *opt)
{
int i;
int decoration_given = 0;
struct userformat_want w;
+ const char *path = NULL, *pathspec = NULL;
+ static struct diff_line_range *range = NULL;
+ static struct parse_opt_ctx_t ctx;
+ static struct line_opt_callback_data line_cb = {&range, &ctx, NULL};
+ static const struct option options[] = {
+ OPT_CALLBACK('L', NULL, &line_cb, "n,m", "Process only line range n,m, counting from 1", log_line_range_callback),
+ OPT_END()
+ };
+ static const struct option null_options[] = {
+ OPT_END()
+ };
+
+ line_cb.rev = rev;
+ range = xmalloc(sizeof(*range));
+ DIFF_LINE_RANGE_INIT(range);
rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT;
@@ -75,6 +121,75 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
*/
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(builtin_log_usage);
+
+ /* first pass to deal with normal log arguments */
+ parse_options_start(&ctx, argc, argv, prefix, PARSE_OPT_KEEP_DASHDASH |
+ PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN);
+ for (;;) {
+ switch (parse_options_step(&ctx, null_options, log_opt_usage)) {
+ case PARSE_OPT_HELP:
+ exit(129);
+ case PARSE_OPT_DONE:
+ goto parse_done1;
+ }
+
+ parse_revision_opt(rev, &ctx, null_options, log_opt_usage);
+ }
+parse_done1:
+ argc = parse_options_end(&ctx);
+
+ /* second pass to deal with -L */
+ parse_options_start(&ctx, argc, argv, prefix, PARSE_OPT_KEEP_DASHDASH |
+ PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_STOP_AT_NON_OPTION);
+ for (;;) {
+ switch (parse_options_step(&ctx, options, log_opt_usage)) {
+ case PARSE_OPT_HELP:
+ exit(129);
+ case PARSE_OPT_DONE:
+ goto parse_done2;
+ case PARSE_OPT_NON_OPTION:
+ path = parse_options_current(&ctx);
+ pathspec = prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
+ range->spec = alloc_filespec(pathspec);
+ free((void *)pathspec);
+ if (range->nr == 0) {
+ if(range->next) {
+ die("Path %s need a -L <range> option\n"
+ "If you want follow the history of the whole file "
+ "whether to using 'git log' without -L or using "
+ "'git log -L 1,$ <path>'", range->spec->path);
+ } else {
+ parse_options_next(&ctx, 1);
+ continue;
+ }
+ }
+ struct diff_line_range *r = xmalloc(sizeof(*r));
+ DIFF_LINE_RANGE_INIT(r);
+ r->next = range;
+ range = r;
+ parse_options_next(&ctx, 1);
+ continue;
+ case PARSE_OPT_UNKNOWN:
+ parse_options_next(&ctx, 1);
+ continue;
+ }
+
+ parse_revision_opt(rev, &ctx, options, log_opt_usage);
+ }
+parse_done2:
+ argc = parse_options_end(&ctx);
+
+ /* die if '-L <range>' with no pathspec follow */
+ if (range->nr > 0 && range->spec == NULL) {
+ die("Each -L should follow a pathspec");
+ }
+ /* clear up the last range */
+ if (range->nr == 0) {
+ struct diff_line_range *r = range->next;
+ DIFF_LINE_RANGE_CLEAR(range);
+ range = r;
+ }
+
argc = setup_revisions(argc, argv, rev, opt);
memset(&w, 0, sizeof(w));
@@ -125,6 +240,11 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
rev->show_decorations = 1;
load_ref_decorations(decoration_style);
}
+
+ /* Test whether line level history is asked for */
+ if (range && range->nr > 0) {
+ setup_line(rev, range);
+ }
}
/*
--
1.7.1.577.g36cf0.dirty
--
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