Remove deprecated Treeish interface
This interface has been deprecated for a long time now. Time to remove it. Change-Id: I29a938657e4637b2a9d0561940b38d70866613f7 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
cda64073fd
commit
9013e9e993
|
@ -65,7 +65,7 @@ public void prescanTwoTrees(Tree head, Tree merge)
|
||||||
throws IllegalStateException, IOException {
|
throws IllegalStateException, IOException {
|
||||||
DirCache dc = db.lockDirCache();
|
DirCache dc = db.lockDirCache();
|
||||||
try {
|
try {
|
||||||
dco = new DirCacheCheckout(db, head.getTreeId(), dc, merge.getTreeId());
|
dco = new DirCacheCheckout(db, head.getId(), dc, merge.getId());
|
||||||
dco.preScanTwoTrees();
|
dco.preScanTwoTrees();
|
||||||
} finally {
|
} finally {
|
||||||
dc.unlock();
|
dc.unlock();
|
||||||
|
@ -76,7 +76,7 @@ public void prescanTwoTrees(Tree head, Tree merge)
|
||||||
public void checkout() throws IOException {
|
public void checkout() throws IOException {
|
||||||
DirCache dc = db.lockDirCache();
|
DirCache dc = db.lockDirCache();
|
||||||
try {
|
try {
|
||||||
dco = new DirCacheCheckout(db, theHead.getTreeId(), dc, theMerge.getTreeId());
|
dco = new DirCacheCheckout(db, theHead.getId(), dc, theMerge.getId());
|
||||||
dco.checkout();
|
dco.checkout();
|
||||||
} finally {
|
} finally {
|
||||||
dc.unlock();
|
dc.unlock();
|
||||||
|
|
|
@ -126,7 +126,6 @@ public void test001_createEmpty() throws IOException {
|
||||||
assertTrue("entries is empty", t.members().length == 0);
|
assertTrue("entries is empty", t.members().length == 0);
|
||||||
assertEquals("full name is empty", "", t.getFullName());
|
assertEquals("full name is empty", "", t.getFullName());
|
||||||
assertTrue("no id", t.getId() == null);
|
assertTrue("no id", t.getId() == null);
|
||||||
assertTrue("tree is self", t.getTree() == t);
|
|
||||||
assertTrue("database is r", t.getRepository() == db);
|
assertTrue("database is r", t.getRepository() == db);
|
||||||
assertTrue("no foo child", t.findTreeMember("foo") == null);
|
assertTrue("no foo child", t.findTreeMember("foo") == null);
|
||||||
assertTrue("no foo child", t.findBlobMember("foo") == null);
|
assertTrue("no foo child", t.findBlobMember("foo") == null);
|
||||||
|
@ -178,7 +177,6 @@ public void test004_addTree() throws IOException {
|
||||||
assertTrue("isLoaded", f.isLoaded());
|
assertTrue("isLoaded", f.isLoaded());
|
||||||
assertFalse("has items", f.members().length > 0);
|
assertFalse("has items", f.members().length > 0);
|
||||||
assertFalse("is root", f.isRoot());
|
assertFalse("is root", f.isRoot());
|
||||||
assertTrue("tree is self", f.getTree() == f);
|
|
||||||
assertTrue("parent is modified", t.isModified());
|
assertTrue("parent is modified", t.isModified());
|
||||||
assertTrue("parent has no id", t.getId() == null);
|
assertTrue("parent has no id", t.getId() == null);
|
||||||
assertTrue("found bob child", t.findTreeMember(f.getName()) == f);
|
assertTrue("found bob child", t.findTreeMember(f.getName()) == f);
|
||||||
|
|
|
@ -1006,7 +1006,7 @@ public ObjectId writeTree() throws IOException {
|
||||||
current = trees.peek();
|
current = trees.peek();
|
||||||
}
|
}
|
||||||
inserter.flush();
|
inserter.flush();
|
||||||
return current.getTreeId();
|
return current.getId();
|
||||||
} finally {
|
} finally {
|
||||||
inserter.release();
|
inserter.release();
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
* information from its getter methods.
|
* information from its getter methods.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public class Tree extends TreeEntry implements Treeish {
|
public class Tree extends TreeEntry {
|
||||||
private static final TreeEntry[] EMPTY_TREE = {};
|
private static final TreeEntry[] EMPTY_TREE = {};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -235,14 +235,6 @@ public Repository getRepository() {
|
||||||
return db;
|
return db;
|
||||||
}
|
}
|
||||||
|
|
||||||
public final ObjectId getTreeId() {
|
|
||||||
return getId();
|
|
||||||
}
|
|
||||||
|
|
||||||
public final Tree getTree() {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return true of the data of this Tree is loaded
|
* @return true of the data of this Tree is loaded
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,68 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2007, Robin Rosenberg <robin.rosenberg@dewire.com>
|
|
||||||
* Copyright (C) 2006-2007, Shawn O. Pearce <spearce@spearce.org>
|
|
||||||
* and other copyright owners as documented in the project's IP log.
|
|
||||||
*
|
|
||||||
* This program and the accompanying materials are made available
|
|
||||||
* under the terms of the Eclipse Distribution License v1.0 which
|
|
||||||
* accompanies this distribution, is reproduced below, and is
|
|
||||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
|
||||||
*
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or
|
|
||||||
* without modification, are permitted provided that the following
|
|
||||||
* conditions are met:
|
|
||||||
*
|
|
||||||
* - Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* - Redistributions in binary form must reproduce the above
|
|
||||||
* copyright notice, this list of conditions and the following
|
|
||||||
* disclaimer in the documentation and/or other materials provided
|
|
||||||
* with the distribution.
|
|
||||||
*
|
|
||||||
* - Neither the name of the Eclipse Foundation, Inc. nor the
|
|
||||||
* names of its contributors may be used to endorse or promote
|
|
||||||
* products derived from this software without specific prior
|
|
||||||
* written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
|
|
||||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
|
||||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
|
||||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
||||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
||||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
||||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.eclipse.jgit.lib;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tree-ish is an interface for tree-like Git objects.
|
|
||||||
*
|
|
||||||
* @deprecated Use {@link org.eclipse.jgit.revwalk.RevWalk} to parse objects
|
|
||||||
* and resolve to a {@link org.eclipse.jgit.revwalk.RevTree}. See the method
|
|
||||||
* {@link org.eclipse.jgit.revwalk.RevWalk#parseTree(AnyObjectId)}.
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public interface Treeish {
|
|
||||||
/**
|
|
||||||
* @return the id of this tree
|
|
||||||
*/
|
|
||||||
public ObjectId getTreeId();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the tree of this tree-ish object
|
|
||||||
* @throws IOException
|
|
||||||
*/
|
|
||||||
public Tree getTree() throws IOException;
|
|
||||||
}
|
|
Loading…
Reference in New Issue