Skip to content

Fix StringUtil.endsWithLineBreak error and remove deprecated an unuse… #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdragnev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix StringUtil.endsWithLineBreak error and remove deprecated an unuse… #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bd3ead
Fix StringUtil.endsWithLineBreak error and remove deprecated an unuse…
sdragnev Jul 4, 2018
2caab9e
Include compiled plugin file in repository
sdragnev Jul 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added fossil4idea.jar
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion src/org/github/irengrig/fossil4idea/commandLine/FossilTextCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.profile.ProfileManager;
import org.jetbrains.annotations.NotNull;

import java.io.File;
Expand Down
5 changes: 3 additions & 2 deletions src/org/github/irengrig/fossil4idea/util/RootUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*/
public class RootUtil {
private final static String ourCheckoutFileName = "_FOSSIL_";
private final static String newCheckoutFileName = ".fslckout";

public static List<VirtualFile> getFossilRoots(final VirtualFile[] roots) {
if (roots == null || roots.length == 0) return Collections.emptyList();
Expand All @@ -34,7 +35,7 @@ public static List<VirtualFile> getFossilRoots(final VirtualFile[] roots) {
new Processor<VirtualFile>() {
@Override
public boolean process(final VirtualFile virtualFile) {
if (ourCheckoutFileName.equals(virtualFile.getName())) {
if (ourCheckoutFileName.equals(virtualFile.getName()) || newCheckoutFileName.equals(virtualFile.getName())) {
result.add(virtualFile.getParent());
}
return true;
Expand All @@ -50,7 +51,7 @@ public static File getWcRoot(final File file) {
VirtualFile virtualFile = lfs.refreshAndFindFileByIoFile(current);
while (current != null) {
if (virtualFile != null) {
if (virtualFile.findChild(ourCheckoutFileName) != null) return new File(virtualFile.getPath());
if (virtualFile.findChild(ourCheckoutFileName) != null || virtualFile.findChild(newCheckoutFileName) != null) return new File(virtualFile.getPath());
virtualFile = virtualFile.getParent();
} else {
current = current.getParentFile();
Expand Down