MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-31159

Browse Source
This commit is contained in:
Bas Leijdekkers
2012-02-23 15:41:59 +01:00
parent f041c0d1ac
commit b8c16163bd
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/SimpleRevision.java
+2 -12
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -15,12 +15,8 @@
*/
package com.intellij.cvsSupport2.cvsoperations.dateOrRevision;
import com.intellij.cvsSupport2.application.CvsEntriesManager;
import com.intellij.cvsSupport2.history.CvsRevisionNumber;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.netbeans.lib.cvsclient.admin.Entry;
import org.netbeans.lib.cvsclient.command.Command;
@@ -30,17 +26,11 @@ import org.netbeans.lib.cvsclient.command.Command;
public class SimpleRevision implements RevisionOrDate {
private final String myRevision;
public static SimpleRevision createForTheSameVersionOf(@NotNull VirtualFile file) {
Entry entry = CvsEntriesManager.getInstance().getEntryFor(file.getParent(), file.getName());
return new SimpleRevision(entry.getRevision());
}
public SimpleRevision(String revision) {
myRevision = prepareRevision(revision);
}
private String prepareRevision(String revision) {
private static String prepareRevision(String revision) {
if (revision == null) {
return null;
}
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java
+4 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -567,9 +567,10 @@ public class CvsChangeProvider implements ChangeProvider {
final Entry entry = myEntriesManager.getEntryFor(virtualFile.getParent(), virtualFile.getName());
if (entry != null) {
revision = entry.getRevision();
operation = GetFileContentOperation.createForFile(virtualFile, new SimpleRevision(revision));
} else {
operation = GetFileContentOperation.createForFile(myPath);
}
operation = GetFileContentOperation.createForFile(virtualFile, SimpleRevision.createForTheSameVersionOf(virtualFile));
}
else {
operation = GetFileContentOperation.createForFile(myPath);