line-log: respect diffopt's configured output file stream
The diff machinery can optionally output to a file stream other than stdout, by overriding diffopt.file. In such a case, the rest of the log tree machinery should also write to that stream. Currently, there is no user of the line level log that wants to redirect output to a file. Therefore, one might argue that it is superfluous to support that now. However, it is better to be consistent now, rather than to face hard-to-debug problems later. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jun 22, 2016 at 17:01 UTC
179795e51171ebf10932b553d7df72819fa4a7b5
1 file changed
+17
-17
line-log.c
+17
-17
@@ -841,7 +841,7 @@ static char *get_nth_line(long line, unsigned long *ends, void *data)
841
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)
844
+ const char *color, const char *reset, FILE *file)
845
{
846
char *begin = get_nth_line(line, ends, data);
847
char *end = get_nth_line(line+1, ends, data);
@@ -852,14 +852,14 @@ static void print_line(const char *prefix, char first,
852
had_nl = 1;
853
}
854
855
- fputs(prefix, stdout);
856
- fputs(color, stdout);
857
- putchar(first);
858
- fwrite(begin, 1, end-begin, stdout);
859
- fputs(reset, stdout);
860
- putchar('\n');
855
+ fputs(prefix, file);
856
+ fputs(color, file);
857
+ putc(first, file);
858
+ fwrite(begin, 1, end-begin, file);
859
+ fputs(reset, file);
860
+ putc('\n', file);
861
if (!had_nl)
862
- fputs("\\ No newline at end of file\n", stdout);
862
+ fputs("\\ No newline at end of file\n", file);
863
}
864
865
static char *output_prefix(struct diff_options *opt)
@@ -898,12 +898,12 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
898
fill_line_ends(pair->one, &p_lines, &p_ends);
899
fill_line_ends(pair->two, &t_lines, &t_ends);
900
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,
901
+ fprintf(opt->file, "%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
902
+ fprintf(opt->file, "%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",
905
c_reset);
906
- printf("%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
906
+ fprintf(opt->file, "%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
907
for (i = 0; i < range->ranges.nr; i++) {
908
long p_start, p_end;
909
long t_start = range->ranges.ranges[i].start;
@@ -945,7 +945,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
945
}
946
947
/* Now output a diff hunk for this range */
948
- printf("%s%s@@ -%ld,%ld +%ld,%ld @@%s\n",
948
+ fprintf(opt->file, "%s%s@@ -%ld,%ld +%ld,%ld @@%s\n",
949
prefix, c_frag,
950
p_start+1, p_end-p_start, t_start+1, t_end-t_start,
951
c_reset);
@@ -953,18 +953,18 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
953
int k;
954
for (; t_cur < diff->target.ranges[j].start; t_cur++)
955
print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
956
- c_context, c_reset);
956
+ c_context, c_reset, opt->file);
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,
959
- c_old, c_reset);
959
+ c_old, c_reset, opt->file);
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,
962
- c_new, c_reset);
962
+ c_new, c_reset, opt->file);
963
j++;
964
}
965
for (; t_cur < t_end; t_cur++)
966
print_line(prefix, ' ', t_cur, t_ends, pair->two->data,
967
- c_context, c_reset);
967
+ c_context, c_reset, opt->file);
968
}
969
970
free(p_ends);
@@ -977,7 +977,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
977
*/
978
static void dump_diff_hacky(struct rev_info *rev, struct line_log_data *range)
979
{
980
- puts(output_prefix(&rev->diffopt));
980
+ fprintf(rev->diffopt.file, "%s\n", output_prefix(&rev->diffopt));
981
while (range) {
982
dump_diff_hacky_one(rev, range);
983
range = range->next;