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: cleanup - extract method

Browse Source 
GitOrigin-RevId: b21904953ecda9638e6e8367cc50c5a1d9e63fd4
This commit is contained in:
Nadya Zabrodina
2019-11-25 10:39:14 +00:00
committed by intellij-monorepo-bot
parent 2f3415a9ec
commit 061798bef0
1 changed files with 17 additions and 10 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
+17 -10
View File
@@ -434,6 +434,22 @@ public class ShelveChangesManager implements PersistentStateComponent<Element>,
File patchFile = getPatchFileInConfigDir(schemePatchDir);
List<FilePatch> patches = new ArrayList<>(buildAndSavePatchInBatches(patchFile, textChanges, honorExcludedFromCommit));
final ShelvedChangeList changeList = new ShelvedChangeList(patchFile.toString(), commitMessage.replace('\n', ' '), binaryFiles,
createShelvedChangesFromFilePatches(myProject, patchFile.toString(),
patches));
changeList.markToDelete(markToBeDeleted);
changeList.setName(schemePatchDir.getName());
ProgressManager.checkCanceled();
mySchemeManager.addScheme(changeList, false);
totalSW.report(LOG);
return changeList;
}
private List<FilePatch> buildAndSavePatchInBatches(@NotNull File patchFile,
@NotNull List<Change> textChanges,
boolean honorExcludedFromCommit) throws VcsException, IOException {
List<FilePatch> patches = new ArrayList<>();
int batchIndex = 0;
int baseContentsPreloadSize = Registry.intValue("git.shelve.load.base.in.batches", -1);
@@ -473,16 +489,7 @@ public class ShelveChangesManager implements PersistentStateComponent<Element>,
totalSw.report(LOG);
}
}
final ShelvedChangeList changeList = new ShelvedChangeList(patchFile.toString(), commitMessage.replace('\n', ' '), binaryFiles,
createShelvedChangesFromFilePatches(myProject, patchFile.toString(),
patches));
changeList.markToDelete(markToBeDeleted);
changeList.setName(schemePatchDir.getName());
ProgressManager.checkCanceled();
mySchemeManager.addScheme(changeList, false);
totalSW.report(LOG);
return changeList;
return patches;
}
private void preloadBaseRevisions(@NotNull List<Change> textChanges) {