diff options
Diffstat (limited to 'contrib/subversion/subversion/libsvn_diff/diff.h')
| -rw-r--r-- | contrib/subversion/subversion/libsvn_diff/diff.h | 227 |
1 files changed, 0 insertions, 227 deletions
diff --git a/contrib/subversion/subversion/libsvn_diff/diff.h b/contrib/subversion/subversion/libsvn_diff/diff.h deleted file mode 100644 index 7628e65cc7b5..000000000000 --- a/contrib/subversion/subversion/libsvn_diff/diff.h +++ /dev/null @@ -1,227 +0,0 @@ -/* - * diff.h : private header file - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - */ - -#if !defined(DIFF_H) -#define DIFF_H - -#include <apr.h> -#include <apr_pools.h> -#include <apr_general.h> - -#include "svn_diff.h" -#include "svn_types.h" - -#define SVN_DIFF__UNIFIED_CONTEXT_SIZE 3 - -typedef struct svn_diff__node_t svn_diff__node_t; -typedef struct svn_diff__tree_t svn_diff__tree_t; -typedef struct svn_diff__position_t svn_diff__position_t; -typedef struct svn_diff__lcs_t svn_diff__lcs_t; - -typedef enum svn_diff__type_e -{ - svn_diff__type_common, - svn_diff__type_diff_modified, - svn_diff__type_diff_latest, - svn_diff__type_diff_common, - svn_diff__type_conflict -} svn_diff__type_e; - -struct svn_diff_t { - svn_diff_t *next; - svn_diff__type_e type; - apr_off_t original_start; - apr_off_t original_length; - apr_off_t modified_start; - apr_off_t modified_length; - apr_off_t latest_start; - apr_off_t latest_length; - svn_diff_t *resolved_diff; -}; - -/* Type used for token indices and counts of tokens. Must be signed. */ -typedef long int svn_diff__token_index_t; - -struct svn_diff__position_t -{ - svn_diff__position_t *next; - svn_diff__token_index_t token_index; - apr_off_t offset; -}; - -struct svn_diff__lcs_t -{ - svn_diff__lcs_t *next; - svn_diff__position_t *position[2]; - apr_off_t length; - int refcount; -}; - - -/* State used when normalizing whitespace and EOL styles. */ -typedef enum svn_diff__normalize_state_t -{ - /* Initial state; not in a sequence of whitespace. */ - svn_diff__normalize_state_normal, - /* We're in a sequence of whitespace characters. Only entered if - we ignore whitespace. */ - svn_diff__normalize_state_whitespace, - /* The previous character was CR. */ - svn_diff__normalize_state_cr -} svn_diff__normalize_state_t; - - -/* - * Calculate the Longest Common Subsequence (LCS) between two datasources - * POSITION_LIST1 and POSITION_LIST2, with TOKEN_COUNTS_LIST1 and - * TOKEN_COUNTS_LIST2 the corresponding counts of the different tokens - * (indexed by the 'token_index' of the positions of each position_list). - * - * From the beginning of each list, PREFIX_LINES lines will be assumed to be - * equal and be excluded from the comparison process. Similarly, SUFFIX_LINES - * at the end of both sequences will be skipped. - * - * The resulting lcs structure will be the return value of this function. - * Allocations will be made from POOL. - */ -svn_diff__lcs_t * -svn_diff__lcs(svn_diff__position_t *position_list1, /* pointer to tail (ring) */ - svn_diff__position_t *position_list2, /* pointer to tail (ring) */ - svn_diff__token_index_t *token_counts_list1, /* array of counts */ - svn_diff__token_index_t *token_counts_list2, /* array of counts */ - svn_diff__token_index_t num_tokens, /* length of count arrays */ - apr_off_t prefix_lines, - apr_off_t suffix_lines, - apr_pool_t *pool); - - -/* - * Returns number of tokens in a tree - */ -svn_diff__token_index_t -svn_diff__get_node_count(svn_diff__tree_t *tree); - -/* - * Support functions to build a tree of token positions - */ -void -svn_diff__tree_create(svn_diff__tree_t **tree, apr_pool_t *pool); - - -/* - * Get all tokens from a datasource. Return the - * last item in the (circular) list. - */ -svn_error_t * -svn_diff__get_tokens(svn_diff__position_t **position_list, - svn_diff__tree_t *tree, - void *diff_baton, - const svn_diff_fns2_t *vtable, - svn_diff_datasource_e datasource, - apr_off_t prefix_lines, - apr_pool_t *pool); - -/* - * Returns an array with the counts for the tokens in - * the looped linked list given in loop_start. - * num_tokens equals the highest possible token index +1. - */ -svn_diff__token_index_t* -svn_diff__get_token_counts(svn_diff__position_t *loop_start, - svn_diff__token_index_t num_tokens, - apr_pool_t *pool); - -/* Morph a svn_lcs_t into a svn_diff_t. */ -svn_diff_t * -svn_diff__diff(svn_diff__lcs_t *lcs, - apr_off_t original_start, apr_off_t modified_start, - svn_boolean_t want_common, - apr_pool_t *pool); - -void -svn_diff__resolve_conflict(svn_diff_t *hunk, - svn_diff__position_t **position_list1, - svn_diff__position_t **position_list2, - svn_diff__token_index_t num_tokens, - apr_pool_t *pool); - - -/* Normalize the characters pointed to by the buffer BUF (of length *LENGTHP) - * according to the options *OPTS, starting in the state *STATEP. - * - * Adjust *LENGTHP and *STATEP to be the length of the normalized buffer and - * the final state, respectively. - * Normalized data is written to the memory at *TGT. BUF and TGT may point - * to the same memory area. The memory area pointed to by *TGT should be - * large enough to hold *LENGTHP bytes. - * When on return *TGT is not equal to the value passed in, it points somewhere - * into the memory region designated by BUF and *LENGTHP. - */ -void -svn_diff__normalize_buffer(char **tgt, - apr_off_t *lengthp, - svn_diff__normalize_state_t *statep, - const char *buf, - const svn_diff_file_options_t *opts); - -/* Set *OUT_STR to a newline followed by a "\ No newline at end of file" line. - * - * The text will be encoded into HEADER_ENCODING. - */ -svn_error_t * -svn_diff__unified_append_no_newline_msg(svn_stringbuf_t *stringbuf, - const char *header_encoding, - apr_pool_t *scratch_pool); - -/* Write a unidiff hunk header to OUTPUT_STREAM. - * - * The header will use HUNK_DELIMITER (which should usually be "@@") before - * and after the line-number ranges which are formed from OLD_START, - * OLD_LENGTH, NEW_START and NEW_LENGTH. If HUNK_EXTRA_CONTEXT is not NULL, - * it will be written after the final delimiter, with an intervening space. - * - * The text will be encoded into HEADER_ENCODING. - */ -svn_error_t * -svn_diff__unified_write_hunk_header(svn_stream_t *output_stream, - const char *header_encoding, - const char *hunk_delimiter, - apr_off_t old_start, - apr_off_t old_length, - apr_off_t new_start, - apr_off_t new_length, - const char *hunk_extra_context, - apr_pool_t *scratch_pool); - - -/* Decodes a single line of base85 data in BASE85_DATA of length BASE85_LEN, - to OUTPUT_DATA of length OUTPUT_LEN. - */ -svn_error_t * -svn_diff__base85_decode_line(char *output_data, - apr_ssize_t output_len, - const char *base85_data, - apr_ssize_t base85_len, - apr_pool_t *scratch_pool); - -#endif /* DIFF_H */ |