[EGIT] [PATCH RFC v1 2/5] Enable the ignore handling of the plugin
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
---
org.spearce.egit.core/META-INF/MANIFEST.MF | 1 +
.../org/spearce/egit/core/op/TrackOperation.java | 6 +++---
.../decorators/DecoratableResourceAdapter.java | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/org.spearce.egit.core/META-INF/MANIFEST.MF b/org.spearce.egit.core/META-INF/MANIFEST.MF
index 20df15f..546ea72 100644
--- a/org.spearce.egit.core/META-INF/MANIFEST.MF
+++ b/org.spearce.egit.core/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.filesystem,
org.eclipse.ui
Export-Package: org.spearce.egit.core,
+ org.spearce.egit.core.ignores;x-friends:="org.spearce.egit.ui",
org.spearce.egit.core.internal.storage;x-friends:="org.spearce.egit.ui",
org.spearce.egit.core.internal.util;x-friends:="org.spearce.egit.ui",
org.spearce.egit.core.op,
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java b/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java
index 29b4344..4a4b93c 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java
+++ b/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java
@@ -24,9 +24,9 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.team.core.Team;
import org.spearce.egit.core.Activator;
import org.spearce.egit.core.CoreText;
+import org.spearce.egit.core.ignores.GitIgnoreData;
import org.spearce.egit.core.project.RepositoryMapping;
import org.spearce.jgit.lib.GitIndex;
import org.spearce.jgit.lib.GitIndex.Entry;
@@ -96,12 +96,12 @@ public boolean visit(IResource resource) throws CoreException {
// by explicitly selecting and invoking track on it.
if (resource.getType() == IResource.FILE) {
Entry entry = index.getEntry(repoPath);
- if (!Team.isIgnoredHint(resource) || entry != null && entry.isAssumedValid()) {
+ if (!GitIgnoreData.isIgnored(resource) || ((entry != null) && entry.isAssumedValid())) {
entry = index.add(rm.getWorkDir(), new File(rm.getWorkDir(), repoPath));
entry.setAssumeValid(false);
}
}
- if (Team.isIgnoredHint(resource))
+ if (GitIgnoreData.isIgnored(resource))
return false;
} catch (IOException e) {
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/DecoratableResourceAdapter.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/DecoratableResourceAdapter.java
index 5c68d5b..4c740d5 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/DecoratableResourceAdapter.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/DecoratableResourceAdapter.java
@@ -22,10 +22,10 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.team.core.Team;
import org.spearce.egit.core.AdaptableFileTreeIterator;
import org.spearce.egit.core.ContainerTreeIterator;
import org.spearce.egit.core.ContainerTreeIterator.ResourceEntry;
+import org.spearce.egit.core.ignores.GitIgnoreData;
import org.spearce.egit.core.project.RepositoryMapping;
import org.spearce.egit.ui.Activator;
import org.spearce.egit.ui.UIPreferences;
@@ -363,7 +363,7 @@ private static boolean timestampMatches(DirCacheEntry indexEntry,
private static boolean isIgnored(IResource resource) {
// TODO: Also read ignores from .git/info/excludes et al.
- return Team.isIgnoredHint(resource);
+ return GitIgnoreData.isIgnored(resource);
}
public String getName() {
--
1.6.0.6
Ferry Huberts <ferry.huberts@pelagic.nl>