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

IDEA-64887 Mercurial: change dialog that appears on deleted-modified conflict - merge case added

Browse Source
This commit is contained in:
Nadya.Zabrodina
2012-10-18 18:18:30 +04:00
parent 04126e4be6
commit da800e2bfe
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgMergeCommand.java
+2 -1
View File
@@ -19,6 +19,7 @@ import org.jetbrains.annotations.Nullable;
import org.zmlx.hg4idea.HgVcs;
import org.zmlx.hg4idea.execution.HgCommandExecutor;
import org.zmlx.hg4idea.execution.HgCommandResult;
import org.zmlx.hg4idea.execution.HgDeleteModifyPromptHandler;
import java.util.LinkedList;
import java.util.List;
@@ -55,7 +56,7 @@ public class HgMergeCommand {
} else if (!StringUtil.isEmptyOrSpaces(branch)) {
arguments.add(branch);
}
final HgCommandResult result = commandExecutor.executeInCurrentThread(repo, "merge", arguments);
final HgCommandResult result = commandExecutor.executeInCurrentThread(repo, "merge", arguments, new HgDeleteModifyPromptHandler());
project.getMessageBus().syncPublisher(HgVcs.BRANCH_TOPIC).update(project);
return result;
}
plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
+3 -3
View File
@@ -295,9 +295,9 @@ public final class HgCommandExecutor {
choicePresentationArray[i] = choices[i].toString();
}
index[0] = Messages
.showChooseDialog(message, "hg4idea",
choicePresentationArray,
defaultChoice.toString(), Messages.getQuestionIcon());
.showDialog(message, "hg4idea",
choicePresentationArray,
defaultChoice.getChosenIndex(), Messages.getQuestionIcon());
}
});
plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgDeleteModifyPromptHandler.java
+4 -4
View File
@@ -57,7 +57,7 @@ public class HgDeleteModifyPromptHandler implements HgPromptHandler {
"File " + filename + " is deleted remotely, but modified locally. Do you want to keep the modified version or remove the file?";
}
else {
modifiedMessage = "";
modifiedMessage = message;
}
final int[] chosen = new int[]{-1};
try {
@@ -69,9 +69,9 @@ public class HgDeleteModifyPromptHandler implements HgPromptHandler {
choicePresentationArray[i] = choices[i].toString();
}
chosen[0] = Messages
.showChooseDialog(modifiedMessage, "Delete-Modify Conflict",
choicePresentationArray,
defaultChoice.toString(), Messages.getQuestionIcon());
.showDialog(modifiedMessage, "Delete-Modify Conflict",
choicePresentationArray, defaultChoice.getChosenIndex(),
Messages.getQuestionIcon());
}
});
}