diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java index 98989bef2dc1..d35870624b68 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java @@ -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() { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java index a9af7e306bc3..5de9f45d0f11 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java @@ -238,13 +238,12 @@ public class HgStatusCommand { } @NotNull - public Collection getHgUntrackedFiles(@NotNull VirtualFile repo, @NotNull List files) throws VcsException { - Collection untrackedFiles = new HashSet<>(); - List filePaths = ObjectsConvertor.vf2fp(files); - Set change = executeInCurrentThread(repo, filePaths); + public Collection getFiles(@NotNull VirtualFile repo, @Nullable List files) throws VcsException { + Collection resultFiles = new HashSet<>(); + Set 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; } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java index d92745b685ae..614201e5e805 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java @@ -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 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,