blob: 6bc2af02415cdd8e84043f67abcf0ddc34638bd7 (
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
|
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed 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.
*/
package org.jetbrains.idea.svn.update;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.info.Info;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.wc.SVNRevision;
import java.io.File;
public class MergeRootInfo {
private String myUrl1;
private SVNRevision myRevision1;
private String myUrl2;
private SVNRevision myRevision2;
public MergeRootInfo(File file, SvnVcs vcs) {
myRevision1 = SVNRevision.HEAD;
myRevision2 = SVNRevision.HEAD;
Info info = vcs.getInfo(file);
myUrl1 = info != null && info.getURL() != null ? info.getURL().toString() : "";
myUrl2 = myUrl1;
}
public SVNURL getUrl1() {
try {
return SVNURL.parseURIDecoded(myUrl1);
}
catch (SVNException e) {
return null;
}
}
public SVNURL getUrl2() {
try {
return SVNURL.parseURIDecoded(myUrl2);
}
catch (SVNException e) {
return null;
}
}
public SVNRevision getRevision2() {
return myRevision2;
}
public SVNRevision getRevision1() {
return myRevision1;
}
public long getResultRevision() {
return myRevision2.getNumber();
}
public void setUrl1(final String text) {
myUrl1 = text;
}
public void setUrl2(final String text) {
myUrl2 = text;
}
public void setRevision1(final SVNRevision rev) {
myRevision1 = rev;
}
public void setRevision2(final SVNRevision rev) {
myRevision2 = rev;
}
public String getUrlString1() {
return myUrl1;
}
public String getUrlString2() {
return myUrl2;
}
}
|
