Blame

Date:
Message:
allow diff API users to atomize files separately This is a breaking API change (not that we care about that at this point). This can avoid redundant work spent on atomizing a file multiple times. There are use cases where one particular file must be compared to other files over and over again, such as when blaming file history. The old API gave access to both versions of the file to the atomizer just in case a future atomizer implementation needs this. This can still be achieved by passing a second file via the atomizer's private data pointer.
Actions:
History | Blob | Raw File
  1 b7ba71f0 2020-10-07 stsp /* Produce ed(1) script output from a diff_result. */

  2 b7ba71f0 2020-10-07 stsp /*

  3 b7ba71f0 2020-10-07 stsp  * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>

  4 b7ba71f0 2020-10-07 stsp  * Copyright (c) 2020 Stefan Sperling <stsp@openbsd.org>

  5 b7ba71f0 2020-10-07 stsp  *

  6 b7ba71f0 2020-10-07 stsp  * Permission to use, copy, modify, and distribute this software for any

  7 b7ba71f0 2020-10-07 stsp  * purpose with or without fee is hereby granted, provided that the above

  8 b7ba71f0 2020-10-07 stsp  * copyright notice and this permission notice appear in all copies.

  9 b7ba71f0 2020-10-07 stsp  *

 10 b7ba71f0 2020-10-07 stsp  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 11 b7ba71f0 2020-10-07 stsp  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 12 b7ba71f0 2020-10-07 stsp  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 13 b7ba71f0 2020-10-07 stsp  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 14 b7ba71f0 2020-10-07 stsp  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 15 b7ba71f0 2020-10-07 stsp  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 16 b7ba71f0 2020-10-07 stsp  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 17 b7ba71f0 2020-10-07 stsp  */

 18 b7ba71f0 2020-10-07 stsp 

 19 b7ba71f0 2020-10-07 stsp #include <errno.h>

 20 b7ba71f0 2020-10-07 stsp #include <stdio.h>

 21 b7ba71f0 2020-10-07 stsp #include <stdlib.h>

 22 b7ba71f0 2020-10-07 stsp #include <stdbool.h>

 23 b7ba71f0 2020-10-07 stsp 

 24 b7ba71f0 2020-10-07 stsp #include <arraylist.h>

 25 b7ba71f0 2020-10-07 stsp #include <diff_main.h>

 26 b7ba71f0 2020-10-07 stsp #include <diff_output.h>

 27 b7ba71f0 2020-10-07 stsp 

 28 b7ba71f0 2020-10-07 stsp #include "diff_internal.h"

 29 b7ba71f0 2020-10-07 stsp 

 30 b7ba71f0 2020-10-07 stsp static int

 31 b7ba71f0 2020-10-07 stsp output_edscript_chunk(struct diff_output_info *outinfo,

 32 b7ba71f0 2020-10-07 stsp     FILE *dest, const struct diff_input_info *info,

 33 b7ba71f0 2020-10-07 stsp     const struct diff_result *result,

 34 26595c7d 2020-10-15 stsp     struct diff_chunk_context *cc)

 35 b7ba71f0 2020-10-07 stsp {

 36 b7ba71f0 2020-10-07 stsp 	off_t outoff = 0, *offp;

 37 b7ba71f0 2020-10-07 stsp 	int left_start, left_len, right_start, right_len;

 38 b7ba71f0 2020-10-07 stsp 	int rc;

 39 b7ba71f0 2020-10-07 stsp 

 40 b7ba71f0 2020-10-07 stsp 	left_len = cc->left.end - cc->left.start;

 41 b7ba71f0 2020-10-07 stsp 	if (left_len < 0)

 42 b7ba71f0 2020-10-07 stsp 		return EINVAL;

 43 c16dde50 2020-10-22 stsp 	else if (result->left->atoms.len == 0)

 44 ede9a86a 2020-10-07 stsp 		left_start = 0;

 45 b7ba71f0 2020-10-07 stsp 	else if (left_len == 0 && cc->left.start > 0)

 46 b7ba71f0 2020-10-07 stsp 		left_start = cc->left.start;

 47 b7ba71f0 2020-10-07 stsp 	else

 48 b7ba71f0 2020-10-07 stsp 		left_start = cc->left.start + 1;

 49 b7ba71f0 2020-10-07 stsp 

 50 b7ba71f0 2020-10-07 stsp 	right_len = cc->right.end - cc->right.start;

 51 b7ba71f0 2020-10-07 stsp 	if (right_len < 0)

 52 b7ba71f0 2020-10-07 stsp 		return EINVAL;

 53 c16dde50 2020-10-22 stsp 	else if (result->right->atoms.len == 0)

 54 ede9a86a 2020-10-07 stsp 		right_start = 0;

 55 b7ba71f0 2020-10-07 stsp 	else if (right_len == 0 && cc->right.start > 0)

 56 b7ba71f0 2020-10-07 stsp 		right_start = cc->right.start;

 57 b7ba71f0 2020-10-07 stsp 	else

 58 b7ba71f0 2020-10-07 stsp 		right_start = cc->right.start + 1;

 59 b7ba71f0 2020-10-07 stsp 

 60 26595c7d 2020-10-15 stsp 	if (left_len == 0) {

 61 26595c7d 2020-10-15 stsp 		/* addition */

 62 26595c7d 2020-10-15 stsp 		if (right_len == 1) {

 63 26595c7d 2020-10-15 stsp 			rc = fprintf(dest, "%da%d\n", left_start, right_start);

 64 26595c7d 2020-10-15 stsp 		} else {

 65 26595c7d 2020-10-15 stsp 			rc = fprintf(dest, "%da%d,%d\n", left_start,

 66 26595c7d 2020-10-15 stsp 			    right_start, cc->right.end);

 67 26595c7d 2020-10-15 stsp 		}

 68 26595c7d 2020-10-15 stsp 	} else if (right_len == 0) {

 69 26595c7d 2020-10-15 stsp 		/* deletion */

 70 b7ba71f0 2020-10-07 stsp 		if (left_len == 1) {

 71 26595c7d 2020-10-15 stsp 			rc = fprintf(dest, "%dd%d\n", left_start,

 72 26595c7d 2020-10-15 stsp 			    right_start);

 73 b7ba71f0 2020-10-07 stsp 		} else {

 74 b7ba71f0 2020-10-07 stsp 			rc = fprintf(dest, "%d,%dd%d\n", left_start,

 75 b7ba71f0 2020-10-07 stsp 			    cc->left.end, right_start);

 76 b7ba71f0 2020-10-07 stsp 		}

 77 26595c7d 2020-10-15 stsp 	} else {

 78 26595c7d 2020-10-15 stsp 		/* change */

 79 26595c7d 2020-10-15 stsp 		if (left_len == 1 && right_len == 1) {

 80 26595c7d 2020-10-15 stsp 			rc = fprintf(dest, "%dc%d\n", left_start, right_start);

 81 26595c7d 2020-10-15 stsp 		} else if (left_len == 1) {

 82 26595c7d 2020-10-15 stsp 			rc = fprintf(dest, "%dc%d,%d\n", left_start,

 83 b7ba71f0 2020-10-07 stsp 			    right_start, cc->right.end);

 84 26595c7d 2020-10-15 stsp 		} else if (right_len == 1) {

 85 26595c7d 2020-10-15 stsp 			rc = fprintf(dest, "%d,%dc%d\n", left_start,

 86 26595c7d 2020-10-15 stsp 			    cc->left.end, right_start);

 87 26595c7d 2020-10-15 stsp 		} else {

 88 26595c7d 2020-10-15 stsp 			rc = fprintf(dest, "%d,%dc%d,%d\n", left_start,

 89 26595c7d 2020-10-15 stsp 			    cc->left.end, right_start, cc->right.end);

 90 b7ba71f0 2020-10-07 stsp 		}

 91 26595c7d 2020-10-15 stsp 	}

 92 b7ba71f0 2020-10-07 stsp 	if (rc < 0)

 93 b7ba71f0 2020-10-07 stsp 		return errno;

 94 b7ba71f0 2020-10-07 stsp 	if (outinfo) {

 95 b7ba71f0 2020-10-07 stsp 		ARRAYLIST_ADD(offp, outinfo->line_offsets);

 96 b7ba71f0 2020-10-07 stsp 		if (offp == NULL)

 97 b7ba71f0 2020-10-07 stsp 			return ENOMEM;

 98 b7ba71f0 2020-10-07 stsp 		outoff += rc;

 99 b7ba71f0 2020-10-07 stsp 		*offp = outoff;

100 b7ba71f0 2020-10-07 stsp 	}

101 b7ba71f0 2020-10-07 stsp 

102 b7ba71f0 2020-10-07 stsp 	return DIFF_RC_OK;

103 b7ba71f0 2020-10-07 stsp }

104 b7ba71f0 2020-10-07 stsp 

105 b7ba71f0 2020-10-07 stsp int

106 b7ba71f0 2020-10-07 stsp diff_output_edscript(struct diff_output_info **output_info,

107 b7ba71f0 2020-10-07 stsp     FILE *dest, const struct diff_input_info *info,

108 b7ba71f0 2020-10-07 stsp     const struct diff_result *result)

109 b7ba71f0 2020-10-07 stsp {

110 b7ba71f0 2020-10-07 stsp 	struct diff_output_info *outinfo = NULL;

111 26595c7d 2020-10-15 stsp 	struct diff_chunk_context cc = {};

112 b7ba71f0 2020-10-07 stsp 	int i, rc;

113 b7ba71f0 2020-10-07 stsp 

114 b7ba71f0 2020-10-07 stsp 	if (!result)

115 b7ba71f0 2020-10-07 stsp 		return EINVAL;

116 b7ba71f0 2020-10-07 stsp 	if (result->rc != DIFF_RC_OK)

117 b7ba71f0 2020-10-07 stsp 		return result->rc;

118 b7ba71f0 2020-10-07 stsp 

119 b7ba71f0 2020-10-07 stsp 	if (output_info) {

120 b7ba71f0 2020-10-07 stsp 		*output_info = diff_output_info_alloc();

121 b7ba71f0 2020-10-07 stsp 		if (*output_info == NULL)

122 b7ba71f0 2020-10-07 stsp 			return ENOMEM;

123 b7ba71f0 2020-10-07 stsp 		outinfo = *output_info;

124 b7ba71f0 2020-10-07 stsp 	}

125 b7ba71f0 2020-10-07 stsp 

126 b7ba71f0 2020-10-07 stsp 	for (i = 0; i < result->chunks.len; i++) {

127 b7ba71f0 2020-10-07 stsp 		struct diff_chunk *chunk = &result->chunks.head[i];

128 b7ba71f0 2020-10-07 stsp 		enum diff_chunk_type t = diff_chunk_type(chunk);

129 26595c7d 2020-10-15 stsp 		struct diff_chunk_context next;

130 b7ba71f0 2020-10-07 stsp 

131 b7ba71f0 2020-10-07 stsp 		if (t != CHUNK_MINUS && t != CHUNK_PLUS)

132 b7ba71f0 2020-10-07 stsp 			continue;

133 b7ba71f0 2020-10-07 stsp 

134 cbf93b70 2020-10-16 stsp 		if (diff_chunk_context_empty(&cc)) {

135 26595c7d 2020-10-15 stsp 			/* Note down the start point, any number of subsequent

136 26595c7d 2020-10-15 stsp 			 * chunks may be joined up to this chunk by being

137 26595c7d 2020-10-15 stsp 			 * directly adjacent. */

138 26595c7d 2020-10-15 stsp 			diff_chunk_context_get(&cc, result, i, 0);

139 26595c7d 2020-10-15 stsp 			continue;

140 26595c7d 2020-10-15 stsp 		}

141 b7ba71f0 2020-10-07 stsp 

142 26595c7d 2020-10-15 stsp 		/* There already is a previous chunk noted down for being

143 26595c7d 2020-10-15 stsp 		 * printed. Does it join up with this one? */

144 26595c7d 2020-10-15 stsp 		diff_chunk_context_get(&next, result, i, 0);

145 26595c7d 2020-10-15 stsp 

146 26595c7d 2020-10-15 stsp 		if (diff_chunk_contexts_touch(&cc, &next)) {

147 26595c7d 2020-10-15 stsp 			/* This next context touches or overlaps the previous

148 26595c7d 2020-10-15 stsp 			 * one, join. */

149 26595c7d 2020-10-15 stsp 			diff_chunk_contexts_merge(&cc, &next);

150 b7ba71f0 2020-10-07 stsp 			continue;

151 26595c7d 2020-10-15 stsp 		}

152 b7ba71f0 2020-10-07 stsp 

153 26595c7d 2020-10-15 stsp 		rc = output_edscript_chunk(outinfo, dest, info, result, &cc);

154 b7ba71f0 2020-10-07 stsp 		if (rc != DIFF_RC_OK)

155 b7ba71f0 2020-10-07 stsp 			return rc;

156 26595c7d 2020-10-15 stsp 		cc = next;

157 b7ba71f0 2020-10-07 stsp 	}

158 b7ba71f0 2020-10-07 stsp 

159 cbf93b70 2020-10-16 stsp 	if (!diff_chunk_context_empty(&cc))

160 26595c7d 2020-10-15 stsp 		return output_edscript_chunk(outinfo, dest, info, result, &cc);

161 b7ba71f0 2020-10-07 stsp 	return DIFF_RC_OK;

162 b7ba71f0 2020-10-07 stsp }