1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.zmlx.hg4idea.action;
import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.VcsNotifier;
import com.intellij.openapi.vcs.update.UpdatedFiles;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.zmlx.hg4idea.HgVcs;
import org.zmlx.hg4idea.HgVcsMessages;
import org.zmlx.hg4idea.command.HgMergeCommand;
import org.zmlx.hg4idea.command.HgUpdateCommand;
import org.zmlx.hg4idea.execution.HgCommandResult;
import org.zmlx.hg4idea.provider.update.HgConflictResolver;
import org.zmlx.hg4idea.provider.update.HgHeadMerger;
import org.zmlx.hg4idea.repo.HgRepository;
import org.zmlx.hg4idea.util.HgErrorUtil;
public class HgCommonBranchActions extends ActionGroup {
@NotNull protected final Project myProject;
@NotNull protected String myBranchName;
@NotNull protected final HgRepository mySelectedRepository;
HgCommonBranchActions(@NotNull Project project, @NotNull HgRepository selectedRepository, @NotNull String branchName) {
super("", true);
myProject = project;
myBranchName = branchName;
mySelectedRepository = selectedRepository;
getTemplatePresentation().setText(myBranchName, false); // no mnemonics
}
@NotNull
@Override
public AnAction[] getChildren(@Nullable AnActionEvent e) {
return new AnAction[]{
new UpdateAction(myProject, mySelectedRepository, myBranchName),
new MergeAction(myProject, mySelectedRepository, myBranchName)
};
}
private static class MergeAction extends HgBranchAbstractAction {
public MergeAction(@NotNull Project project,
@NotNull HgRepository selectedRepository,
@NotNull String branchName) {
super(project, "Merge", selectedRepository, branchName);
}
@Override
public void actionPerformed(AnActionEvent e) {
FileDocumentManager.getInstance().saveAllDocuments();
final UpdatedFiles updatedFiles = UpdatedFiles.create();
final HgMergeCommand hgMergeCommand = new HgMergeCommand(myProject, mySelectedRepository.getRoot());
hgMergeCommand.setRevision(myBranchName);//there is no difference between branch or revision or bookmark as parameter to merge,
// we need just a string
new Task.Backgroundable(myProject, "Merging changes...") {
@Override
public void run(@NotNull ProgressIndicator indicator) {
try {
new HgHeadMerger(myProject, hgMergeCommand)
.merge(mySelectedRepository.getRoot());
new HgConflictResolver(myProject, updatedFiles).resolve(mySelectedRepository.getRoot());
}
catch (VcsException exception) {
assert myProject != null; // myProject couldn't be null, see annotation for Merge action
if (exception.isWarning()) {
VcsNotifier.getInstance(myProject).notifyWarning("Warning during merge", exception.getMessage());
}
else {
VcsNotifier.getInstance(myProject).notifyError("Exception during merge", exception.getMessage());
}
}
catch (Exception e1) {
HgAbstractGlobalAction.handleException(myProject, e1);
}
}
}.queue();
}
}
private static class UpdateAction extends HgBranchAbstractAction {
public UpdateAction(@NotNull Project project,
@NotNull HgRepository selectedRepository,
@NotNull String branchName) {
super(project, "Update", selectedRepository, branchName);
}
@Override
public void actionPerformed(AnActionEvent e) {
final VirtualFile repository = mySelectedRepository.getRoot();
FileDocumentManager.getInstance().saveAllDocuments();
final HgUpdateCommand hgUpdateCommand = new HgUpdateCommand(myProject, repository);
hgUpdateCommand.setBranch(myBranchName);
new Task.Backgroundable(myProject, HgVcsMessages.message("action.hg4idea.updateTo.description", myBranchName)) {
@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();
}
}
}
|
