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

[hg]: rename get conflict list, refactor mark resolved method

Browse Source
This commit is contained in:
Nadya Zabrodina
2016-03-09 14:29:23 +03:00
parent 153df9b9e9
commit e5e9b2d3d0
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
+10 -8
View File
@@ -18,6 +18,8 @@ import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Consumer;
import com.intellij.vcsUtil.VcsFileUtil;
import com.intellij.vcsUtil.VcsUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.zmlx.hg4idea.HgFile;
import org.zmlx.hg4idea.execution.HgCommandExecutor;
@@ -44,24 +46,24 @@ public class HgResolveCommand {
}
final HgCommandExecutor executor = new HgCommandExecutor(myProject);
executor.setSilent(true);
final HgCommandResult result = executor.executeInCurrentThread(repo, "resolve", Arrays.asList("--list"));
final HgCommandResult result = executor.executeInCurrentThread(repo, "resolve", Collections.singletonList("--list"));
if (result == null) {
return Collections.emptyMap();
}
return handleResult(repo, result);
}
public void list(final VirtualFile repo, final Consumer<Map<HgFile, HgResolveStatusEnum>> resultHandler) {
public void getListAsynchronously(final VirtualFile repo, final Consumer<Map<HgFile, HgResolveStatusEnum>> resultHandler) {
if (repo == null) {
resultHandler.consume(Collections.<HgFile, HgResolveStatusEnum>emptyMap());
resultHandler.consume(Collections.emptyMap());
}
final HgCommandExecutor executor = new HgCommandExecutor(myProject);
executor.setSilent(true);
executor.execute(repo, "resolve", Arrays.asList("--list"), new HgCommandResultHandler() {
executor.execute(repo, "resolve", Collections.singletonList("--list"), new HgCommandResultHandler() {
@Override
public void process(@Nullable HgCommandResult result) {
if (result == null) {
resultHandler.consume(Collections.<HgFile, HgResolveStatusEnum>emptyMap());
resultHandler.consume(Collections.emptyMap());
}
final Map<HgFile, HgResolveStatusEnum> resolveStatus = handleResult(repo, result);
@@ -85,11 +87,11 @@ public class HgResolveCommand {
return resolveStatus;
}
public void markResolved(VirtualFile repo, VirtualFile path) {
new HgCommandExecutor(myProject).execute(repo, "resolve", Arrays.asList("--mark", path.getPath()), null);
public void markResolved(@NotNull VirtualFile repo, @NotNull VirtualFile path) {
markResolved(repo, Collections.singleton(VcsUtil.getFilePath(path)));
}
public void markResolved(VirtualFile repo, Collection<FilePath> paths) {
public void markResolved(@NotNull VirtualFile repo, @NotNull Collection<FilePath> paths) {
for (List<String> chunk : VcsFileUtil.chunkPaths(repo, paths)) {
final List<String> args = new ArrayList<String>();
args.add("--mark");
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class HgRunConflictResolverDialog extends DialogWrapper {
VirtualFile repo = repositorySelector.getRepository().getRoot();
HgResolveCommand command = new HgResolveCommand(project);
final ModalityState modalityState = ApplicationManager.getApplication().getModalityStateForComponent(getRootPane());
command.list(repo, new Consumer<Map<HgFile, HgResolveStatusEnum>>() {
command.getListAsynchronously(repo, new Consumer<Map<HgFile, HgResolveStatusEnum>>() {
@Override
public void consume(Map<HgFile, HgResolveStatusEnum> status) {
final DefaultListModel model = new DefaultListModel();