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

[shelf]: make ignoring shelf dir more understandable

Browse Source
This commit is contained in:
Nadya Zabrodina
2015-08-24 20:14:01 +03:00
parent 5689c7b498
commit ff006a9d33
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
+9 -4
View File
@@ -434,10 +434,7 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD
@NotNull
private File generateUniqueSchemePatchDir(@NotNull final String defaultName, boolean createResourceDirectory) {
File shelfDir = getShelfResourcesDirectory();
if (!shelfDir.exists()) {
ChangeListManager.getInstance(myProject).addDirectoryToIgnoreImplicitly(shelfDir.getAbsolutePath());
}
ignoreShelfDirectoryIfFirstShelf();
String uniqueName = UniqueNameGenerator
.generateUniqueName(shortenAndSanitize(defaultName), mySchemeManager.getAllSchemeNames());
File dir = new File(myFileProcessor.getBaseDir(), uniqueName);
@@ -448,6 +445,14 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD
return dir;
}
private void ignoreShelfDirectoryIfFirstShelf() {
File shelfDir = getShelfResourcesDirectory();
//check that shelf directory wasn't exist before that to ignore it only once
if (!shelfDir.exists()) {
ChangeListManager.getInstance(myProject).addDirectoryToIgnoreImplicitly(shelfDir.getAbsolutePath());
}
}
@NotNull
// for create patch only
public static File suggestPatchName(Project project, @NotNull final String commitMessage, final File file, String extension) {