39 diff_chunk_type(const struct diff_chunk *chunk)  in diff_chunk_type()  argument
41 	if (!chunk->left_count && !chunk->right_count)  in diff_chunk_type()
43 	if (!chunk->solved)  in diff_chunk_type()
45 	if (!chunk->right_count)  in diff_chunk_type()
47 	if (!chunk->left_count)  in diff_chunk_type()
49 	if (chunk->left_count != chunk->right_count)  in diff_chunk_type()
234 			    const struct diff_chunk *chunk)  in diff_state_add_solved_chunk()  argument
242 … to solved chunks; make sure that adjacent chunks of same type are combined, and that a minus chunk  in diff_state_add_solved_chunk()
243 	 * never directly follows a plus chunk. */  in diff_state_add_solved_chunk()
248 	new_t = diff_chunk_type(chunk);  in diff_state_add_solved_chunk()
250 	debug("ADD %s chunk #%u:\n", chunk->solved ? "solved" : "UNSOLVED",  in diff_state_add_solved_chunk()
253 	debug_dump_atoms(&state->left, chunk->left_start, chunk->left_count);  in diff_state_add_solved_chunk()
255 	debug_dump_atoms(&state->right, chunk->right_start, chunk->right_count);  in diff_state_add_solved_chunk()
259 		assert(chunk->left_start  in diff_state_add_solved_chunk()
261 		assert(chunk->right_start  in diff_state_add_solved_chunk()
267 		new_chunk->left_count += chunk->left_count;  in diff_state_add_solved_chunk()
268 		new_chunk->right_count += chunk->right_count;  in diff_state_add_solved_chunk()
269 		debug("  - added chunk touches previous one of same type, joined:\n");  in diff_state_add_solved_chunk()
279 		/* If a minus-chunk follows a plus-chunk, place it above the plus-chunk->  in diff_state_add_solved_chunk()
283 			new_chunk->left_count += chunk->left_count;  in diff_state_add_solved_chunk()
284 			new_chunk->right_count += chunk->right_count;  in diff_state_add_solved_chunk()
286 			debug("  - added minus-chunk follows plus-chunk,"  in diff_state_add_solved_chunk()
287 			      " put before that plus-chunk and joined"  in diff_state_add_solved_chunk()
288 			      " with preceding minus-chunk:\n");  in diff_state_add_solved_chunk()
297 			*new_chunk = *chunk;  in diff_state_add_solved_chunk()
299 			/* The new minus chunk indicates to which position on  in diff_state_add_solved_chunk()
301 			 * any lines on the right. By moving above a plus chunk,  in diff_state_add_solved_chunk()
306 			debug("  - added minus-chunk follows plus-chunk,"  in diff_state_add_solved_chunk()
307 			      " put before that plus-chunk\n");  in diff_state_add_solved_chunk()
322 		*new_chunk = *chunk;  in diff_state_add_solved_chunk()
338 	struct diff_chunk chunk = {  in diff_state_add_chunk()  local
346 	/* An unsolved chunk means store as intermediate result for later  in diff_state_add_chunk()
349 	 * following solved chunk needs to go to intermediate results, so that  in diff_state_add_chunk()
354 		debug("ADD %s chunk to temp result:\n",  in diff_state_add_chunk()
355 		      chunk.solved ? "solved" : "UNSOLVED");  in diff_state_add_chunk()
363 		*new_chunk = chunk;  in diff_state_add_chunk()
367 	return diff_state_add_solved_chunk(state, &chunk);  in diff_state_add_chunk()
445 	/* Add a chunk of equal lines, if any */  in diff_algo_none()
480 	/* Add a chunk of equal lines at the start */  in diff_algo_none()
490 	/* Add a "minus" chunk with all lines from the left. */  in diff_algo_none()
500 	/* Add a "plus" chunk with all lines from the right. */  in diff_algo_none()
510 	/* Add a chunk of equal lines at the end */  in diff_algo_none()
569 		/* c is an unsolved chunk, feed to inner_algo */  in diff_run_algo()