use of org.jetbrains.idea.svn.history.SvnRepositoryContentRevision in project intellij-community by JetBrains.
the class ShowPropertiesDiffAction method getPropertyList.
@NotNull
private static List<PropertyData> getPropertyList(@NotNull SvnVcs vcs, @Nullable final ContentRevision contentRevision, @Nullable final SVNRevision revision) throws SVNException, VcsException {
if (contentRevision == null) {
return Collections.emptyList();
}
SvnTarget target;
if (contentRevision instanceof SvnRepositoryContentRevision) {
final SvnRepositoryContentRevision svnRevision = (SvnRepositoryContentRevision) contentRevision;
target = SvnTarget.fromURL(SVNURL.parseURIEncoded(svnRevision.getFullPath()), revision);
} else {
final File ioFile = contentRevision.getFile().getIOFile();
target = SvnTarget.fromFile(ioFile, revision);
}
return getPropertyList(vcs, target, revision);
}
use of org.jetbrains.idea.svn.history.SvnRepositoryContentRevision in project intellij-community by JetBrains.
the class PointMerger method doMerge.
protected void doMerge() throws VcsException {
for (Change change : mySelectedChanges) {
SvnRepositoryContentRevision before = (SvnRepositoryContentRevision) change.getBeforeRevision();
SvnRepositoryContentRevision after = (SvnRepositoryContentRevision) change.getAfterRevision();
if (before == null) {
//noinspection ConstantConditions
add(after);
} else if (after == null) {
delete(before);
} else {
merge(before, after);
}
}
}
Aggregations