summaryrefslogtreecommitdiff
path: root/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
blob: f538c63b2ac49611114e19c696efdc7655f3a77b (plain)
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
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
/**
 * @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;

import org.apache.subversion.javahl.types.*;

/**
 * The description of a merge conflict, encountered during
 * merge/update/switch operations.
 */
public class ConflictDescriptor
{
    private String path;

    private Kind conflictKind;

    private NodeKind nodeKind;

    private String propertyName;

    private boolean isBinary;
    private String mimeType;

    private Action action;
    private Reason reason;

    // File paths, present only when the conflict involves the merging
    // of two files descended from a common ancestor, here are the
    // paths of up to four fulltext files that can be used to
    // interactively resolve the conflict.  NOTE: The content of these
    // files will be in repository-normal form (LF line endings and
    // contracted keywords).
    private String basePath;
    private String theirPath;
    private String myPath;
    private String mergedPath;

    /**
     * @see Operation
     */
    private Operation operation;

    /**
     * @see ConflictVersion
     */
    private ConflictVersion srcLeftVersion;

    /**
     * @see ConflictVersion
     */
    private ConflictVersion srcRightVersion;

    /** This constructor should only be called from JNI code. */
    public ConflictDescriptor(String path, Kind conflictKind, NodeKind nodeKind,
                       String propertyName, boolean isBinary, String mimeType,
                       Action action, Reason reason, Operation operation,
                       String basePath, String theirPath,
                       String myPath, String mergedPath,
                       ConflictVersion srcLeft, ConflictVersion srcRight)
    {
        this.path = path;
        this.conflictKind = conflictKind;
        this.nodeKind = nodeKind;
        this.propertyName = propertyName;
        this.isBinary = isBinary;
        this.mimeType = mimeType;
        this.action = action;
        this.reason = reason;
        this.basePath = basePath;
        this.theirPath = theirPath;
        this.myPath = myPath;
        this.mergedPath = mergedPath;
        this.operation = operation;
        this.srcLeftVersion = srcLeft;
        this.srcRightVersion = srcRight;
    }

    public String getPath()
    {
        return path;
    }

    public Kind getKind()
    {
        return conflictKind;
    }

    public NodeKind getNodeKind()
    {
        return nodeKind;
    }

    public String getPropertyName()
    {
        return propertyName;
    }

    public boolean isBinary()
    {
        return isBinary;
    }

    public String getMIMEType()
    {
        return mimeType;
    }

    public Action getAction()
    {
        return action;
    }

    public Reason getReason()
    {
        return reason;
    }

    public String getBasePath()
    {
        return basePath;
    }

    public String getTheirPath()
    {
        return theirPath;
    }

    public String getMyPath()
    {
        return myPath;
    }

    public String getMergedPath()
    {
        return mergedPath;
    }

    public Operation getOperation()
    {
        return operation;
    }

    public ConflictVersion getSrcLeftVersion()
    {
        return srcLeftVersion;
    }

    public ConflictVersion getSrcRightVersion()
    {
        return srcRightVersion;
    }

    /**
     * Rich man's enum for <code>svn_wc_conflict_kind_t</code>.
     */
    public enum Kind
    {
        /** Attempting to change text or props.  */
        text,

        /** Attempting to add object.  */
        property,

        /** Tree conflict.  */
        tree;
    }

    /**
     * Rich man's enum for <code>svn_wc_conflict_action_t</code>.
     */
    public enum Action
    {
        /**
         * Attempting to change text or props.
         */
        edit,

        /**
         * Attempting to add object.
         */
        add,

        /**
         * Attempting to delete object.
         */
        delete,

        /**
         * Attempting to replace object.
         */
        replace;
    }

    /**
     * Rich man's enum for <code>svn_wc_conflict_reason_t</code>.
     */
    public enum Reason
    {
        /**
         * Local edits are already present.
         */
        edited,

        /**
         * Another object is in the way.
         */
        obstructed,

        /**
         * Object is already schedule-delete.
         */
        deleted,

        /**
         * Object is unknown or missing.
         */
        missing,

        /**
         * Object is unversioned.
         */
        unversioned,

        /**
         * Object is already added or schedule-add.
         * @since 1.6
         */
        added,

        /**
         * Object is already replaced.
         * @since 1.7
         */
        replaced,

        /**
         * Object is moved away.
         * @since 1.8
         */
        moved_away,

        /**
         * Object is moved here.
         * @since 1.8
         */
        moved_here;
    }

    public enum Operation
    {
        /* none */
        none,

        /* update */
        update,

        /* switch */
        /* Note: this is different that svn_wc.h, because 'switch' is a
        * reserved word in java  :(  */
        switched,

        /* merge */
        merge;
    }
}