1 #include "git-compat-util.h"
2 #include "line-range.h"
11 #include "xdiff-interface.h"
17 #include "argv-array.h"
19 static void range_set_grow(struct range_set
*rs
, size_t extra
)
21 ALLOC_GROW(rs
->ranges
, rs
->nr
+ extra
, rs
->alloc
);
24 /* Either initialization would be fine */
25 #define RANGE_SET_INIT {0}
27 void range_set_init(struct range_set
*rs
, size_t prealloc
)
29 rs
->alloc
= rs
->nr
= 0;
32 range_set_grow(rs
, prealloc
);
35 void range_set_release(struct range_set
*rs
)
38 rs
->alloc
= rs
->nr
= 0;
42 /* dst must be uninitialized! */
43 static void range_set_copy(struct range_set
*dst
, struct range_set
*src
)
45 range_set_init(dst
, src
->nr
);
46 memcpy(dst
->ranges
, src
->ranges
, src
->nr
*sizeof(struct range_set
));
49 static void range_set_move(struct range_set
*dst
, struct range_set
*src
)
51 range_set_release(dst
);
52 dst
->ranges
= src
->ranges
;
54 dst
->alloc
= src
->alloc
;
56 src
->alloc
= src
->nr
= 0;
59 /* tack on a _new_ range _at the end_ */
60 void range_set_append_unsafe(struct range_set
*rs
, long a
, long b
)
63 range_set_grow(rs
, 1);
64 rs
->ranges
[rs
->nr
].start
= a
;
65 rs
->ranges
[rs
->nr
].end
= b
;
69 void range_set_append(struct range_set
*rs
, long a
, long b
)
71 assert(rs
->nr
== 0 || rs
->ranges
[rs
->nr
-1].end
<= a
);
72 range_set_append_unsafe(rs
, a
, b
);
75 static int range_cmp(const void *_r
, const void *_s
)
77 const struct range
*r
= _r
;
78 const struct range
*s
= _s
;
80 /* this could be simply 'return r.start-s.start', but for the types */
81 if (r
->start
== s
->start
)
83 if (r
->start
< s
->start
)
89 * Check that the ranges are non-empty, sorted and non-overlapping
91 static void range_set_check_invariants(struct range_set
*rs
)
99 assert(rs
->ranges
[0].start
< rs
->ranges
[0].end
);
101 for (i
= 1; i
< rs
->nr
; i
++) {
102 assert(rs
->ranges
[i
-1].end
< rs
->ranges
[i
].start
);
103 assert(rs
->ranges
[i
].start
< rs
->ranges
[i
].end
);
108 * In-place pass of sorting and merging the ranges in the range set,
109 * to establish the invariants when we get the ranges from the user
111 void sort_and_merge_range_set(struct range_set
*rs
)
114 int o
= 0; /* output cursor */
116 qsort(rs
->ranges
, rs
->nr
, sizeof(struct range
), range_cmp
);
118 for (i
= 0; i
< rs
->nr
; i
++) {
119 if (rs
->ranges
[i
].start
== rs
->ranges
[i
].end
)
121 if (o
> 0 && rs
->ranges
[i
].start
<= rs
->ranges
[o
-1].end
) {
122 if (rs
->ranges
[o
-1].end
< rs
->ranges
[i
].end
)
123 rs
->ranges
[o
-1].end
= rs
->ranges
[i
].end
;
125 rs
->ranges
[o
].start
= rs
->ranges
[i
].start
;
126 rs
->ranges
[o
].end
= rs
->ranges
[i
].end
;
133 range_set_check_invariants(rs
);
137 * Union of range sets (i.e., sets of line numbers). Used to merge
138 * them when searches meet at a common ancestor.
140 * This is also where the ranges are consolidated into canonical form:
141 * overlapping and adjacent ranges are merged, and empty ranges are
144 static void range_set_union(struct range_set
*out
,
145 struct range_set
*a
, struct range_set
*b
)
147 int i
= 0, j
= 0, o
= 0;
148 struct range
*ra
= a
->ranges
;
149 struct range
*rb
= b
->ranges
;
150 /* cannot make an alias of out->ranges: it may change during grow */
152 assert(out
->nr
== 0);
153 while (i
< a
->nr
|| j
< b
->nr
) {
155 if (i
< a
->nr
&& j
< b
->nr
) {
156 if (ra
[i
].start
< rb
[j
].start
)
158 else if (ra
[i
].start
> rb
[j
].start
)
160 else if (ra
[i
].end
< rb
[j
].end
)
164 } else if (i
< a
->nr
) /* b exhausted */
166 else /* a exhausted */
168 if (new->start
== new->end
)
170 else if (!o
|| out
->ranges
[o
-1].end
< new->start
) {
171 range_set_grow(out
, 1);
172 out
->ranges
[o
].start
= new->start
;
173 out
->ranges
[o
].end
= new->end
;
175 } else if (out
->ranges
[o
-1].end
< new->end
) {
176 out
->ranges
[o
-1].end
= new->end
;
183 * Difference of range sets (out = a \ b). Pass the "interesting"
184 * ranges as 'a' and the target side of the diff as 'b': it removes
185 * the ranges for which the commit is responsible.
187 static void range_set_difference(struct range_set
*out
,
188 struct range_set
*a
, struct range_set
*b
)
191 for (i
= 0; i
< a
->nr
; i
++) {
192 long start
= a
->ranges
[i
].start
;
193 long end
= a
->ranges
[i
].end
;
194 while (start
< end
) {
195 while (j
< b
->nr
&& start
>= b
->ranges
[j
].end
)
201 if (j
>= b
->nr
|| end
< b
->ranges
[j
].start
) {
207 range_set_append(out
, start
, end
);
210 if (start
>= b
->ranges
[j
].start
) {
215 start
= b
->ranges
[j
].end
;
216 } else if (end
> b
->ranges
[j
].start
) {
221 if (start
< b
->ranges
[j
].start
)
222 range_set_append(out
, start
, b
->ranges
[j
].start
);
223 start
= b
->ranges
[j
].end
;
229 static void diff_ranges_init(struct diff_ranges
*diff
)
231 range_set_init(&diff
->parent
, 0);
232 range_set_init(&diff
->target
, 0);
235 static void diff_ranges_release(struct diff_ranges
*diff
)
237 range_set_release(&diff
->parent
);
238 range_set_release(&diff
->target
);
241 static void line_log_data_init(struct line_log_data
*r
)
243 memset(r
, 0, sizeof(struct line_log_data
));
244 range_set_init(&r
->ranges
, 0);
247 static void line_log_data_clear(struct line_log_data
*r
)
249 range_set_release(&r
->ranges
);
251 diff_free_filepair(r
->pair
);
254 static void free_line_log_data(struct line_log_data
*r
)
257 struct line_log_data
*next
= r
->next
;
258 line_log_data_clear(r
);
264 static struct line_log_data
*
265 search_line_log_data(struct line_log_data
*list
, const char *path
,
266 struct line_log_data
**insertion_point
)
268 struct line_log_data
*p
= list
;
270 *insertion_point
= NULL
;
272 int cmp
= strcmp(p
->path
, path
);
275 if (insertion_point
&& cmp
< 0)
276 *insertion_point
= p
;
283 * Note: takes ownership of 'path', which happens to be what the only
286 static void line_log_data_insert(struct line_log_data
**list
,
288 long begin
, long end
)
290 struct line_log_data
*ip
;
291 struct line_log_data
*p
= search_line_log_data(*list
, path
, &ip
);
294 range_set_append_unsafe(&p
->ranges
, begin
, end
);
299 p
= xcalloc(1, sizeof(struct line_log_data
));
301 range_set_append(&p
->ranges
, begin
, end
);
311 struct collect_diff_cbdata
{
312 struct diff_ranges
*diff
;
315 static int collect_diff_cb(long start_a
, long count_a
,
316 long start_b
, long count_b
,
319 struct collect_diff_cbdata
*d
= data
;
322 range_set_append(&d
->diff
->parent
, start_a
, start_a
+ count_a
);
324 range_set_append(&d
->diff
->target
, start_b
, start_b
+ count_b
);
329 static int collect_diff(mmfile_t
*parent
, mmfile_t
*target
, struct diff_ranges
*out
)
331 struct collect_diff_cbdata cbdata
= {NULL
};
336 memset(&xpp
, 0, sizeof(xpp
));
337 memset(&xecfg
, 0, sizeof(xecfg
));
338 xecfg
.ctxlen
= xecfg
.interhunkctxlen
= 0;
341 xecfg
.hunk_func
= collect_diff_cb
;
342 memset(&ecb
, 0, sizeof(ecb
));
344 return xdi_diff(parent
, target
, &xpp
, &xecfg
, &ecb
);
348 * These are handy for debugging. Removing them with #if 0 silences
349 * the "unused function" warning.
352 static void dump_range_set(struct range_set
*rs
, const char *desc
)
355 printf("range set %s (%d items):\n", desc
, rs
->nr
);
356 for (i
= 0; i
< rs
->nr
; i
++)
357 printf("\t[%ld,%ld]\n", rs
->ranges
[i
].start
, rs
->ranges
[i
].end
);
360 static void dump_line_log_data(struct line_log_data
*r
)
364 snprintf(buf
, 4096, "file %s\n", r
->path
);
365 dump_range_set(&r
->ranges
, buf
);
370 static void dump_diff_ranges(struct diff_ranges
*diff
, const char *desc
)
373 assert(diff
->parent
.nr
== diff
->target
.nr
);
374 printf("diff ranges %s (%d items):\n", desc
, diff
->parent
.nr
);
375 printf("\tparent\ttarget\n");
376 for (i
= 0; i
< diff
->parent
.nr
; i
++) {
377 printf("\t[%ld,%ld]\t[%ld,%ld]\n",
378 diff
->parent
.ranges
[i
].start
,
379 diff
->parent
.ranges
[i
].end
,
380 diff
->target
.ranges
[i
].start
,
381 diff
->target
.ranges
[i
].end
);
387 static int ranges_overlap(struct range
*a
, struct range
*b
)
389 return !(a
->end
<= b
->start
|| b
->end
<= a
->start
);
393 * Given a diff and the set of interesting ranges, determine all hunks
394 * of the diff which touch (overlap) at least one of the interesting
395 * ranges in the target.
397 static void diff_ranges_filter_touched(struct diff_ranges
*out
,
398 struct diff_ranges
*diff
,
399 struct range_set
*rs
)
403 assert(out
->target
.nr
== 0);
405 for (i
= 0; i
< diff
->target
.nr
; i
++) {
406 while (diff
->target
.ranges
[i
].start
> rs
->ranges
[j
].end
) {
411 if (ranges_overlap(&diff
->target
.ranges
[i
], &rs
->ranges
[j
])) {
412 range_set_append(&out
->parent
,
413 diff
->parent
.ranges
[i
].start
,
414 diff
->parent
.ranges
[i
].end
);
415 range_set_append(&out
->target
,
416 diff
->target
.ranges
[i
].start
,
417 diff
->target
.ranges
[i
].end
);
423 * Adjust the line counts in 'rs' to account for the lines
424 * added/removed in the diff.
426 static void range_set_shift_diff(struct range_set
*out
,
427 struct range_set
*rs
,
428 struct diff_ranges
*diff
)
432 struct range
*src
= rs
->ranges
;
433 struct range
*target
= diff
->target
.ranges
;
434 struct range
*parent
= diff
->parent
.ranges
;
436 for (i
= 0; i
< rs
->nr
; i
++) {
437 while (j
< diff
->target
.nr
&& src
[i
].start
>= target
[j
].start
) {
438 offset
+= (parent
[j
].end
-parent
[j
].start
)
439 - (target
[j
].end
-target
[j
].start
);
442 range_set_append(out
, src
[i
].start
+offset
, src
[i
].end
+offset
);
447 * Given a diff and the set of interesting ranges, map the ranges
448 * across the diff. That is: observe that the target commit takes
449 * blame for all the + (target-side) ranges. So for every pair of
450 * ranges in the diff that was touched, we remove the latter and add
453 static void range_set_map_across_diff(struct range_set
*out
,
454 struct range_set
*rs
,
455 struct diff_ranges
*diff
,
456 struct diff_ranges
**touched_out
)
458 struct diff_ranges
*touched
= xmalloc(sizeof(*touched
));
459 struct range_set tmp1
= RANGE_SET_INIT
;
460 struct range_set tmp2
= RANGE_SET_INIT
;
462 diff_ranges_init(touched
);
463 diff_ranges_filter_touched(touched
, diff
, rs
);
464 range_set_difference(&tmp1
, rs
, &touched
->target
);
465 range_set_shift_diff(&tmp2
, &tmp1
, diff
);
466 range_set_union(out
, &tmp2
, &touched
->parent
);
467 range_set_release(&tmp1
);
468 range_set_release(&tmp2
);
470 *touched_out
= touched
;
473 static struct commit
*check_single_commit(struct rev_info
*revs
)
475 struct object
*commit
= NULL
;
479 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
480 struct object
*obj
= revs
->pending
.objects
[i
].item
;
481 if (obj
->flags
& UNINTERESTING
)
483 while (obj
->type
== OBJ_TAG
)
484 obj
= deref_tag(obj
, NULL
, 0);
485 if (obj
->type
!= OBJ_COMMIT
)
486 die("Non commit %s?", revs
->pending
.objects
[i
].name
);
488 die("More than one commit to dig from: %s and %s?",
489 revs
->pending
.objects
[i
].name
,
490 revs
->pending
.objects
[found
].name
);
496 die("No commit specified?");
498 return (struct commit
*) commit
;
501 static void fill_blob_sha1(struct commit
*commit
, struct diff_filespec
*spec
)
504 unsigned char sha1
[20];
506 if (get_tree_entry(commit
->object
.oid
.hash
, spec
->path
,
508 die("There is no path %s in the commit", spec
->path
);
509 fill_filespec(spec
, sha1
, 1, mode
);
514 static void fill_line_ends(struct diff_filespec
*spec
, long *lines
,
515 unsigned long **line_ends
)
517 int num
= 0, size
= 50;
519 unsigned long *ends
= NULL
;
522 if (diff_populate_filespec(spec
, 0))
523 die("Cannot read blob %s", sha1_to_hex(spec
->sha1
));
525 ends
= xmalloc(size
* sizeof(*ends
));
528 while (num
< spec
->size
) {
529 if (data
[num
] == '\n' || num
== spec
->size
- 1) {
530 ALLOC_GROW(ends
, (cur
+ 1), size
);
536 /* shrink the array to fit the elements */
537 REALLOC_ARRAY(ends
, cur
);
543 struct diff_filespec
*spec
;
545 unsigned long *line_ends
;
548 static const char *nth_line(void *data
, long line
)
550 struct nth_line_cb
*d
= data
;
551 assert(d
&& line
<= d
->lines
);
552 assert(d
->spec
&& d
->spec
->data
);
555 return (char *)d
->spec
->data
;
557 return (char *)d
->spec
->data
+ d
->line_ends
[line
] + 1;
560 static struct line_log_data
*
561 parse_lines(struct commit
*commit
, const char *prefix
, struct string_list
*args
)
564 unsigned long *ends
= NULL
;
565 struct nth_line_cb cb_data
;
566 struct string_list_item
*item
;
567 struct line_log_data
*ranges
= NULL
;
568 struct line_log_data
*p
;
570 for_each_string_list_item(item
, args
) {
571 const char *name_part
, *range_part
;
573 struct diff_filespec
*spec
;
574 long begin
= 0, end
= 0;
577 name_part
= skip_range_arg(item
->string
);
578 if (!name_part
|| *name_part
!= ':' || !name_part
[1])
579 die("-L argument not 'start,end:file' or ':funcname:file': %s",
581 range_part
= xstrndup(item
->string
, name_part
- item
->string
);
584 full_name
= prefix_path(prefix
, prefix
? strlen(prefix
) : 0,
587 spec
= alloc_filespec(full_name
);
588 fill_blob_sha1(commit
, spec
);
589 fill_line_ends(spec
, &lines
, &ends
);
591 cb_data
.lines
= lines
;
592 cb_data
.line_ends
= ends
;
594 p
= search_line_log_data(ranges
, full_name
, NULL
);
595 if (p
&& p
->ranges
.nr
)
596 anchor
= p
->ranges
.ranges
[p
->ranges
.nr
- 1].end
+ 1;
600 if (parse_range_arg(range_part
, nth_line
, &cb_data
,
601 lines
, anchor
, &begin
, &end
,
603 die("malformed -L argument '%s'", range_part
);
604 if (lines
< end
|| ((lines
|| begin
) && lines
< begin
))
605 die("file %s has only %lu lines", name_part
, lines
);
611 line_log_data_insert(&ranges
, full_name
, begin
, end
);
618 for (p
= ranges
; p
; p
= p
->next
)
619 sort_and_merge_range_set(&p
->ranges
);
624 static struct line_log_data
*line_log_data_copy_one(struct line_log_data
*r
)
626 struct line_log_data
*ret
= xmalloc(sizeof(*ret
));
629 line_log_data_init(ret
);
630 range_set_copy(&ret
->ranges
, &r
->ranges
);
632 ret
->path
= xstrdup(r
->path
);
637 static struct line_log_data
*
638 line_log_data_copy(struct line_log_data
*r
)
640 struct line_log_data
*ret
= NULL
;
641 struct line_log_data
*tmp
= NULL
, *prev
= NULL
;
644 ret
= tmp
= prev
= line_log_data_copy_one(r
);
647 tmp
= line_log_data_copy_one(r
);
656 /* merge two range sets across files */
657 static struct line_log_data
*line_log_data_merge(struct line_log_data
*a
,
658 struct line_log_data
*b
)
660 struct line_log_data
*head
= NULL
, **pp
= &head
;
663 struct line_log_data
*src
;
664 struct line_log_data
*src2
= NULL
;
665 struct line_log_data
*d
;
672 cmp
= strcmp(a
->path
, b
->path
);
676 } else if (cmp
== 0) {
685 d
= xmalloc(sizeof(struct line_log_data
));
686 line_log_data_init(d
);
687 d
->path
= xstrdup(src
->path
);
691 range_set_union(&d
->ranges
, &src
->ranges
, &src2
->ranges
);
693 range_set_copy(&d
->ranges
, &src
->ranges
);
699 static void add_line_range(struct rev_info
*revs
, struct commit
*commit
,
700 struct line_log_data
*range
)
702 struct line_log_data
*old
= NULL
;
703 struct line_log_data
*new = NULL
;
705 old
= lookup_decoration(&revs
->line_log_data
, &commit
->object
);
707 new = line_log_data_merge(old
, range
);
708 free_line_log_data(old
);
710 new = line_log_data_copy(range
);
713 add_decoration(&revs
->line_log_data
, &commit
->object
, new);
716 static void clear_commit_line_range(struct rev_info
*revs
, struct commit
*commit
)
718 struct line_log_data
*r
;
719 r
= lookup_decoration(&revs
->line_log_data
, &commit
->object
);
722 free_line_log_data(r
);
723 add_decoration(&revs
->line_log_data
, &commit
->object
, NULL
);
726 static struct line_log_data
*lookup_line_range(struct rev_info
*revs
,
727 struct commit
*commit
)
729 struct line_log_data
*ret
= NULL
;
730 struct line_log_data
*d
;
732 ret
= lookup_decoration(&revs
->line_log_data
, &commit
->object
);
734 for (d
= ret
; d
; d
= d
->next
)
735 range_set_check_invariants(&d
->ranges
);
740 void line_log_init(struct rev_info
*rev
, const char *prefix
, struct string_list
*args
)
742 struct commit
*commit
= NULL
;
743 struct line_log_data
*range
;
745 commit
= check_single_commit(rev
);
746 range
= parse_lines(commit
, prefix
, args
);
747 add_line_range(rev
, commit
, range
);
749 if (!rev
->diffopt
.detect_rename
) {
750 struct line_log_data
*r
;
751 struct argv_array array
= ARGV_ARRAY_INIT
;
754 for (r
= range
; r
; r
= r
->next
)
755 argv_array_push(&array
, r
->path
);
756 paths
= argv_array_detach(&array
);
758 parse_pathspec(&rev
->diffopt
.pathspec
, 0,
759 PATHSPEC_PREFER_FULL
, "", paths
);
760 /* strings are now owned by pathspec */
765 static void move_diff_queue(struct diff_queue_struct
*dst
,
766 struct diff_queue_struct
*src
)
769 memcpy(dst
, src
, sizeof(struct diff_queue_struct
));
770 DIFF_QUEUE_CLEAR(src
);
773 static void filter_diffs_for_paths(struct line_log_data
*range
, int keep_deletions
)
776 struct diff_queue_struct outq
;
777 DIFF_QUEUE_CLEAR(&outq
);
779 for (i
= 0; i
< diff_queued_diff
.nr
; i
++) {
780 struct diff_filepair
*p
= diff_queued_diff
.queue
[i
];
781 struct line_log_data
*rg
= NULL
;
783 if (!DIFF_FILE_VALID(p
->two
)) {
787 diff_free_filepair(p
);
790 for (rg
= range
; rg
; rg
= rg
->next
) {
791 if (!strcmp(rg
->path
, p
->two
->path
))
797 diff_free_filepair(p
);
799 free(diff_queued_diff
.queue
);
800 diff_queued_diff
= outq
;
803 static inline int diff_might_be_rename(void)
806 for (i
= 0; i
< diff_queued_diff
.nr
; i
++)
807 if (!DIFF_FILE_VALID(diff_queued_diff
.queue
[i
]->one
)) {
808 /* fprintf(stderr, "diff_might_be_rename found creation of: %s\n", */
809 /* diff_queued_diff.queue[i]->two->path); */
815 static void queue_diffs(struct line_log_data
*range
,
816 struct diff_options
*opt
,
817 struct diff_queue_struct
*queue
,
818 struct commit
*commit
, struct commit
*parent
)
822 DIFF_QUEUE_CLEAR(&diff_queued_diff
);
823 diff_tree_sha1(parent
? parent
->tree
->object
.oid
.hash
: NULL
,
824 commit
->tree
->object
.oid
.hash
, "", opt
);
825 if (opt
->detect_rename
) {
826 filter_diffs_for_paths(range
, 1);
827 if (diff_might_be_rename())
829 filter_diffs_for_paths(range
, 0);
831 move_diff_queue(queue
, &diff_queued_diff
);
834 static char *get_nth_line(long line
, unsigned long *ends
, void *data
)
839 return (char *)data
+ ends
[line
] + 1;
842 static void print_line(const char *prefix
, char first
,
843 long line
, unsigned long *ends
, void *data
,
844 const char *color
, const char *reset
)
846 char *begin
= get_nth_line(line
, ends
, data
);
847 char *end
= get_nth_line(line
+1, ends
, data
);
850 if (end
> begin
&& end
[-1] == '\n') {
855 fputs(prefix
, stdout
);
856 fputs(color
, stdout
);
858 fwrite(begin
, 1, end
-begin
, stdout
);
859 fputs(reset
, stdout
);
862 fputs("\\ No newline at end of file\n", stdout
);
865 static char *output_prefix(struct diff_options
*opt
)
869 if (opt
->output_prefix
) {
870 struct strbuf
*sb
= opt
->output_prefix(opt
, opt
->output_prefix_data
);
877 static void dump_diff_hacky_one(struct rev_info
*rev
, struct line_log_data
*range
)
880 long p_lines
, t_lines
;
881 unsigned long *p_ends
= NULL
, *t_ends
= NULL
;
882 struct diff_filepair
*pair
= range
->pair
;
883 struct diff_ranges
*diff
= &range
->diff
;
885 struct diff_options
*opt
= &rev
->diffopt
;
886 char *prefix
= output_prefix(opt
);
887 const char *c_reset
= diff_get_color(opt
->use_color
, DIFF_RESET
);
888 const char *c_frag
= diff_get_color(opt
->use_color
, DIFF_FRAGINFO
);
889 const char *c_meta
= diff_get_color(opt
->use_color
, DIFF_METAINFO
);
890 const char *c_old
= diff_get_color(opt
->use_color
, DIFF_FILE_OLD
);
891 const char *c_new
= diff_get_color(opt
->use_color
, DIFF_FILE_NEW
);
892 const char *c_context
= diff_get_color(opt
->use_color
, DIFF_CONTEXT
);
897 if (pair
->one
->sha1_valid
)
898 fill_line_ends(pair
->one
, &p_lines
, &p_ends
);
899 fill_line_ends(pair
->two
, &t_lines
, &t_ends
);
901 printf("%s%sdiff --git a/%s b/%s%s\n", prefix
, c_meta
, pair
->one
->path
, pair
->two
->path
, c_reset
);
902 printf("%s%s--- %s%s%s\n", prefix
, c_meta
,
903 pair
->one
->sha1_valid
? "a/" : "",
904 pair
->one
->sha1_valid
? pair
->one
->path
: "/dev/null",
906 printf("%s%s+++ b/%s%s\n", prefix
, c_meta
, pair
->two
->path
, c_reset
);
907 for (i
= 0; i
< range
->ranges
.nr
; i
++) {
909 long t_start
= range
->ranges
.ranges
[i
].start
;
910 long t_end
= range
->ranges
.ranges
[i
].end
;
911 long t_cur
= t_start
;
914 while (j
< diff
->target
.nr
&& diff
->target
.ranges
[j
].end
< t_start
)
916 if (j
== diff
->target
.nr
|| diff
->target
.ranges
[j
].start
> t_end
)
919 /* Scan ahead to determine the last diff that falls in this range */
921 while (j_last
< diff
->target
.nr
&& diff
->target
.ranges
[j_last
].start
< t_end
)
927 * Compute parent hunk headers: we know that the diff
928 * has the correct line numbers (but not all hunks).
929 * So it suffices to shift the start/end according to
930 * the line numbers of the first/last hunk(s) that
931 * fall in this range.
933 if (t_start
< diff
->target
.ranges
[j
].start
)
934 p_start
= diff
->parent
.ranges
[j
].start
- (diff
->target
.ranges
[j
].start
-t_start
);
936 p_start
= diff
->parent
.ranges
[j
].start
;
937 if (t_end
> diff
->target
.ranges
[j_last
].end
)
938 p_end
= diff
->parent
.ranges
[j_last
].end
+ (t_end
-diff
->target
.ranges
[j_last
].end
);
940 p_end
= diff
->parent
.ranges
[j_last
].end
;
942 if (!p_start
&& !p_end
) {
947 /* Now output a diff hunk for this range */
948 printf("%s%s@@ -%ld,%ld +%ld,%ld @@%s\n",
950 p_start
+1, p_end
-p_start
, t_start
+1, t_end
-t_start
,
952 while (j
< diff
->target
.nr
&& diff
->target
.ranges
[j
].start
< t_end
) {
954 for (; t_cur
< diff
->target
.ranges
[j
].start
; t_cur
++)
955 print_line(prefix
, ' ', t_cur
, t_ends
, pair
->two
->data
,
957 for (k
= diff
->parent
.ranges
[j
].start
; k
< diff
->parent
.ranges
[j
].end
; k
++)
958 print_line(prefix
, '-', k
, p_ends
, pair
->one
->data
,
960 for (; t_cur
< diff
->target
.ranges
[j
].end
&& t_cur
< t_end
; t_cur
++)
961 print_line(prefix
, '+', t_cur
, t_ends
, pair
->two
->data
,
965 for (; t_cur
< t_end
; t_cur
++)
966 print_line(prefix
, ' ', t_cur
, t_ends
, pair
->two
->data
,
975 * NEEDSWORK: manually building a diff here is not the Right
976 * Thing(tm). log -L should be built into the diff pipeline.
978 static void dump_diff_hacky(struct rev_info
*rev
, struct line_log_data
*range
)
980 puts(output_prefix(&rev
->diffopt
));
982 dump_diff_hacky_one(rev
, range
);
988 * Unlike most other functions, this destructively operates on
991 static int process_diff_filepair(struct rev_info
*rev
,
992 struct diff_filepair
*pair
,
993 struct line_log_data
*range
,
994 struct diff_ranges
**diff_out
)
996 struct line_log_data
*rg
= range
;
997 struct range_set tmp
;
998 struct diff_ranges diff
;
999 mmfile_t file_parent
, file_target
;
1001 assert(pair
->two
->path
);
1004 if (!strcmp(rg
->path
, pair
->two
->path
))
1011 if (rg
->ranges
.nr
== 0)
1014 assert(pair
->two
->sha1_valid
);
1015 diff_populate_filespec(pair
->two
, 0);
1016 file_target
.ptr
= pair
->two
->data
;
1017 file_target
.size
= pair
->two
->size
;
1019 if (pair
->one
->sha1_valid
) {
1020 diff_populate_filespec(pair
->one
, 0);
1021 file_parent
.ptr
= pair
->one
->data
;
1022 file_parent
.size
= pair
->one
->size
;
1024 file_parent
.ptr
= "";
1025 file_parent
.size
= 0;
1028 diff_ranges_init(&diff
);
1029 if (collect_diff(&file_parent
, &file_target
, &diff
))
1030 die("unable to generate diff for %s", pair
->one
->path
);
1032 /* NEEDSWORK should apply some heuristics to prevent mismatches */
1034 rg
->path
= xstrdup(pair
->one
->path
);
1036 range_set_init(&tmp
, 0);
1037 range_set_map_across_diff(&tmp
, &rg
->ranges
, &diff
, diff_out
);
1038 range_set_release(&rg
->ranges
);
1039 range_set_move(&rg
->ranges
, &tmp
);
1041 diff_ranges_release(&diff
);
1043 return ((*diff_out
)->parent
.nr
> 0);
1046 static struct diff_filepair
*diff_filepair_dup(struct diff_filepair
*pair
)
1048 struct diff_filepair
*new = xmalloc(sizeof(struct diff_filepair
));
1049 new->one
= pair
->one
;
1050 new->two
= pair
->two
;
1056 static void free_diffqueues(int n
, struct diff_queue_struct
*dq
)
1059 for (i
= 0; i
< n
; i
++)
1060 for (j
= 0; j
< dq
[i
].nr
; j
++)
1061 diff_free_filepair(dq
[i
].queue
[j
]);
1065 static int process_all_files(struct line_log_data
**range_out
,
1066 struct rev_info
*rev
,
1067 struct diff_queue_struct
*queue
,
1068 struct line_log_data
*range
)
1072 *range_out
= line_log_data_copy(range
);
1074 for (i
= 0; i
< queue
->nr
; i
++) {
1075 struct diff_ranges
*pairdiff
= NULL
;
1076 struct diff_filepair
*pair
= queue
->queue
[i
];
1077 if (process_diff_filepair(rev
, pair
, *range_out
, &pairdiff
)) {
1079 * Store away the diff for later output. We
1080 * tuck it in the ranges we got as _input_,
1081 * since that's the commit that caused the
1084 * NEEDSWORK not enough when we get around to
1085 * doing something interesting with merges;
1086 * currently each invocation on a merge parent
1087 * trashes the previous one's diff.
1089 * NEEDSWORK tramples over data structures not owned here
1091 struct line_log_data
*rg
= range
;
1093 while (rg
&& strcmp(rg
->path
, pair
->two
->path
))
1096 rg
->pair
= diff_filepair_dup(queue
->queue
[i
]);
1097 memcpy(&rg
->diff
, pairdiff
, sizeof(struct diff_ranges
));
1105 int line_log_print(struct rev_info
*rev
, struct commit
*commit
)
1107 struct line_log_data
*range
= lookup_line_range(rev
, commit
);
1110 dump_diff_hacky(rev
, range
);
1114 static int process_ranges_ordinary_commit(struct rev_info
*rev
, struct commit
*commit
,
1115 struct line_log_data
*range
)
1117 struct commit
*parent
= NULL
;
1118 struct diff_queue_struct queue
;
1119 struct line_log_data
*parent_range
;
1122 if (commit
->parents
)
1123 parent
= commit
->parents
->item
;
1125 queue_diffs(range
, &rev
->diffopt
, &queue
, commit
, parent
);
1126 changed
= process_all_files(&parent_range
, rev
, &queue
, range
);
1128 add_line_range(rev
, parent
, parent_range
);
1132 static int process_ranges_merge_commit(struct rev_info
*rev
, struct commit
*commit
,
1133 struct line_log_data
*range
)
1135 struct diff_queue_struct
*diffqueues
;
1136 struct line_log_data
**cand
;
1137 struct commit
**parents
;
1138 struct commit_list
*p
;
1140 int nparents
= commit_list_count(commit
->parents
);
1142 if (nparents
> 1 && rev
->first_parent_only
)
1145 diffqueues
= xmalloc(nparents
* sizeof(*diffqueues
));
1146 cand
= xmalloc(nparents
* sizeof(*cand
));
1147 parents
= xmalloc(nparents
* sizeof(*parents
));
1149 p
= commit
->parents
;
1150 for (i
= 0; i
< nparents
; i
++) {
1151 parents
[i
] = p
->item
;
1153 queue_diffs(range
, &rev
->diffopt
, &diffqueues
[i
], commit
, parents
[i
]);
1156 for (i
= 0; i
< nparents
; i
++) {
1159 changed
= process_all_files(&cand
[i
], rev
, &diffqueues
[i
], range
);
1162 * This parent can take all the blame, so we
1163 * don't follow any other path in history
1165 add_line_range(rev
, parents
[i
], cand
[i
]);
1166 clear_commit_line_range(rev
, commit
);
1167 commit_list_append(parents
[i
], &commit
->parents
);
1170 free_diffqueues(nparents
, diffqueues
);
1171 /* NEEDSWORK leaking like a sieve */
1177 * No single parent took the blame. We add the candidates
1178 * from the above loop to the parents.
1180 for (i
= 0; i
< nparents
; i
++) {
1181 add_line_range(rev
, parents
[i
], cand
[i
]);
1184 clear_commit_line_range(rev
, commit
);
1187 free_diffqueues(nparents
, diffqueues
);
1190 /* NEEDSWORK evil merge detection stuff */
1191 /* NEEDSWORK leaking like a sieve */
1194 static int process_ranges_arbitrary_commit(struct rev_info
*rev
, struct commit
*commit
)
1196 struct line_log_data
*range
= lookup_line_range(rev
, commit
);
1200 if (!commit
->parents
|| !commit
->parents
->next
)
1201 changed
= process_ranges_ordinary_commit(rev
, commit
, range
);
1203 changed
= process_ranges_merge_commit(rev
, commit
, range
);
1207 commit
->object
.flags
|= TREESAME
;
1212 static enum rewrite_result
line_log_rewrite_one(struct rev_info
*rev
, struct commit
**pp
)
1215 struct commit
*p
= *pp
;
1216 if (p
->parents
&& p
->parents
->next
)
1217 return rewrite_one_ok
;
1218 if (p
->object
.flags
& UNINTERESTING
)
1219 return rewrite_one_ok
;
1220 if (!(p
->object
.flags
& TREESAME
))
1221 return rewrite_one_ok
;
1223 return rewrite_one_noparents
;
1224 *pp
= p
->parents
->item
;
1228 int line_log_filter(struct rev_info
*rev
)
1230 struct commit
*commit
;
1231 struct commit_list
*list
= rev
->commits
;
1232 struct commit_list
*out
= NULL
, **pp
= &out
;
1235 struct commit_list
*to_free
= NULL
;
1236 commit
= list
->item
;
1237 if (process_ranges_arbitrary_commit(rev
, commit
)) {
1247 for (list
= out
; list
; list
= list
->next
)
1248 rewrite_parents(rev
, list
->item
, line_log_rewrite_one
);