global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-12 18:09:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Parse the -L options

Browse Source 
With the two new APIs of parse options added in the previous
commit, we parse the multiple '-L n,m <pathspec>' syntax.

Notice that users can give more than one '-L n,m' for each pathspec.
And a pathspec with all its '-L' options maps to a single
diff_line_range structure.

This has the exactly the same semantics as 'git blame -L n,m <pathspec>'
because we refactored and reused the blame code.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Bo Yang
2010-08-11 23:03:30 +08:00
committed by Junio C Hamano
parent f9daa44d21
commit b585e491cf
1 changed files with 101 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
builtin/log.c
View File

@@ -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_level_traverse = 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, *fullpath = NULL;
static struct diff_line_range *range;
struct diff_line_range *r = 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()
};
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,56 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
*/
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(builtin_log_usage);
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_done;
case PARSE_OPT_NON_OPTION:
path = parse_options_current(&ctx);
fullpath = prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
range->spec = alloc_filespec(fullpath);
free((void *)fullpath);
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 "
"use 'git log -L 1,$ <path>'", range->spec->path);
} else {
parse_options_next(&ctx, 1);
continue;
}
}
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_done:
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 path");
/* 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 +221,10 @@ 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);
}
/*