Merge branch 'kb/perf-trace'
[git.git] / line-log.c
blobafcc98db930a36358283ff199a428b6c5bbbaf8f
1 #include "git-compat-util.h"
2 #include "line-range.h"
3 #include "cache.h"
4 #include "tag.h"
5 #include "blob.h"
6 #include "tree.h"
7 #include "diff.h"
8 #include "commit.h"
9 #include "decorate.h"
10 #include "revision.h"
11 #include "xdiff-interface.h"
12 #include "strbuf.h"
13 #include "log-tree.h"
14 #include "graph.h"
15 #include "userdiff.h"
16 #include "line-log.h"
18 static void range_set_grow(struct range_set *rs, size_t extra)
20 ALLOC_GROW(rs->ranges, rs->nr + extra, rs->alloc);
23 /* Either initialization would be fine */
24 #define RANGE_SET_INIT {0}
26 void range_set_init(struct range_set *rs, size_t prealloc)
28 rs->alloc = rs->nr = 0;
29 rs->ranges = NULL;
30 if (prealloc)
31 range_set_grow(rs, prealloc);
34 void range_set_release(struct range_set *rs)
36 free(rs->ranges);
37 rs->alloc = rs->nr = 0;
38 rs->ranges = NULL;
41 /* dst must be uninitialized! */
42 static void range_set_copy(struct range_set *dst, struct range_set *src)
44 range_set_init(dst, src->nr);
45 memcpy(dst->ranges, src->ranges, src->nr*sizeof(struct range_set));
46 dst->nr = src->nr;
48 static void range_set_move(struct range_set *dst, struct range_set *src)
50 range_set_release(dst);
51 dst->ranges = src->ranges;
52 dst->nr = src->nr;
53 dst->alloc = src->alloc;
54 src->ranges = NULL;
55 src->alloc = src->nr = 0;
58 /* tack on a _new_ range _at the end_ */
59 void range_set_append_unsafe(struct range_set *rs, long a, long b)
61 assert(a <= b);
62 range_set_grow(rs, 1);
63 rs->ranges[rs->nr].start = a;
64 rs->ranges[rs->nr].end = b;
65 rs->nr++;
68 void range_set_append(struct range_set *rs, long a, long b)
70 assert(rs->nr == 0 || rs->ranges[rs->nr-1].end <= a);
71 range_set_append_unsafe(rs, a, b);
74 static int range_cmp(const void *_r, const void *_s)
76 const struct range *r = _r;
77 const struct range *s = _s;
79 /* this could be simply 'return r.start-s.start', but for the types */
80 if (r->start == s->start)
81 return 0;
82 if (r->start < s->start)
83 return -1;
84 return 1;
88 * Check that the ranges are non-empty, sorted and non-overlapping
90 static void range_set_check_invariants(struct range_set *rs)
92 int i;
94 if (!rs)
95 return;
97 if (rs->nr)
98 assert(rs->ranges[0].start < rs->ranges[0].end);
100 for (i = 1; i < rs->nr; i++) {
101 assert(rs->ranges[i-1].end < rs->ranges[i].start);
102 assert(rs->ranges[i].start < rs->ranges[i].end);
107 * In-place pass of sorting and merging the ranges in the range set,
108 * to establish the invariants when we get the ranges from the user
110 void sort_and_merge_range_set(struct range_set *rs)
112 int i;
113 int o = 0; /* output cursor */
115 qsort(rs->ranges, rs->nr, sizeof(struct range), range_cmp);
117 for (i = 0; i < rs->nr; i++) {
118 if (rs->ranges[i].start == rs->ranges[i].end)
119 continue;
120 if (o > 0 && rs->ranges[i].start <= rs->ranges[o-1].end) {
121 if (rs->ranges[o-1].end < rs->ranges[i].end)
122 rs->ranges[o-1].end = rs->ranges[i].end;
123 } else {
124 rs->ranges[o].start = rs->ranges[i].start;
125 rs->ranges[o].end = rs->ranges[i].end;
126 o++;
129 assert(o <= rs->nr);
130 rs->nr = o;
132 range_set_check_invariants(rs);
136 * Union of range sets (i.e., sets of line numbers). Used to merge
137 * them when searches meet at a common ancestor.
139 * This is also where the ranges are consolidated into canonical form:
140 * overlapping and adjacent ranges are merged, and empty ranges are
141 * removed.
143 static void range_set_union(struct range_set *out,
144 struct range_set *a, struct range_set *b)
146 int i = 0, j = 0, o = 0;
147 struct range *ra = a->ranges;
148 struct range *rb = b->ranges;
149 /* cannot make an alias of out->ranges: it may change during grow */
151 assert(out->nr == 0);
152 while (i < a->nr || j < b->nr) {
153 struct range *new;
154 if (i < a->nr && j < b->nr) {
155 if (ra[i].start < rb[j].start)
156 new = &ra[i++];
157 else if (ra[i].start > rb[j].start)
158 new = &rb[j++];
159 else if (ra[i].end < rb[j].end)
160 new = &ra[i++];
161 else
162 new = &rb[j++];
163 } else if (i < a->nr) /* b exhausted */
164 new = &ra[i++];
165 else /* a exhausted */
166 new = &rb[j++];
167 if (new->start == new->end)
168 ; /* empty range */
169 else if (!o || out->ranges[o-1].end < new->start) {
170 range_set_grow(out, 1);
171 out->ranges[o].start = new->start;
172 out->ranges[o].end = new->end;
173 o++;
174 } else if (out->ranges[o-1].end < new->end) {
175 out->ranges[o-1].end = new->end;
178 out->nr = o;
182 * Difference of range sets (out = a \ b). Pass the "interesting"
183 * ranges as 'a' and the target side of the diff as 'b': it removes
184 * the ranges for which the commit is responsible.
186 static void range_set_difference(struct range_set *out,
187 struct range_set *a, struct range_set *b)
189 int i, j = 0;
190 for (i = 0; i < a->nr; i++) {
191 long start = a->ranges[i].start;
192 long end = a->ranges[i].end;
193 while (start < end) {
194 while (j < b->nr && start >= b->ranges[j].end)
196 * a: |-------
197 * b: ------|
199 j++;
200 if (j >= b->nr || end < b->ranges[j].start) {
202 * b exhausted, or
203 * a: ----|
204 * b: |----
206 range_set_append(out, start, end);
207 break;
209 if (start >= b->ranges[j].start) {
211 * a: |--????
212 * b: |------|
214 start = b->ranges[j].end;
215 } else if (end > b->ranges[j].start) {
217 * a: |-----|
218 * b: |--?????
220 if (start < b->ranges[j].start)
221 range_set_append(out, start, b->ranges[j].start);
222 start = b->ranges[j].end;
228 static void diff_ranges_init(struct diff_ranges *diff)
230 range_set_init(&diff->parent, 0);
231 range_set_init(&diff->target, 0);
234 static void diff_ranges_release(struct diff_ranges *diff)
236 range_set_release(&diff->parent);
237 range_set_release(&diff->target);
240 void line_log_data_init(struct line_log_data *r)
242 memset(r, 0, sizeof(struct line_log_data));
243 range_set_init(&r->ranges, 0);
246 static void line_log_data_clear(struct line_log_data *r)
248 range_set_release(&r->ranges);
249 if (r->pair)
250 diff_free_filepair(r->pair);
253 static void free_line_log_data(struct line_log_data *r)
255 while (r) {
256 struct line_log_data *next = r->next;
257 line_log_data_clear(r);
258 free(r);
259 r = next;
263 static struct line_log_data *
264 search_line_log_data(struct line_log_data *list, const char *path,
265 struct line_log_data **insertion_point)
267 struct line_log_data *p = list;
268 if (insertion_point)
269 *insertion_point = NULL;
270 while (p) {
271 int cmp = strcmp(p->path, path);
272 if (!cmp)
273 return p;
274 if (insertion_point && cmp < 0)
275 *insertion_point = p;
276 p = p->next;
278 return NULL;
282 * Note: takes ownership of 'path', which happens to be what the only
283 * caller needs.
285 static void line_log_data_insert(struct line_log_data **list,
286 char *path,
287 long begin, long end)
289 struct line_log_data *ip;
290 struct line_log_data *p = search_line_log_data(*list, path, &ip);
292 if (p) {
293 range_set_append_unsafe(&p->ranges, begin, end);
294 free(path);
295 return;
298 p = xcalloc(1, sizeof(struct line_log_data));
299 p->path = path;
300 range_set_append(&p->ranges, begin, end);
301 if (ip) {
302 p->next = ip->next;
303 ip->next = p;
304 } else {
305 p->next = *list;
306 *list = p;
310 struct collect_diff_cbdata {
311 struct diff_ranges *diff;
314 static int collect_diff_cb(long start_a, long count_a,
315 long start_b, long count_b,
316 void *data)
318 struct collect_diff_cbdata *d = data;
320 if (count_a >= 0)
321 range_set_append(&d->diff->parent, start_a, start_a + count_a);
322 if (count_b >= 0)
323 range_set_append(&d->diff->target, start_b, start_b + count_b);
325 return 0;
328 static void collect_diff(mmfile_t *parent, mmfile_t *target, struct diff_ranges *out)
330 struct collect_diff_cbdata cbdata = {NULL};
331 xpparam_t xpp;
332 xdemitconf_t xecfg;
333 xdemitcb_t ecb;
335 memset(&xpp, 0, sizeof(xpp));
336 memset(&xecfg, 0, sizeof(xecfg));
337 xecfg.ctxlen = xecfg.interhunkctxlen = 0;
339 cbdata.diff = out;
340 xecfg.hunk_func = collect_diff_cb;
341 memset(&ecb, 0, sizeof(ecb));
342 ecb.priv = &cbdata;
343 xdi_diff(parent, target, &xpp, &xecfg, &ecb);
347 * These are handy for debugging. Removing them with #if 0 silences
348 * the "unused function" warning.
350 #if 0
351 static void dump_range_set(struct range_set *rs, const char *desc)
353 int i;
354 printf("range set %s (%d items):\n", desc, rs->nr);
355 for (i = 0; i < rs->nr; i++)
356 printf("\t[%ld,%ld]\n", rs->ranges[i].start, rs->ranges[i].end);
359 static void dump_line_log_data(struct line_log_data *r)
361 char buf[4096];
362 while (r) {
363 snprintf(buf, 4096, "file %s\n", r->path);
364 dump_range_set(&r->ranges, buf);
365 r = r->next;
369 static void dump_diff_ranges(struct diff_ranges *diff, const char *desc)
371 int i;
372 assert(diff->parent.nr == diff->target.nr);
373 printf("diff ranges %s (%d items):\n", desc, diff->parent.nr);
374 printf("\tparent\ttarget\n");
375 for (i = 0; i < diff->parent.nr; i++) {
376 printf("\t[%ld,%ld]\t[%ld,%ld]\n",
377 diff->parent.ranges[i].start,
378 diff->parent.ranges[i].end,
379 diff->target.ranges[i].start,
380 diff->target.ranges[i].end);
383 #endif
386 static int ranges_overlap(struct range *a, struct range *b)
388 return !(a->end <= b->start || b->end <= a->start);
392 * Given a diff and the set of interesting ranges, determine all hunks
393 * of the diff which touch (overlap) at least one of the interesting
394 * ranges in the target.
396 static void diff_ranges_filter_touched(struct diff_ranges *out,
397 struct diff_ranges *diff,
398 struct range_set *rs)
400 int i, j = 0;
402 assert(out->target.nr == 0);
404 for (i = 0; i < diff->target.nr; i++) {
405 while (diff->target.ranges[i].start > rs->ranges[j].end) {
406 j++;
407 if (j == rs->nr)
408 return;
410 if (ranges_overlap(&diff->target.ranges[i], &rs->ranges[j])) {
411 range_set_append(&out->parent,
412 diff->parent.ranges[i].start,
413 diff->parent.ranges[i].end);
414 range_set_append(&out->target,
415 diff->target.ranges[i].start,
416 diff->target.ranges[i].end);
422 * Adjust the line counts in 'rs' to account for the lines
423 * added/removed in the diff.
425 static void range_set_shift_diff(struct range_set *out,
426 struct range_set *rs,
427 struct diff_ranges *diff)
429 int i, j = 0;
430 long offset = 0;
431 struct range *src = rs->ranges;
432 struct range *target = diff->target.ranges;
433 struct range *parent = diff->parent.ranges;
435 for (i = 0; i < rs->nr; i++) {
436 while (j < diff->target.nr && src[i].start >= target[j].start) {
437 offset += (parent[j].end-parent[j].start)
438 - (target[j].end-target[j].start);
439 j++;
441 range_set_append(out, src[i].start+offset, src[i].end+offset);
446 * Given a diff and the set of interesting ranges, map the ranges
447 * across the diff. That is: observe that the target commit takes
448 * blame for all the + (target-side) ranges. So for every pair of
449 * ranges in the diff that was touched, we remove the latter and add
450 * its parent side.
452 static void range_set_map_across_diff(struct range_set *out,
453 struct range_set *rs,
454 struct diff_ranges *diff,
455 struct diff_ranges **touched_out)
457 struct diff_ranges *touched = xmalloc(sizeof(*touched));
458 struct range_set tmp1 = RANGE_SET_INIT;
459 struct range_set tmp2 = RANGE_SET_INIT;
461 diff_ranges_init(touched);
462 diff_ranges_filter_touched(touched, diff, rs);
463 range_set_difference(&tmp1, rs, &touched->target);
464 range_set_shift_diff(&tmp2, &tmp1, diff);
465 range_set_union(out, &tmp2, &touched->parent);
466 range_set_release(&tmp1);
467 range_set_release(&tmp2);
469 *touched_out = touched;
472 static struct commit *check_single_commit(struct rev_info *revs)
474 struct object *commit = NULL;
475 int found = -1;
476 int i;
478 for (i = 0; i < revs->pending.nr; i++) {
479 struct object *obj = revs->pending.objects[i].item;
480 if (obj->flags & UNINTERESTING)
481 continue;
482 while (obj->type == OBJ_TAG)
483 obj = deref_tag(obj, NULL, 0);
484 if (obj->type != OBJ_COMMIT)
485 die("Non commit %s?", revs->pending.objects[i].name);
486 if (commit)
487 die("More than one commit to dig from: %s and %s?",
488 revs->pending.objects[i].name,
489 revs->pending.objects[found].name);
490 commit = obj;
491 found = i;
494 if (!commit)
495 die("No commit specified?");
497 return (struct commit *) commit;
500 static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
502 unsigned mode;
503 unsigned char sha1[20];
505 if (get_tree_entry(commit->object.sha1, spec->path,
506 sha1, &mode))
507 die("There is no path %s in the commit", spec->path);
508 fill_filespec(spec, sha1, 1, mode);
510 return;
513 static void fill_line_ends(struct diff_filespec *spec, long *lines,
514 unsigned long **line_ends)
516 int num = 0, size = 50;
517 long cur = 0;
518 unsigned long *ends = NULL;
519 char *data = NULL;
521 if (diff_populate_filespec(spec, 0))
522 die("Cannot read blob %s", sha1_to_hex(spec->sha1));
524 ends = xmalloc(size * sizeof(*ends));
525 ends[cur++] = 0;
526 data = spec->data;
527 while (num < spec->size) {
528 if (data[num] == '\n' || num == spec->size - 1) {
529 ALLOC_GROW(ends, (cur + 1), size);
530 ends[cur++] = num;
532 num++;
535 /* shrink the array to fit the elements */
536 ends = xrealloc(ends, cur * sizeof(*ends));
537 *lines = cur-1;
538 *line_ends = ends;
541 struct nth_line_cb {
542 struct diff_filespec *spec;
543 long lines;
544 unsigned long *line_ends;
547 static const char *nth_line(void *data, long line)
549 struct nth_line_cb *d = data;
550 assert(d && line <= d->lines);
551 assert(d->spec && d->spec->data);
553 if (line == 0)
554 return (char *)d->spec->data;
555 else
556 return (char *)d->spec->data + d->line_ends[line] + 1;
559 static struct line_log_data *
560 parse_lines(struct commit *commit, const char *prefix, struct string_list *args)
562 long lines = 0;
563 unsigned long *ends = NULL;
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;
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;
576 name_part = skip_range_arg(item->string);
577 if (!name_part || *name_part != ':' || !name_part[1])
578 die("-L argument '%s' not of the form start,end:file",
579 item->string);
580 range_part = xstrndup(item->string, name_part - item->string);
581 name_part++;
583 full_name = prefix_path(prefix, prefix ? strlen(prefix) : 0,
584 name_part);
586 spec = alloc_filespec(full_name);
587 fill_blob_sha1(commit, spec);
588 fill_line_ends(spec, &lines, &ends);
589 cb_data.spec = spec;
590 cb_data.lines = lines;
591 cb_data.line_ends = ends;
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;
599 if (parse_range_arg(range_part, nth_line, &cb_data,
600 lines, anchor, &begin, &end,
601 full_name))
602 die("malformed -L argument '%s'", range_part);
603 if (lines < end || ((lines || begin) && lines < begin))
604 die("file %s has only %lu lines", name_part, lines);
605 if (begin < 1)
606 begin = 1;
607 if (end < 1)
608 end = lines;
609 begin--;
610 line_log_data_insert(&ranges, full_name, begin, end);
612 free_filespec(spec);
613 free(ends);
614 ends = NULL;
617 for (p = ranges; p; p = p->next)
618 sort_and_merge_range_set(&p->ranges);
620 return ranges;
623 static struct line_log_data *line_log_data_copy_one(struct line_log_data *r)
625 struct line_log_data *ret = xmalloc(sizeof(*ret));
627 assert(r);
628 line_log_data_init(ret);
629 range_set_copy(&ret->ranges, &r->ranges);
631 ret->path = xstrdup(r->path);
633 return ret;
636 static struct line_log_data *
637 line_log_data_copy(struct line_log_data *r)
639 struct line_log_data *ret = NULL;
640 struct line_log_data *tmp = NULL, *prev = NULL;
642 assert(r);
643 ret = tmp = prev = line_log_data_copy_one(r);
644 r = r->next;
645 while (r) {
646 tmp = line_log_data_copy_one(r);
647 prev->next = tmp;
648 prev = tmp;
649 r = r->next;
652 return ret;
655 /* merge two range sets across files */
656 static struct line_log_data *line_log_data_merge(struct line_log_data *a,
657 struct line_log_data *b)
659 struct line_log_data *head = NULL, **pp = &head;
661 while (a || b) {
662 struct line_log_data *src;
663 struct line_log_data *src2 = NULL;
664 struct line_log_data *d;
665 int cmp;
666 if (!a)
667 cmp = 1;
668 else if (!b)
669 cmp = -1;
670 else
671 cmp = strcmp(a->path, b->path);
672 if (cmp < 0) {
673 src = a;
674 a = a->next;
675 } else if (cmp == 0) {
676 src = a;
677 a = a->next;
678 src2 = b;
679 b = b->next;
680 } else {
681 src = b;
682 b = b->next;
684 d = xmalloc(sizeof(struct line_log_data));
685 line_log_data_init(d);
686 d->path = xstrdup(src->path);
687 *pp = d;
688 pp = &d->next;
689 if (src2)
690 range_set_union(&d->ranges, &src->ranges, &src2->ranges);
691 else
692 range_set_copy(&d->ranges, &src->ranges);
695 return head;
698 static void add_line_range(struct rev_info *revs, struct commit *commit,
699 struct line_log_data *range)
701 struct line_log_data *old = NULL;
702 struct line_log_data *new = NULL;
704 old = lookup_decoration(&revs->line_log_data, &commit->object);
705 if (old && range) {
706 new = line_log_data_merge(old, range);
707 free_line_log_data(old);
708 } else if (range)
709 new = line_log_data_copy(range);
711 if (new)
712 add_decoration(&revs->line_log_data, &commit->object, new);
715 static void clear_commit_line_range(struct rev_info *revs, struct commit *commit)
717 struct line_log_data *r;
718 r = lookup_decoration(&revs->line_log_data, &commit->object);
719 if (!r)
720 return;
721 free_line_log_data(r);
722 add_decoration(&revs->line_log_data, &commit->object, NULL);
725 static struct line_log_data *lookup_line_range(struct rev_info *revs,
726 struct commit *commit)
728 struct line_log_data *ret = NULL;
729 struct line_log_data *d;
731 ret = lookup_decoration(&revs->line_log_data, &commit->object);
733 for (d = ret; d; d = d->next)
734 range_set_check_invariants(&d->ranges);
736 return ret;
739 void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args)
741 struct commit *commit = NULL;
742 struct line_log_data *range;
744 commit = check_single_commit(rev);
745 range = parse_lines(commit, prefix, args);
746 add_line_range(rev, commit, range);
748 if (!rev->diffopt.detect_rename) {
749 int i, count = 0;
750 struct line_log_data *r = range;
751 const char **paths;
752 while (r) {
753 count++;
754 r = r->next;
756 paths = xmalloc((count+1)*sizeof(char *));
757 r = range;
758 for (i = 0; i < count; i++) {
759 paths[i] = xstrdup(r->path);
760 r = r->next;
762 paths[count] = NULL;
763 parse_pathspec(&rev->diffopt.pathspec, 0,
764 PATHSPEC_PREFER_FULL, "", paths);
765 free(paths);
769 static int count_parents(struct commit *commit)
771 struct commit_list *parents = commit->parents;
772 int count = 0;
773 while (parents) {
774 count++;
775 parents = parents->next;
777 return count;
780 static void move_diff_queue(struct diff_queue_struct *dst,
781 struct diff_queue_struct *src)
783 assert(src != dst);
784 memcpy(dst, src, sizeof(struct diff_queue_struct));
785 DIFF_QUEUE_CLEAR(src);
788 static void filter_diffs_for_paths(struct line_log_data *range, int keep_deletions)
790 int i;
791 struct diff_queue_struct outq;
792 DIFF_QUEUE_CLEAR(&outq);
794 for (i = 0; i < diff_queued_diff.nr; i++) {
795 struct diff_filepair *p = diff_queued_diff.queue[i];
796 struct line_log_data *rg = NULL;
798 if (!DIFF_FILE_VALID(p->two)) {
799 if (keep_deletions)
800 diff_q(&outq, p);
801 else
802 diff_free_filepair(p);
803 continue;
805 for (rg = range; rg; rg = rg->next) {
806 if (!strcmp(rg->path, p->two->path))
807 break;
809 if (rg)
810 diff_q(&outq, p);
811 else
812 diff_free_filepair(p);
814 free(diff_queued_diff.queue);
815 diff_queued_diff = outq;
818 static inline int diff_might_be_rename(void)
820 int i;
821 for (i = 0; i < diff_queued_diff.nr; i++)
822 if (!DIFF_FILE_VALID(diff_queued_diff.queue[i]->one)) {
823 /* fprintf(stderr, "diff_might_be_rename found creation of: %s\n", */
824 /* diff_queued_diff.queue[i]->two->path); */
825 return 1;
827 return 0;
830 static void queue_diffs(struct line_log_data *range,
831 struct diff_options *opt,
832 struct diff_queue_struct *queue,
833 struct commit *commit, struct commit *parent)
835 assert(commit);
837 DIFF_QUEUE_CLEAR(&diff_queued_diff);
838 diff_tree_sha1(parent ? parent->tree->object.sha1 : NULL,
839 commit->tree->object.sha1, "", opt);
840 if (opt->detect_rename) {
841 filter_diffs_for_paths(range, 1);
842 if (diff_might_be_rename())
843 diffcore_std(opt);
844 filter_diffs_for_paths(range, 0);
846 move_diff_queue(queue, &diff_queued_diff);
849 static char *get_nth_line(long line, unsigned long *ends, void *data)
851 if (line == 0)
852 return (char *)data;
853 else
854 return (char *)data + ends[line] + 1;
857 static void print_line(const char *prefix, char first,
858 long line, unsigned long *ends, void *data,
859 const char *color, const char *reset)
861 char *begin = get_nth_line(line, ends, data);
862 char *end = get_nth_line(line+1, ends, data);
863 int had_nl = 0;
865 if (end > begin && end[-1] == '\n') {
866 end--;
867 had_nl = 1;
870 fputs(prefix, stdout);
871 fputs(color, stdout);
872 putchar(first);
873 fwrite(begin, 1, end-begin, stdout);
874 fputs(reset, stdout);
875 putchar('\n');
876 if (!had_nl)
877 fputs("\\ No newline at end of file\n", stdout);
880 static char *output_prefix(struct diff_options *opt)
882 char *prefix = "";
884 if (opt->output_prefix) {
885 struct strbuf *sb = opt->output_prefix(opt, opt->output_prefix_data);
886 prefix = sb->buf;
889 return prefix;
892 static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *range)
894 int i, j = 0;
895 long p_lines, t_lines;
896 unsigned long *p_ends = NULL, *t_ends = NULL;
897 struct diff_filepair *pair = range->pair;
898 struct diff_ranges *diff = &range->diff;
900 struct diff_options *opt = &rev->diffopt;
901 char *prefix = output_prefix(opt);
902 const char *c_reset = diff_get_color(opt->use_color, DIFF_RESET);
903 const char *c_frag = diff_get_color(opt->use_color, DIFF_FRAGINFO);
904 const char *c_meta = diff_get_color(opt->use_color, DIFF_METAINFO);
905 const char *c_old = diff_get_color(opt->use_color, DIFF_FILE_OLD);
906 const char *c_new = diff_get_color(opt->use_color, DIFF_FILE_NEW);
907 const char *c_plain = diff_get_color(opt->use_color, DIFF_PLAIN);
909 if (!pair || !diff)
910 return;
912 if (pair->one->sha1_valid)
913 fill_line_ends(pair->one, &p_lines, &p_ends);
914 fill_line_ends(pair->two, &t_lines, &t_ends);
916 printf("%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
917 printf("%s%s--- %s%s%s\n", prefix, c_meta,
918 pair->one->sha1_valid ? "a/" : "",
919 pair->one->sha1_valid ? pair->one->path : "/dev/null",
920 c_reset);
921 printf("%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
922 for (i = 0; i < range->ranges.nr; i++) {
923 long p_start, p_end;
924 long t_start = range->ranges.ranges[i].start;
925 long t_end = range->ranges.ranges[i].end;
926 long t_cur = t_start;
927 int j_last;
929 while (j < diff->target.nr && diff->target.ranges[j].end < t_start)
930 j++;
931 if (j == diff->target.nr || diff->target.ranges[j].start > t_end)
932 continue;
934 /* Scan ahead to determine the last diff that falls in this range */
935 j_last = j;
936 while (j_last < diff->target.nr && diff->target.ranges[j_last].start < t_end)
937 j_last++;
938 if (j_last > j)
939 j_last--;
942 * Compute parent hunk headers: we know that the diff
943 * has the correct line numbers (but not all hunks).
944 * So it suffices to shift the start/end according to
945 * the line numbers of the first/last hunk(s) that
946 * fall in this range.
948 if (t_start < diff->target.ranges[j].start)
949 p_start = diff->parent.ranges[j].start - (diff->target.ranges[j].start-t_start);
950 else
951 p_start = diff->parent.ranges[j].start;
952 if (t_end > diff->target.ranges[j_last].end)
953 p_end = diff->parent.ranges[j_last].end + (t_end-diff->target.ranges[j_last].end);
954 else
955 p_end = diff->parent.ranges[j_last].end;
957 if (!p_start && !p_end) {
958 p_start = -1;
959 p_end = -1;
962 /* Now output a diff hunk for this range */
963 printf("%s%s@@ -%ld,%ld +%ld,%ld @@%s\n",
964 prefix, c_frag,
965 p_start+1, p_end-p_start, t_start+1, t_end-t_start,
966 c_reset);
967 while (j < diff->target.nr && diff->target.ranges[j].start < t_end) {
968 int k;
969 for (; t_cur < diff->target.ranges[j].start; t_cur++)
970 print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
971 c_plain, c_reset);
972 for (k = diff->parent.ranges[j].start; k < diff->parent.ranges[j].end; k++)
973 print_line(prefix, '-', k, p_ends, pair->one->data,
974 c_old, c_reset);
975 for (; t_cur < diff->target.ranges[j].end && t_cur < t_end; t_cur++)
976 print_line(prefix, '+', t_cur, t_ends, pair->two->data,
977 c_new, c_reset);
978 j++;
980 for (; t_cur < t_end; t_cur++)
981 print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
982 c_plain, c_reset);
985 free(p_ends);
986 free(t_ends);
990 * NEEDSWORK: manually building a diff here is not the Right
991 * Thing(tm). log -L should be built into the diff pipeline.
993 static void dump_diff_hacky(struct rev_info *rev, struct line_log_data *range)
995 puts(output_prefix(&rev->diffopt));
996 while (range) {
997 dump_diff_hacky_one(rev, range);
998 range = range->next;
1003 * Unlike most other functions, this destructively operates on
1004 * 'range'.
1006 static int process_diff_filepair(struct rev_info *rev,
1007 struct diff_filepair *pair,
1008 struct line_log_data *range,
1009 struct diff_ranges **diff_out)
1011 struct line_log_data *rg = range;
1012 struct range_set tmp;
1013 struct diff_ranges diff;
1014 mmfile_t file_parent, file_target;
1016 assert(pair->two->path);
1017 while (rg) {
1018 assert(rg->path);
1019 if (!strcmp(rg->path, pair->two->path))
1020 break;
1021 rg = rg->next;
1024 if (!rg)
1025 return 0;
1026 if (rg->ranges.nr == 0)
1027 return 0;
1029 assert(pair->two->sha1_valid);
1030 diff_populate_filespec(pair->two, 0);
1031 file_target.ptr = pair->two->data;
1032 file_target.size = pair->two->size;
1034 if (pair->one->sha1_valid) {
1035 diff_populate_filespec(pair->one, 0);
1036 file_parent.ptr = pair->one->data;
1037 file_parent.size = pair->one->size;
1038 } else {
1039 file_parent.ptr = "";
1040 file_parent.size = 0;
1043 diff_ranges_init(&diff);
1044 collect_diff(&file_parent, &file_target, &diff);
1046 /* NEEDSWORK should apply some heuristics to prevent mismatches */
1047 free(rg->path);
1048 rg->path = xstrdup(pair->one->path);
1050 range_set_init(&tmp, 0);
1051 range_set_map_across_diff(&tmp, &rg->ranges, &diff, diff_out);
1052 range_set_release(&rg->ranges);
1053 range_set_move(&rg->ranges, &tmp);
1055 diff_ranges_release(&diff);
1057 return ((*diff_out)->parent.nr > 0);
1060 static struct diff_filepair *diff_filepair_dup(struct diff_filepair *pair)
1062 struct diff_filepair *new = xmalloc(sizeof(struct diff_filepair));
1063 new->one = pair->one;
1064 new->two = pair->two;
1065 new->one->count++;
1066 new->two->count++;
1067 return new;
1070 static void free_diffqueues(int n, struct diff_queue_struct *dq)
1072 int i, j;
1073 for (i = 0; i < n; i++)
1074 for (j = 0; j < dq[i].nr; j++)
1075 diff_free_filepair(dq[i].queue[j]);
1076 free(dq);
1079 static int process_all_files(struct line_log_data **range_out,
1080 struct rev_info *rev,
1081 struct diff_queue_struct *queue,
1082 struct line_log_data *range)
1084 int i, changed = 0;
1086 *range_out = line_log_data_copy(range);
1088 for (i = 0; i < queue->nr; i++) {
1089 struct diff_ranges *pairdiff = NULL;
1090 struct diff_filepair *pair = queue->queue[i];
1091 if (process_diff_filepair(rev, pair, *range_out, &pairdiff)) {
1093 * Store away the diff for later output. We
1094 * tuck it in the ranges we got as _input_,
1095 * since that's the commit that caused the
1096 * diff.
1098 * NEEDSWORK not enough when we get around to
1099 * doing something interesting with merges;
1100 * currently each invocation on a merge parent
1101 * trashes the previous one's diff.
1103 * NEEDSWORK tramples over data structures not owned here
1105 struct line_log_data *rg = range;
1106 changed++;
1107 while (rg && strcmp(rg->path, pair->two->path))
1108 rg = rg->next;
1109 assert(rg);
1110 rg->pair = diff_filepair_dup(queue->queue[i]);
1111 memcpy(&rg->diff, pairdiff, sizeof(struct diff_ranges));
1115 return changed;
1118 int line_log_print(struct rev_info *rev, struct commit *commit)
1120 struct line_log_data *range = lookup_line_range(rev, commit);
1122 show_log(rev);
1123 dump_diff_hacky(rev, range);
1124 return 1;
1127 static int process_ranges_ordinary_commit(struct rev_info *rev, struct commit *commit,
1128 struct line_log_data *range)
1130 struct commit *parent = NULL;
1131 struct diff_queue_struct queue;
1132 struct line_log_data *parent_range;
1133 int changed;
1135 if (commit->parents)
1136 parent = commit->parents->item;
1138 queue_diffs(range, &rev->diffopt, &queue, commit, parent);
1139 changed = process_all_files(&parent_range, rev, &queue, range);
1140 if (parent)
1141 add_line_range(rev, parent, parent_range);
1142 return changed;
1145 static int process_ranges_merge_commit(struct rev_info *rev, struct commit *commit,
1146 struct line_log_data *range)
1148 struct diff_queue_struct *diffqueues;
1149 struct line_log_data **cand;
1150 struct commit **parents;
1151 struct commit_list *p;
1152 int i;
1153 int nparents = count_parents(commit);
1155 diffqueues = xmalloc(nparents * sizeof(*diffqueues));
1156 cand = xmalloc(nparents * sizeof(*cand));
1157 parents = xmalloc(nparents * sizeof(*parents));
1159 p = commit->parents;
1160 for (i = 0; i < nparents; i++) {
1161 parents[i] = p->item;
1162 p = p->next;
1163 queue_diffs(range, &rev->diffopt, &diffqueues[i], commit, parents[i]);
1166 for (i = 0; i < nparents; i++) {
1167 int changed;
1168 cand[i] = NULL;
1169 changed = process_all_files(&cand[i], rev, &diffqueues[i], range);
1170 if (!changed) {
1172 * This parent can take all the blame, so we
1173 * don't follow any other path in history
1175 add_line_range(rev, parents[i], cand[i]);
1176 clear_commit_line_range(rev, commit);
1177 commit_list_append(parents[i], &commit->parents);
1178 free(parents);
1179 free(cand);
1180 free_diffqueues(nparents, diffqueues);
1181 /* NEEDSWORK leaking like a sieve */
1182 return 0;
1187 * No single parent took the blame. We add the candidates
1188 * from the above loop to the parents.
1190 for (i = 0; i < nparents; i++) {
1191 add_line_range(rev, parents[i], cand[i]);
1194 clear_commit_line_range(rev, commit);
1195 free(parents);
1196 free(cand);
1197 free_diffqueues(nparents, diffqueues);
1198 return 1;
1200 /* NEEDSWORK evil merge detection stuff */
1201 /* NEEDSWORK leaking like a sieve */
1204 static int process_ranges_arbitrary_commit(struct rev_info *rev, struct commit *commit)
1206 struct line_log_data *range = lookup_line_range(rev, commit);
1207 int changed = 0;
1209 if (range) {
1210 if (!commit->parents || !commit->parents->next)
1211 changed = process_ranges_ordinary_commit(rev, commit, range);
1212 else
1213 changed = process_ranges_merge_commit(rev, commit, range);
1216 if (!changed)
1217 commit->object.flags |= TREESAME;
1219 return changed;
1222 static enum rewrite_result line_log_rewrite_one(struct rev_info *rev, struct commit **pp)
1224 for (;;) {
1225 struct commit *p = *pp;
1226 if (p->parents && p->parents->next)
1227 return rewrite_one_ok;
1228 if (p->object.flags & UNINTERESTING)
1229 return rewrite_one_ok;
1230 if (!(p->object.flags & TREESAME))
1231 return rewrite_one_ok;
1232 if (!p->parents)
1233 return rewrite_one_noparents;
1234 *pp = p->parents->item;
1238 int line_log_filter(struct rev_info *rev)
1240 struct commit *commit;
1241 struct commit_list *list = rev->commits;
1242 struct commit_list *out = NULL, **pp = &out;
1244 while (list) {
1245 struct commit_list *to_free = NULL;
1246 commit = list->item;
1247 if (process_ranges_arbitrary_commit(rev, commit)) {
1248 *pp = list;
1249 pp = &list->next;
1250 } else
1251 to_free = list;
1252 list = list->next;
1253 free(to_free);
1255 *pp = NULL;
1257 for (list = out; list; list = list->next)
1258 rewrite_parents(rev, list->item, line_log_rewrite_one);
1260 rev->commits = out;
1262 return 0;