diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java')
-rw-r--r-- | platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java index fdc079641b68..d06c8f888ad7 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java @@ -15,16 +15,15 @@ */ package com.intellij.openapi.vcs.changes; -import com.intellij.lifecycle.PeriodicalTasksCloser; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileTypes.FileTypeManager; -import com.intellij.openapi.roots.FileIndexFacade; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Factory; import com.intellij.openapi.util.Getter; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.FilePathImpl; +import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsKey; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.Nullable; @@ -40,7 +39,7 @@ class UpdatingChangeListBuilder implements ChangelistBuilder { private VcsDirtyScope myScope; private FoldersCutDownWorker myFoldersCutDownWorker; private final IgnoredFilesComponent myIgnoredFilesComponent; - private final FileIndexFacade myIndex; + private final ProjectLevelVcsManager myVcsManager; private final ChangeListManagerGate myGate; private Factory<JComponent> myAdditionalInfo; @@ -53,7 +52,7 @@ class UpdatingChangeListBuilder implements ChangelistBuilder { myDisposedGetter = disposedGetter; myIgnoredFilesComponent = ignoredFilesComponent; myGate = gate; - myIndex = PeriodicalTasksCloser.getInstance().safeGetService(changeListWorker.getProject(), FileIndexFacade.class); + myVcsManager = ProjectLevelVcsManager.getInstance(changeListWorker.getProject()); } private void checkIfDisposed() { @@ -117,12 +116,12 @@ class UpdatingChangeListBuilder implements ChangelistBuilder { myChangeListWorker.removeRegisteredChangeFor(path); } - private boolean isExcluded(final VirtualFile file) { + private boolean isIgnoredByVcs(final VirtualFile file) { return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() { @Override public Boolean compute() { checkIfDisposed(); - return myIndex.isExcludedFile(file); + return myVcsManager.isIgnored(file); } }); } @@ -133,7 +132,7 @@ class UpdatingChangeListBuilder implements ChangelistBuilder { } if (file == null) return; checkIfDisposed(); - if (isExcluded(file)) return; + if (isIgnoredByVcs(file)) return; if (myScope.belongsTo(new FilePathImpl(file))) { if (myIgnoredFilesComponent.isIgnoredFile(file)) { myComposite.getIgnoredFileHolder().addFile(file); @@ -165,7 +164,7 @@ class UpdatingChangeListBuilder implements ChangelistBuilder { public void processModifiedWithoutCheckout(final VirtualFile file) { if (file == null) return; checkIfDisposed(); - if (isExcluded(file)) return; + if (isIgnoredByVcs(file)) return; if (myScope.belongsTo(new FilePathImpl(file))) { if (LOG.isDebugEnabled()) { LOG.debug("processModifiedWithoutCheckout " + file); @@ -177,7 +176,7 @@ class UpdatingChangeListBuilder implements ChangelistBuilder { public void processIgnoredFile(final VirtualFile file) { if (file == null) return; checkIfDisposed(); - if (isExcluded(file)) return; + if (isIgnoredByVcs(file)) return; if (myScope.belongsTo(new FilePathImpl(file))) { IgnoredFilesHolder ignoredFilesHolder = myComposite.getIgnoredFileHolder(); if (ignoredFilesHolder instanceof IgnoredFilesCompositeHolder) { @@ -212,7 +211,7 @@ class UpdatingChangeListBuilder implements ChangelistBuilder { public void processSwitchedFile(final VirtualFile file, final String branch, final boolean recursive) { if (file == null) return; checkIfDisposed(); - if (isExcluded(file)) return; + if (isIgnoredByVcs(file)) return; if (myScope.belongsTo(new FilePathImpl(file))) { myChangeListWorker.addSwitched(file, branch, recursive); } |