Browse Source

line-log: extract pathspec parsing from line ranges into a helper function

A helper function to parse the paths involved in the line ranges and
to turn them into a pathspec will be useful in the next patch.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
SZEDER Gábor 6 years ago committed by Junio C Hamano
parent
commit
eef5204190
  1. 28
      line-log.c

28
line-log.c

@ -736,16 +736,9 @@ static struct line_log_data *lookup_line_range(struct rev_info *revs, @@ -736,16 +736,9 @@ static struct line_log_data *lookup_line_range(struct rev_info *revs,
return ret;
}

void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
static void parse_pathspec_from_ranges(struct pathspec *pathspec,
struct line_log_data *range)
{
struct commit *commit = NULL;
struct line_log_data *range;

commit = check_single_commit(rev);
range = parse_lines(rev->diffopt.repo, commit, prefix, args);
add_line_range(rev, commit, range);

if (!rev->diffopt.detect_rename) {
struct line_log_data *r;
struct argv_array array = ARGV_ARRAY_INIT;
const char **paths;
@ -754,11 +747,22 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list @@ -754,11 +747,22 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list
argv_array_push(&array, r->path);
paths = argv_array_detach(&array);

parse_pathspec(&rev->diffopt.pathspec, 0,
PATHSPEC_PREFER_FULL, "", paths);
parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL, "", paths);
/* strings are now owned by pathspec */
free(paths);
}
}

void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
{
struct commit *commit = NULL;
struct line_log_data *range;

commit = check_single_commit(rev);
range = parse_lines(rev->diffopt.repo, commit, prefix, args);
add_line_range(rev, commit, range);

if (!rev->diffopt.detect_rename)
parse_pathspec_from_ranges(&rev->diffopt.pathspec, range);
}

static void move_diff_queue(struct diff_queue_struct *dst,

Loading…
Cancel
Save