You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/01/23 17:30:49 UTC
svn commit: r1437543 - /subversion/trunk/subversion/libsvn_diff/diff_memory.c
Author: rhuijben
Date: Wed Jan 23 16:30:49 2013
New Revision: 1437543
URL: http://svn.apache.org/viewvc?rev=1437543&view=rev
Log:
Update the expected results of the issue #3362 diff test to match the
future output.
The original data before this patch was what the memory diff produced, and
the test failed because it was different than the file based diff.
* subversion/libsvn_diff/diff_memory.c
(two_way_issue_3362_v1,
two_way_issue_3362_v2): Update expected results to make these tests fail
for the right reason.
Modified:
subversion/trunk/subversion/libsvn_diff/diff_memory.c
Modified: subversion/trunk/subversion/libsvn_diff/diff_memory.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff_memory.c?rev=1437543&r1=1437542&r2=1437543&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff_memory.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff_memory.c Wed Jan 23 16:30:49 2013
@@ -27,6 +27,8 @@
#include <apr_want.h>
#include <apr_tables.h>
+#include <assert.h>
+
#include "svn_diff.h"
#include "svn_pools.h"
#include "svn_types.h"
@@ -342,7 +344,8 @@ typedef enum unified_output_e
{
unified_output_context = 0,
unified_output_delete,
- unified_output_insert
+ unified_output_insert,
+ unified_output_skip
} unified_output_e;
/* Baton for generating unified diffs */
@@ -351,7 +354,7 @@ typedef struct unified_output_baton_t
svn_stream_t *output_stream;
const char *header_encoding;
source_tokens_t sources[2]; /* 0 == original; 1 == modified */
- apr_off_t next_token; /* next token in original source */
+ apr_off_t current_token[2]; /* current token per source */
/* Cached markers, in header_encoding,
indexed using unified_output_e */
@@ -382,31 +385,28 @@ static svn_error_t *
output_unified_token_range(output_baton_t *btn,
int tokens,
unified_output_e type,
- apr_off_t first,
- apr_off_t past_last)
+ apr_off_t until)
{
source_tokens_t *source = &btn->sources[tokens];
- apr_off_t idx;
-
- past_last = (past_last > source->tokens->nelts)
- ? source->tokens->nelts : past_last;
- if (tokens == 0)
- /* We get context from the original source, don't expect
- to be asked to output a block which starts before
- what we already have written. */
- first = (first < btn->next_token) ? btn->next_token : first;
+ if (until > source->tokens->nelts)
+ until = source->tokens->nelts;
- if (first >= past_last)
+ if (until <= btn->current_token[tokens])
return SVN_NO_ERROR;
/* Do the loop with prefix and token */
- for (idx = first; idx < past_last; idx++)
+ while (TRUE)
{
- svn_string_t *token
- = APR_ARRAY_IDX(source->tokens, idx, svn_string_t *);
- svn_stringbuf_appendcstr(btn->hunk, btn->prefix_str[type]);
- svn_stringbuf_appendbytes(btn->hunk, token->data, token->len);
+ svn_string_t *token =
+ APR_ARRAY_IDX(source->tokens, btn->current_token[tokens],
+ svn_string_t *);
+
+ if (type != unified_output_skip)
+ {
+ svn_stringbuf_appendcstr(btn->hunk, btn->prefix_str[type]);
+ svn_stringbuf_appendbytes(btn->hunk, token->data, token->len);
+ }
if (type == unified_output_context)
{
@@ -415,11 +415,18 @@ output_unified_token_range(output_baton_
}
else if (type == unified_output_delete)
btn->hunk_length[0]++;
- else
+ else if (type == unified_output_insert)
btn->hunk_length[1]++;
+ /* ### TODO: Add skip processing for -p handling? */
+
+ btn->current_token[tokens]++;
+ if (btn->current_token[tokens] == until)
+ break;
}
- if (past_last == source->tokens->nelts && source->ends_without_eol)
+
+ if (btn->current_token[tokens] == source->tokens->nelts
+ && source->ends_without_eol)
{
const char *out_str;
@@ -429,8 +436,7 @@ output_unified_token_range(output_baton_
svn_stringbuf_appendcstr(btn->hunk, out_str);
}
- if (tokens == 0)
- btn->next_token = past_last;
+
return SVN_NO_ERROR;
}
@@ -445,6 +451,8 @@ output_unified_flush_hunk(output_baton_t
{
apr_off_t target_token;
apr_size_t hunk_len;
+ apr_off_t old_start;
+ apr_off_t new_start;
if (svn_stringbuf_isempty(baton->hunk))
return SVN_NO_ERROR;
@@ -453,24 +461,28 @@ output_unified_flush_hunk(output_baton_t
/* Write the trailing context */
target_token = baton->hunk_start[0] + baton->hunk_length[0]
- + SVN_DIFF__UNIFIED_CONTEXT_SIZE;
+ + SVN_DIFF__UNIFIED_CONTEXT_SIZE;
SVN_ERR(output_unified_token_range(baton, 0 /*original*/,
unified_output_context,
- baton->next_token, target_token));
+ target_token));
if (hunk_delimiter == NULL)
hunk_delimiter = "@@";
- /* Convert our 0-based line numbers into unidiff 1-based numbers */
- if (baton->hunk_length[0] > 0)
- baton->hunk_start[0]++;
- if (baton->hunk_length[1] > 0)
- baton->hunk_start[1]++;
+ old_start = baton->hunk_start[0];
+ new_start = baton->hunk_start[1];
+
+ /* If the file is non-empty, convert the line indexes from
+ zero based to one based */
+ if (baton->hunk_length[0])
+ old_start++;
+ if (baton->hunk_length[1])
+ new_start++;
/* Write the hunk header */
SVN_ERR(svn_diff__unified_write_hunk_header(
baton->output_stream, baton->header_encoding, hunk_delimiter,
- baton->hunk_start[0], baton->hunk_length[0],
- baton->hunk_start[1], baton->hunk_length[1],
+ old_start, baton->hunk_length[0],
+ new_start, baton->hunk_length[1],
NULL /* hunk_extra_context */,
baton->pool));
@@ -478,7 +490,11 @@ output_unified_flush_hunk(output_baton_t
SVN_ERR(svn_stream_write(baton->output_stream,
baton->hunk->data, &hunk_len));
- baton->hunk_length[0] = baton->hunk_length[1] = 0;
+ /* Prepare for the next hunk */
+ baton->hunk_length[0] = 0;
+ baton->hunk_length[1] = 0;
+ baton->hunk_start[0] = 0;
+ baton->hunk_start[1] = 0;
svn_stringbuf_setempty(baton->hunk);
return SVN_NO_ERROR;
@@ -494,38 +510,91 @@ output_unified_diff_modified(void *baton
apr_off_t latest_start,
apr_off_t latest_length)
{
- output_baton_t *btn = baton;
- apr_off_t targ_orig, targ_mod;
+ output_baton_t *output_baton = baton;
+ apr_off_t context_prefix_length;
+ apr_off_t prev_context_end;
+ svn_boolean_t init_hunk = FALSE;
+
+ if (original_start > SVN_DIFF__UNIFIED_CONTEXT_SIZE)
+ context_prefix_length = SVN_DIFF__UNIFIED_CONTEXT_SIZE;
+ else
+ context_prefix_length = original_start;
- targ_orig = original_start - SVN_DIFF__UNIFIED_CONTEXT_SIZE;
- targ_orig = (targ_orig < 0) ? 0 : targ_orig;
- targ_mod = modified_start;
-
- /* If the changed ranges are far enough apart (no overlapping or
- * connecting context), flush the current hunk. */
- if (btn->next_token + SVN_DIFF__UNIFIED_CONTEXT_SIZE < targ_orig)
- SVN_ERR(output_unified_flush_hunk(btn, btn->hunk_delimiter));
- /* Adjust offset if it's not the first hunk. */
- else if (btn->hunk_length[0] != 0)
- targ_orig = btn->next_token;
+ /* Calculate where the previous hunk will end if we would write it now
+ (including the necessary context at the end) */
+ if (output_baton->hunk_length[0] > 0 || output_baton->hunk_length[1] > 0)
+ {
+ prev_context_end = output_baton->hunk_start[0]
+ + output_baton->hunk_length[0]
+ + SVN_DIFF__UNIFIED_CONTEXT_SIZE;
+ }
+ else
+ {
+ prev_context_end = -1;
+
+ if (output_baton->hunk_start[0] == 0
+ && (original_length > 0 || modified_length > 0))
+ init_hunk = TRUE;
+ }
- if (btn->hunk_length[0] == 0
- && btn->hunk_length[1] == 0)
+ /* If the changed range is far enough from the previous range, flush the current
+ hunk. */
+ {
+ apr_off_t new_hunk_start = (original_start - context_prefix_length);
+
+ if (output_baton->current_token[0] < new_hunk_start
+ && prev_context_end <= new_hunk_start)
+ {
+ SVN_ERR(output_unified_flush_hunk(output_baton,
+ output_baton->hunk_delimiter));
+ init_hunk = TRUE;
+ }
+ else if (output_baton->hunk_length[0] > 0
+ || output_baton->hunk_length[1] > 0)
+ {
+ /* We extend the current hunk */
+
+ /* Original: Output the context preceding the changed range */
+ SVN_ERR(output_unified_token_range(output_baton, 0 /* original */,
+ unified_output_context,
+ original_start));
+ }
+ }
+
+ /* Original: Skip lines until we are at the beginning of the context we want
+ to display */
+ SVN_ERR(output_unified_token_range(output_baton, 0 /* original */,
+ unified_output_skip,
+ original_start - context_prefix_length));
+
+ if (init_hunk)
{
- btn->hunk_start[0] = targ_orig;
- btn->hunk_start[1] = targ_mod + targ_orig - original_start;
+ SVN_ERR_ASSERT(output_baton->hunk_length[0] == 0
+ && output_baton->hunk_length[1] == 0);
+
+ output_baton->hunk_start[0] = original_start - context_prefix_length;
+ output_baton->hunk_start[1] = modified_start - context_prefix_length;
}
- SVN_ERR(output_unified_token_range(btn, 0/*original*/,
- unified_output_context,
- targ_orig, original_start));
- SVN_ERR(output_unified_token_range(btn, 0/*original*/,
+ /* Modified: Skip lines until we are at the start of the changed range */
+ SVN_ERR(output_unified_token_range(output_baton, 1 /* modified */,
+ unified_output_skip,
+ modified_start));
+
+ /* Original: Output the context preceding the changed range */
+ SVN_ERR(output_unified_token_range(output_baton, 0 /* original */,
+ unified_output_context,
+ original_start));
+
+ /* Both: Output the changed range */
+ SVN_ERR(output_unified_token_range(output_baton, 0 /* original */,
unified_output_delete,
- original_start,
original_start + original_length));
- return output_unified_token_range(btn, 1/*modified*/, unified_output_insert,
- modified_start,
- modified_start + modified_length);
+ SVN_ERR(output_unified_token_range(output_baton, 1 /* modified */,
+ unified_output_insert,
+ modified_start + modified_length));
+
+ return SVN_NO_ERROR;
}
static const svn_diff_output_fns_t mem_output_unified_vtable =
@@ -656,7 +725,7 @@ typedef struct merge_output_baton_t
/* Tokenized source text */
source_tokens_t sources[3];
- apr_off_t next_token;
+ apr_off_t next_token[3];
/* Markers for marking conflicted sections */
const char *markers[4]; /* 0 = original, 1 = modified,