summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2011-10-19 23:14:41 +0200
committerChristian Halstrick <christian.halstrick@sap.com>2011-11-09 09:05:24 +0100
commit83c172f0f7d1fb5ceb14fd58704ae18dc59a1e33 (patch)
tree9f73b5a06cd8123f9dd570fe79f7abfb5446ff7f /org.eclipse.jgit
parent790ddb2983bce01d2d0b5b1049d5576fa0c136a8 (diff)
downloadjgit-83c172f0f7d1fb5ceb14fd58704ae18dc59a1e33.tar.gz
jgit-83c172f0f7d1fb5ceb14fd58704ae18dc59a1e33.zip
Deprecate GitIndex more by using only DirCache internally.
This includes merging ReadTreeTest into DirCacheCheckoutTest and converting IndexDiffTest to use DirCache only. The GitIndex specific T0007GitIndex test remains. GitIndex is deprecated. Let us speed up its demise by focusing the DirCacheCheckout tests to using DirCache instead. This also add explicit deprecation comments to methods that depend on GitIndex in Repository and TreeEntry. The latter is deprecated in itself. Change-Id: Id89262f7fbfee07871f444378f196ded444f2783 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
index 4806ab922a..b1c4c78e65 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
@@ -816,6 +816,7 @@ public abstract class Repository {
* @throws NoWorkTreeException
* if this is bare, which implies it has no working directory.
* See {@link #isBare()}.
+ * @deprecated Use {@link #readDirCache()} instead
*/
public GitIndex getIndex() throws IOException, NoWorkTreeException {
if (isBare())
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java
index 38c33f311a..6f47db675e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TreeEntry.java
@@ -241,6 +241,7 @@ public abstract class TreeEntry implements Comparable {
*
* @param i
* @return '/' for Tree entries and NUL for non-treeish objects
+ * @deprecated since it depends on deprecated GitIndex, and internal
*/
final public static int lastChar(Entry i) {
// FIXME, gitlink etc. Currently Trees cannot appear in the