[JGIT PATCH 1/1] Remove dead cacheTree related code from GitProjectData
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:45:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
We have long since purged the idea of the cache tree from egit, so we do not need this commented out block of code anymore. Signed-off-by: Shawn O. Pearce <redacted> --- .../spearce/egit/core/project/GitProjectData.java | 35 -------------------- 1 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java b/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
index f092669..8754bd1 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
+++ b/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java@@ -415,31 +415,6 @@ public class GitProjectData { } else if (s == null) { return true; } - -// final Tree cacheTree = m.getCacheTree(); -// if (cacheTree != null) { -// try { -// synchronized (cacheTree) { -// final TreeEntry e; -// if (res.getType() == IResource.FILE) -// e = cacheTree.findBlobMember(s); -// else -// e = cacheTree.findTreeMember(s); -// if (e instanceof FileTreeEntry) { -// trace("modified " + r + " -> " -// + e.getFullName()); -// e.setModified(); -// affectedMappings.add(m); -// } -// } -// } catch (IOException ioe) { -// throw Activator -// .error( -// CoreText.GitProjectData_lazyResolveFailed, -// ioe); -// } -// return true; -// } } return false; }
@@ -451,16 +426,6 @@ public class GitProjectData { detachFromWorkspace(); Activator.logError(CoreText.GitProjectData_notifyChangedFailed, ce); } - -// try { -// final Iterator i = affectedMappings.iterator(); -// while (i.hasNext()) { -// ((RepositoryMapping) i.next()).recomputeMerge(); -// } -// } catch (IOException ioe) { -// Activator -// .logError(CoreText.GitProjectData_notifyChangedFailed, ioe); -// } } private File propertyFile() {
--
1.6.0.rc1.250.g9b5e2