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

UpdateTo action from Branches view changed as Backgroundable

Browse Source
This commit is contained in:
Nadya Zabrodina
2013-08-05 15:40:29 +04:00
parent 0185c3388d
commit 5bfe741921
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java
+17 -10
View File
@@ -33,6 +33,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.zmlx.hg4idea.HgRevisionNumber;
import org.zmlx.hg4idea.HgVcs;
import org.zmlx.hg4idea.HgVcsMessages;
import org.zmlx.hg4idea.command.HgBookmarkCreateCommand;
import org.zmlx.hg4idea.command.HgBranchCreateCommand;
import org.zmlx.hg4idea.command.HgMergeCommand;
@@ -256,9 +257,9 @@ public class HgBranchPopupActions {
private static class UpdateToAction extends DumbAwareAction {
private final Project myProject;
private final HgRepository mySelectedRepository;
private final String myBranch;
@NotNull private final Project myProject;
@NotNull private final HgRepository mySelectedRepository;
@NotNull private final String myBranch;
public UpdateToAction(@NotNull Project project,
@NotNull HgRepository selectedRepository,
@@ -272,14 +273,20 @@ public class HgBranchPopupActions {
@Override
public void actionPerformed(AnActionEvent e) {
final VirtualFile repository = mySelectedRepository.getRoot();
HgUpdateCommand hgUpdateCommand = new HgUpdateCommand(myProject, repository);
final 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);
new Task.Backgroundable(myProject, HgVcsMessages.message("action.hg4idea.updateTo.description", myBranch)) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
HgCommandResult result = hgUpdateCommand.execute();
assert myProject != null; // myProject couldn't be null, see annotation for updateTo action
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);
}
}.queue();
}
}
}