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

Create patch from shelf when target file is not under VCS any more -> NPE

Browse Source 
http://ea.jetbrains.com/browser/ea_reports/300271
This commit is contained in:
irengrig
2011-10-11 16:32:11 +04:00
parent c1ff48b455
commit dc6dadcfc9
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
+9 -5
View File
@@ -136,12 +136,16 @@ public class CreatePatchCommitExecutor implements CommitExecutorWithHelp, Projec
}
myPanel.setFileName(ShelveChangesManager.suggestPatchName(myProject, commitMessage, new File(PATCH_PATH), null));
myPanel.setReversePatch(REVERSE_PATCH);
boolean dvcsIsUsed = false;
for (Change change : changes) {
final AbstractVcs vcs = ChangesUtil.getVcsForChange(change, myProject);
if (VcsType.distibuted.equals(vcs.getType())) {
dvcsIsUsed = true;
break;
if (ProjectLevelVcsManager.getInstance(myProject).dvcsUsedInProject()) {
for (Change change : changes) {
final AbstractVcs vcs = ChangesUtil.getVcsForChange(change, myProject);
if (vcs != null && VcsType.distibuted.equals(vcs.getType())) {
dvcsIsUsed = true;
break;
}
}
}
final List<Change> modified = new ArrayList<Change>();