log: teach -L/RE/ to search from end of previous -L range
This is complicated slightly by having to remember the previous -L range for each file specified via -L<range>:file. The existing implementation coalesces ranges for each file as each -L is parsed which makes it impossible to refer back to the previous -L range for any particular file. Re-implement to instead store each file's set of -L ranges verbatim, and then coalesce the ranges in a post-processing step. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Aug 6, 2013 at 09:59 UTC
3e0d79dbe3064cf065b6518520dd1489406200a9
1 file changed
+12
-3
line-log.c
+12
-3
@@ -291,7 +291,6 @@ static void line_log_data_insert(struct line_log_data **list,
291
292
if (p) {
293
range_set_append_unsafe(&p->ranges, begin, end);
294
- sort_and_merge_range_set(&p->ranges);
294
free(path);
295
return;
296
}
@@ -299,7 +298,6 @@ static void line_log_data_insert(struct line_log_data **list,
298
p = xcalloc(1, sizeof(struct line_log_data));
299
p->path = path;
300
range_set_append(&p->ranges, begin, end);
302
- sort_and_merge_range_set(&p->ranges);
301
if (ip) {
302
p->next = ip->next;
303
ip->next = p;
@@ -566,12 +564,14 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)
564
struct nth_line_cb cb_data;
565
struct string_list_item *item;
566
struct line_log_data *ranges = NULL;
567
+ struct line_log_data *p;
568
569
for_each_string_list_item(item, args) {
570
const char *name_part, *range_part;
571
char *full_name;
572
struct diff_filespec *spec;
573
long begin = 0, end = 0;
574
+ long anchor;
575
576
name_part = skip_range_arg(item->string);
577
if (!name_part || *name_part != ':' || !name_part[1])
@@ -590,8 +590,14 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)
590
cb_data.lines = lines;
591
cb_data.line_ends = ends;
592
593
+ p = search_line_log_data(ranges, full_name, NULL);
594
+ if (p && p->ranges.nr)
595
+ anchor = p->ranges.ranges[p->ranges.nr - 1].end + 1;
596
+ else
597
+ anchor = 1;
598
+
599
if (parse_range_arg(range_part, nth_line, &cb_data,
594
- lines, 1, &begin, &end,
600
+ lines, anchor, &begin, &end,
601
full_name))
602
die("malformed -L argument '%s'", range_part);
603
if (lines < end || ((lines || begin) && lines < begin))
@@ -608,6 +614,9 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)
614
ends = NULL;
615
}
616
617
+ for (p = ranges; p; p = p->next)
618
+ sort_and_merge_range_set(&p->ranges);
619
+
620
return ranges;
621
}
622