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]: remove IGNORED processor

Browse Source
This commit is contained in:
Nadya Zabrodina
2016-10-19 19:23:35 +03:00
parent 602c1fee30
commit d237c908c6
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class HgVFSListener extends VcsVFSListener {
try {
untrackedFiles
.addAll(new HgStatusCommand.Builder(false).unknown(true).removed(true).build(myProject)
.getHgUntrackedFiles(repo, new ArrayList<>(files)));
.getFiles(repo, new ArrayList<>(files)));
}
catch (final VcsException ex) {
UIUtil.invokeLaterIfNeeded(new Runnable() {
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
+5 -6
View File
@@ -238,13 +238,12 @@ public class HgStatusCommand {
}
@NotNull
public Collection<VirtualFile> getHgUntrackedFiles(@NotNull VirtualFile repo, @NotNull List<VirtualFile> files) throws VcsException {
Collection<VirtualFile> untrackedFiles = new HashSet<>();
List<FilePath> filePaths = ObjectsConvertor.vf2fp(files);
Set<HgChange> change = executeInCurrentThread(repo, filePaths);
public Collection<VirtualFile> getFiles(@NotNull VirtualFile repo, @Nullable List<VirtualFile> files) throws VcsException {
Collection<VirtualFile> resultFiles = new HashSet<>();
Set<HgChange> change = executeInCurrentThread(repo, files != null ? ObjectsConvertor.vf2fp(files) : null);
for (HgChange hgChange : change) {
untrackedFiles.add(hgChange.afterFile().toFilePath().getVirtualFile());
resultFiles.add(hgChange.afterFile().toFilePath().getVirtualFile());
}
return untrackedFiles;
return resultFiles;
}
}
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java
+1 -13
View File
@@ -15,7 +15,6 @@ package org.zmlx.hg4idea.provider;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vcs.*;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vfs.VfsUtil;
@@ -51,7 +50,6 @@ public class HgChangeProvider implements ChangeProvider {
static {
PROCESSORS.put(HgFileStatusEnum.ADDED, HgChangeProcessor.ADDED);
PROCESSORS.put(HgFileStatusEnum.DELETED, HgChangeProcessor.DELETED);
PROCESSORS.put(HgFileStatusEnum.IGNORED, HgChangeProcessor.IGNORED);
PROCESSORS.put(HgFileStatusEnum.MISSING, HgChangeProcessor.MISSING);
PROCESSORS.put(HgFileStatusEnum.COPY, HgChangeProcessor.COPIED);
PROCESSORS.put(HgFileStatusEnum.MODIFIED, HgChangeProcessor.MODIFIED);
@@ -89,8 +87,7 @@ public class HgChangeProvider implements ChangeProvider {
final HgRevisionNumber parentRevision = new HgWorkingCopyRevisionsCommand(myProject).firstParent(repo);
final Map<HgFile, HgResolveStatusEnum> list = new HgResolveCommand(myProject).getListSynchronously(repo);
hgChanges.addAll(new HgStatusCommand.Builder(true).ignored(Registry.is("hg4idea.process.ignored")).build(myProject)
.executeInCurrentThread(repo, entry.getValue()));
hgChanges.addAll(new HgStatusCommand.Builder(true).ignored(false).build(myProject).executeInCurrentThread(repo, entry.getValue()));
final HgRepository hgRepo = HgUtil.getRepositoryForFile(myProject, repo);
if (hgRepo != null && hgRepo.hasSubrepos()) {
hgChanges.addAll(ContainerUtil.mapNotNull(hgRepo.getSubrepos(), info -> findChange(hgRepo, info)));
@@ -217,15 +214,6 @@ public class HgChangeProvider implements ChangeProvider {
}
},
IGNORED() {
@Override
void process(Project project, VcsKey vcsKey, ChangelistBuilder builder,
HgRevisionNumber currentNumber, HgRevisionNumber parentRevision,
HgFile beforeFile, HgFile afterFile) {
builder.processIgnoredFile(VcsUtil.getVirtualFile(afterFile.getFile()));
}
},
MISSING() {
@Override
void process(Project project, VcsKey vcsKey, ChangelistBuilder builder,