1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
/* diff3.c -- test driver for 3-way text merges
*
* ====================================================================
* 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.
* ====================================================================
*/
#include <apr.h>
#include <apr_general.h>
#include <apr_file_io.h>
#include "svn_pools.h"
#include "svn_diff.h"
#include "svn_io.h"
static svn_error_t *
do_diff3(svn_stream_t *ostream,
const char *original, const char *modified, const char *latest,
svn_boolean_t *has_changes,
apr_pool_t *pool)
{
svn_diff_t *diff;
SVN_ERR(svn_diff_file_diff3_2(&diff, original, modified, latest,
svn_diff_file_options_create(pool), pool));
*has_changes = svn_diff_contains_diffs(diff);
SVN_ERR(svn_diff_file_output_merge2(ostream, diff,
original, modified, latest,
NULL, NULL, NULL, NULL,
svn_diff_conflict_display_modified_latest,
pool));
return NULL;
}
int main(int argc, char *argv[])
{
apr_pool_t *pool;
svn_stream_t *ostream;
int rc;
svn_error_t *svn_err;
apr_initialize();
pool = svn_pool_create(NULL);
svn_err = svn_stream_for_stdout(&ostream, pool);
if (svn_err)
{
svn_handle_error2(svn_err, stdout, FALSE, "diff3: ");
rc = 2;
}
else if (argc == 4)
{
svn_boolean_t has_changes;
svn_err = do_diff3(ostream, argv[2], argv[1], argv[3],
&has_changes, pool);
if (svn_err == NULL)
{
rc = has_changes ? 1 : 0;
}
else
{
svn_handle_error2(svn_err, stdout, FALSE, "diff3: ");
rc = 2;
}
}
else
{
svn_error_clear(svn_stream_printf(ostream, pool,
"Usage: %s <mine> <older> <yours>\n",
argv[0]));
rc = 2;
}
apr_terminate();
return rc;
}
|
