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
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
/**
* @copyright
* ====================================================================
* 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.
* ====================================================================
* @endcopyright
*/
package org.apache.subversion.javahl.util;
import org.apache.subversion.javahl.SVNUtil;
import org.apache.subversion.javahl.ClientException;
import org.apache.subversion.javahl.NativeResources;
import java.io.OutputStream;
/**
* Encapsulates utility functions provided by libsvn_diff.
* @since 1.9
*/
public class DiffLib
{
/**
* Load the required native library.
*/
static
{
NativeResources.loadNativeLibrary();
}
/** @see SVNUtil.fileDiff */
public boolean fileDiff(String originalFile,
String modifiedFile,
SVNUtil.DiffOptions diffOptions,
String originalHeader,
String modifiedHeader,
String headerEncoding,
String relativeToDir,
OutputStream resultStream)
throws ClientException
{
return nativeFileDiff(originalFile, modifiedFile,
// Interpret the diff options
(diffOptions == null
? SVNUtil.DiffOptions.IgnoreSpace.none.ordinal()
: diffOptions.ignoreSpace.ordinal()),
(diffOptions == null ? false
: diffOptions.ignoreEolStyle),
(diffOptions == null ? false
: diffOptions.showCFunction),
(diffOptions == null ? -1
: diffOptions.contextSize),
originalHeader, modifiedHeader, headerEncoding,
relativeToDir, resultStream);
}
private native
boolean nativeFileDiff(String originalFile,
String modifiedFile,
// Interpreted diff options
int ignoreSpace,
boolean ignoreEolStyle,
boolean showCFunction,
int contextSize,
String originalHeader,
String modifiedHeader,
String headerEncoding,
String relativeToDir,
OutputStream resultStream)
throws ClientException;
/** @see SVNUtil.fileMerge */
public boolean fileMerge(String originalFile,
String modifiedFile,
String latestFile,
SVNUtil.DiffOptions diffOptions,
String conflictOriginal,
String conflictModified,
String conflictLatest,
String conflistSeparator,
SVNUtil.ConflictDisplayStyle conflictStyle,
OutputStream resultStream)
throws ClientException
{
return nativeFileMerge(originalFile, modifiedFile, latestFile,
// Interpret the diff options
(diffOptions == null
? SVNUtil.DiffOptions.IgnoreSpace.none.ordinal()
: diffOptions.ignoreSpace.ordinal()),
(diffOptions == null ? false
: diffOptions.ignoreEolStyle),
(diffOptions == null ? false
: diffOptions.showCFunction),
conflictOriginal, conflictModified,
conflictLatest, conflistSeparator,
// Interpret the conflict style
conflictStyle.ordinal(),
resultStream);
}
private native
boolean nativeFileMerge(String originalFile,
String modifiedFile,
String latestFile,
// Interpreted diff options
int ignoreSpace,
boolean ignoreEolStyle,
boolean showCFunction,
String conflictOriginal,
String conflictModified,
String conflictLatest,
String conflistSeparator,
// Interpreted conflict display style
int conflictStyle,
OutputStream resultStream)
throws ClientException;
}
|
