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
|
/*
* Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
* https://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
package org.eclipse.jgit.notes;
import java.io.IOException;
import java.text.MessageFormat;
import org.eclipse.jgit.internal.JGitText;
/**
* This exception will be thrown from the
* {@link org.eclipse.jgit.notes.NoteMerger} when a conflict on Notes content is
* found during merge.
*/
public class NotesMergeConflictException extends IOException {
private static final long serialVersionUID = 1L;
/**
* Construct a NotesMergeConflictException for the specified base, ours and
* theirs note versions.
*
* @param base
* note version
* @param ours
* note version
* @param theirs
* note version
*/
public NotesMergeConflictException(Note base, Note ours, Note theirs) {
super(MessageFormat.format(JGitText.get().mergeConflictOnNotes,
noteOn(base, ours, theirs), noteData(base), noteData(ours),
noteData(theirs)));
}
/**
* Constructs a NotesMergeConflictException for the specified base, ours and
* theirs versions of the root note tree.
*
* @param base
* version of the root note tree
* @param ours
* version of the root note tree
* @param theirs
* version of the root note tree
*/
public NotesMergeConflictException(NonNoteEntry base, NonNoteEntry ours,
NonNoteEntry theirs) {
super(MessageFormat.format(
JGitText.get().mergeConflictOnNonNoteEntries, name(base),
name(ours), name(theirs)));
}
private static String noteOn(Note base, Note ours, Note theirs) {
if (base != null)
return base.name();
if (ours != null)
return ours.name();
return theirs.name();
}
private static String noteData(Note n) {
if (n != null)
return n.getData().name();
return ""; //$NON-NLS-1$
}
private static String name(NonNoteEntry e) {
return e != null ? e.name() : ""; //$NON-NLS-1$
}
}
|
