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-110365 resolve conflicts after updateTo action

Browse Source
This commit is contained in:
Nadya Zabrodina
2013-07-11 19:20:04 +04:00
parent bd9c5440c7
commit dd4b38854f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java
+3 -1
View File
@@ -261,11 +261,13 @@ public class HgBranchPopupActions {
@Override
public void actionPerformed(AnActionEvent e) {
HgUpdateCommand hgUpdateCommand = new HgUpdateCommand(myProject, mySelectedRepository.getRoot());
final VirtualFile repository = mySelectedRepository.getRoot();
HgUpdateCommand hgUpdateCommand = new HgUpdateCommand(myProject, repository);
hgUpdateCommand.setBranch(myBranch);
HgCommandResult result = hgUpdateCommand.execute();
if (HgErrorUtil.hasErrorsInCommandExecution(result)) {
new HgCommandResultNotifier(myProject).notifyError(result, "", "Update failed");
new HgConflictResolver(myProject).resolve(repository);
}
myProject.getMessageBus().syncPublisher(HgVcs.BRANCH_TOPIC).update(myProject, null);
}
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java
+4 -1
View File
@@ -25,6 +25,7 @@ import org.zmlx.hg4idea.HgVcs;
import org.zmlx.hg4idea.HgVcsMessages;
import org.zmlx.hg4idea.command.HgUpdateCommand;
import org.zmlx.hg4idea.execution.HgCommandResult;
import org.zmlx.hg4idea.provider.update.HgConflictResolver;
import org.zmlx.hg4idea.ui.HgUpdateToDialog;
import org.zmlx.hg4idea.util.HgBranchesAndTags;
import org.zmlx.hg4idea.util.HgErrorUtil;
@@ -66,7 +67,8 @@ public class HgUpdateToAction extends HgAbstractGlobalAction {
}
public void updateTo(HgUpdateToDialog dialog, final Project project) {
final HgUpdateCommand command = new HgUpdateCommand(project, dialog.getRepository());
final VirtualFile repository = dialog.getRepository();
final HgUpdateCommand command = new HgUpdateCommand(project, repository);
command.setClean(dialog.isRemoveLocalChanges());
if (dialog.isRevisionSelected()) {
command.setRevision(dialog.getRevision());
@@ -81,6 +83,7 @@ public class HgUpdateToAction extends HgAbstractGlobalAction {
@Override
public void run() {
HgCommandResult result = command.execute();
new HgConflictResolver(project).resolve(repository);
if (HgErrorUtil.hasErrorsInCommandExecution(result)) {
new HgCommandResultNotifier(project).notifyError(result, "", "Update failed");
}