Blame

Date:
Message:
merge new diff implementation from the git.gameoftrees.org diff.git repository This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.
Actions:
History | Blob | Raw File
 1 fe621944 2020-11-10 stsp /* Diff output generators and invocation shims. */

 2 fe621944 2020-11-10 stsp /*

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

 4 fe621944 2020-11-10 stsp  *

 5 fe621944 2020-11-10 stsp  * Permission to use, copy, modify, and distribute this software for any

 6 fe621944 2020-11-10 stsp  * purpose with or without fee is hereby granted, provided that the above

 7 fe621944 2020-11-10 stsp  * copyright notice and this permission notice appear in all copies.

 8 fe621944 2020-11-10 stsp  *

 9 fe621944 2020-11-10 stsp  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

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

11 fe621944 2020-11-10 stsp  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

12 fe621944 2020-11-10 stsp  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

13 fe621944 2020-11-10 stsp  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

14 fe621944 2020-11-10 stsp  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

15 fe621944 2020-11-10 stsp  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

16 fe621944 2020-11-10 stsp  */

17 fe621944 2020-11-10 stsp 

18 fe621944 2020-11-10 stsp struct diff_input_info {

19 fe621944 2020-11-10 stsp 	const char *left_path;

20 fe621944 2020-11-10 stsp 	const char *right_path;

21 fe621944 2020-11-10 stsp };

22 fe621944 2020-11-10 stsp 

23 fe621944 2020-11-10 stsp struct diff_output_info {

24 fe621944 2020-11-10 stsp 	/*

25 fe621944 2020-11-10 stsp 	 * Byte offset to each line in the generated output file.

26 fe621944 2020-11-10 stsp 	 * The total number of lines in the file is line_offsets.len - 1.

27 fe621944 2020-11-10 stsp 	 * The last offset in this array corresponds to end-of-file.

28 fe621944 2020-11-10 stsp 	 */

29 fe621944 2020-11-10 stsp 	ARRAYLIST(off_t) line_offsets;

30 fe621944 2020-11-10 stsp };

31 fe621944 2020-11-10 stsp 

32 fe621944 2020-11-10 stsp void diff_output_info_free(struct diff_output_info *output_info);

33 fe621944 2020-11-10 stsp 

34 fe621944 2020-11-10 stsp struct diff_chunk_context {

35 fe621944 2020-11-10 stsp 	struct diff_range chunk;

36 fe621944 2020-11-10 stsp 	struct diff_range left, right;

37 fe621944 2020-11-10 stsp };

38 fe621944 2020-11-10 stsp 

39 fe621944 2020-11-10 stsp int diff_output_plain(struct diff_output_info **output_info, FILE *dest,

40 fe621944 2020-11-10 stsp 			const struct diff_input_info *info,

41 fe621944 2020-11-10 stsp 			const struct diff_result *result);

42 fe621944 2020-11-10 stsp int diff_output_unidiff(struct diff_output_info **output_info,

43 fe621944 2020-11-10 stsp 			FILE *dest, const struct diff_input_info *info,

44 fe621944 2020-11-10 stsp 			const struct diff_result *result,

45 fe621944 2020-11-10 stsp 			unsigned int context_lines);

46 fe621944 2020-11-10 stsp int diff_output_edscript(struct diff_output_info **output_info,

47 fe621944 2020-11-10 stsp 			 FILE *dest, const struct diff_input_info *info,

48 fe621944 2020-11-10 stsp 			 const struct diff_result *result);

49 fe621944 2020-11-10 stsp int diff_chunk_get_left_start(const struct diff_chunk *c,

50 fe621944 2020-11-10 stsp 			      const struct diff_result *r,

51 fe621944 2020-11-10 stsp 			      int context_lines);

52 fe621944 2020-11-10 stsp int diff_chunk_get_left_end(const struct diff_chunk *c,

53 fe621944 2020-11-10 stsp 			    const struct diff_result *r,

54 fe621944 2020-11-10 stsp 			    int context_lines);

55 fe621944 2020-11-10 stsp int diff_chunk_get_right_start(const struct diff_chunk *c,

56 fe621944 2020-11-10 stsp 			       const struct diff_result *r,

57 fe621944 2020-11-10 stsp 			       int context_lines);

58 fe621944 2020-11-10 stsp int diff_chunk_get_right_end(const struct diff_chunk *c,

59 fe621944 2020-11-10 stsp 			     const struct diff_result *r,

60 fe621944 2020-11-10 stsp 			     int context_lines);

61 fe621944 2020-11-10 stsp struct diff_chunk *diff_chunk_get(const struct diff_result *r, int chunk_idx);

62 fe621944 2020-11-10 stsp int diff_chunk_get_left_count(struct diff_chunk *c);

63 fe621944 2020-11-10 stsp int diff_chunk_get_right_count(struct diff_chunk *c);

64 fe621944 2020-11-10 stsp void diff_chunk_context_get(struct diff_chunk_context *cc,

65 fe621944 2020-11-10 stsp 				 const struct diff_result *r,

66 fe621944 2020-11-10 stsp 				 int chunk_idx, int context_lines);

67 fe621944 2020-11-10 stsp void diff_chunk_context_load_change(struct diff_chunk_context *cc,

68 fe621944 2020-11-10 stsp 				    int *nchunks_used,

69 fe621944 2020-11-10 stsp 				    struct diff_result *result,

70 fe621944 2020-11-10 stsp 				    int start_chunk_idx,

71 fe621944 2020-11-10 stsp 				    int context_lines);

72 fe621944 2020-11-10 stsp 

73 fe621944 2020-11-10 stsp struct diff_output_unidiff_state;

74 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *diff_output_unidiff_state_alloc(void);

75 fe621944 2020-11-10 stsp void diff_output_unidiff_state_reset(struct diff_output_unidiff_state *state);

76 fe621944 2020-11-10 stsp void diff_output_unidiff_state_free(struct diff_output_unidiff_state *state);

77 fe621944 2020-11-10 stsp int diff_output_unidiff_chunk(struct diff_output_info **output_info, FILE *dest,

78 fe621944 2020-11-10 stsp 			  struct diff_output_unidiff_state *state,

79 fe621944 2020-11-10 stsp 			  const struct diff_input_info *info,

80 fe621944 2020-11-10 stsp 			  const struct diff_result *result,

81 fe621944 2020-11-10 stsp 			  const struct diff_chunk_context *cc);

82 fe621944 2020-11-10 stsp int diff_output_chunk_left_version(struct diff_output_info **output_info,

83 fe621944 2020-11-10 stsp 			       FILE *dest,

84 fe621944 2020-11-10 stsp 			       const struct diff_input_info *info,

85 fe621944 2020-11-10 stsp 			       const struct diff_result *result,

86 fe621944 2020-11-10 stsp 			       const struct diff_chunk_context *cc);

87 fe621944 2020-11-10 stsp int diff_output_chunk_right_version(struct diff_output_info **output_info,

88 fe621944 2020-11-10 stsp 				FILE *dest,

89 fe621944 2020-11-10 stsp 				const struct diff_input_info *info,

90 fe621944 2020-11-10 stsp 				const struct diff_result *result,

91 fe621944 2020-11-10 stsp 				const struct diff_chunk_context *cc);