}
/**
- * An implementation of the {@link Checkout} interface which uses {@link WorkDirCheckout}
+ * An implementation of the {@link Checkout} interface which uses WorkDirCheckout
*/
class WorkdirCheckoutImpl extends WorkDirCheckout implements Checkout {
public WorkdirCheckoutImpl(Tree head, GitIndex index,
* case about certain events
* @author dwatson
*
+ * @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk} instead, with a
+ * {@link org.eclipse.jgit.dircache.DirCacheIterator} as one of the members.
*/
+@Deprecated
public class AbstractIndexTreeVisitor implements IndexTreeVisitor {
public void finishVisitTree(Tree tree, Tree auxTree, String curDir)
throws IOException {
/** Bit pattern for {@link #TYPE_MASK} matching {@link #MISSING}. */
public static final int TYPE_MISSING = 0000000;
- /** Mode indicating an entry is a {@link Tree}. */
+ /** Mode indicating an entry is a tree (aka directory). */
@SuppressWarnings("synthetic-access")
public static final FileMode TREE = new FileMode(TYPE_TREE,
Constants.OBJ_TREE) {
}
};
- /** Mode indicating an entry is a {@link SymlinkTreeEntry}. */
+ /** Mode indicating an entry is a symbolic link. */
@SuppressWarnings("synthetic-access")
public static final FileMode SYMLINK = new FileMode(TYPE_SYMLINK,
Constants.OBJ_BLOB) {
}
};
- /** Mode indicating an entry is a non-executable {@link FileTreeEntry}. */
+ /** Mode indicating an entry is a non-executable file. */
@SuppressWarnings("synthetic-access")
public static final FileMode REGULAR_FILE = new FileMode(0100644,
Constants.OBJ_BLOB) {
}
};
- /** Mode indicating an entry is an executable {@link FileTreeEntry}. */
+ /** Mode indicating an entry is an executable file. */
@SuppressWarnings("synthetic-access")
public static final FileMode EXECUTABLE_FILE = new FileMode(0100755,
Constants.OBJ_BLOB) {
/**
* A representation of a file (blob) object in a {@link Tree}.
+ *
+ * @deprecated To look up information about a single path, use
+ * {@link org.eclipse.jgit.treewalk.TreeWalk#forPath(Repository, String, org.eclipse.jgit.revwalk.RevTree)}.
+ * To lookup information about multiple paths at once, use a
+ * {@link org.eclipse.jgit.treewalk.TreeWalk} and obtain the current entry's
+ * information from its getter methods.
*/
+@Deprecated
public class FileTreeEntry extends TreeEntry {
private FileMode mode;
return filemode.booleanValue();
}
- /** An index entry */
+ /**
+ * An index entry
+ *
+ * @deprecated Use {@link org.eclipse.jgit.dircache.DirCacheEntry}.
+ */
+ @Deprecated
public class Entry {
private long ctime;
* A tree entry representing a gitlink entry used for submodules.
*
* Note. Java cannot really handle these as file system objects.
+ *
+ * @deprecated To look up information about a single path, use
+ * {@link org.eclipse.jgit.treewalk.TreeWalk#forPath(Repository, String, org.eclipse.jgit.revwalk.RevTree)}.
+ * To lookup information about multiple paths at once, use a
+ * {@link org.eclipse.jgit.treewalk.TreeWalk} and obtain the current entry's
+ * information from its getter methods.
*/
+@Deprecated
public class GitlinkTreeEntry extends TreeEntry {
private static final long serialVersionUID = 1L;
/**
* Compares the Index, a Tree, and the working directory
+ *
+ * @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk} instead, with at
+ * least the {@link org.eclipse.jgit.dircache.DirCacheIterator} and
+ * {@link org.eclipse.jgit.treewalk.FileTreeIterator} iterators, and setting
+ * the filter {@link org.eclipse.jgit.treewalk.filter.TreeFilter#ANY_DIFF}.
*/
+@Deprecated
public class IndexDiff {
private GitIndex index;
private Tree tree;
*
* A File argument is supplied to allow us to check for modifications in
* a work tree or update the file.
+ *
+ * @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk} instead, with
+ * a {@link org.eclipse.jgit.dircache.DirCacheIterator} as a member.
*/
+@Deprecated
public interface IndexTreeVisitor {
/**
* Visit a blob, and corresponding tree and index entries.
* A class for traversing the index and one or two trees.
*
* A visitor is invoked for executing actions, like figuring out how to merge.
+ *
+ * @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk} with multiple
+ * iterators, such as {@link org.eclipse.jgit.dircache.DirCacheIterator},
+ * {@link org.eclipse.jgit.treewalk.FileTreeIterator}, and a native tree
+ * {@link org.eclipse.jgit.treewalk.TreeWalk#addTree(AnyObjectId)}.
*/
+@Deprecated
public class IndexTreeWalker {
private final Tree mainTree;
private final Tree newTree;
* @throws IOException for I/O error or unexpected object type.
*
* @see #resolve(String)
+ * @deprecated Use {@link #resolve(String)} and pass its return value to
+ * {@link org.eclipse.jgit.revwalk.RevWalk#parseCommit(AnyObjectId)}.
*/
+ @Deprecated
public Commit mapCommit(final String revstr) throws IOException {
final ObjectId id = resolve(revstr);
return id != null ? mapCommit(id) : null;
* @param refName optional, only relevant for simple tags
* @return The Git object if found or null
* @throws IOException
+ * @deprecated Use {@link org.eclipse.jgit.revwalk.RevWalk#parseCommit(AnyObjectId)},
+ * or {@link org.eclipse.jgit.revwalk.RevWalk#parseTag(AnyObjectId)}.
+ * To read a tree, use {@link org.eclipse.jgit.treewalk.TreeWalk#addTree(AnyObjectId)}.
+ * To read a blob, open it with {@link #openObject(AnyObjectId)}.
*/
+ @Deprecated
public Object mapObject(final ObjectId id, final String refName) throws IOException {
final ObjectLoader or = openObject(id);
if (or == null)
* @param id
* @return Commit or null
* @throws IOException for I/O error or unexpected object type.
+ * @deprecated Use {@link org.eclipse.jgit.revwalk.RevWalk#parseCommit(AnyObjectId)}.
*/
+ @Deprecated
public Commit mapCommit(final ObjectId id) throws IOException {
final ObjectLoader or = openObject(id);
if (or == null)
* @throws IOException
*
* @see #resolve(String)
+ * @deprecated Use {@link #resolve(String)} and pass its return value to
+ * {@link org.eclipse.jgit.treewalk.TreeWalk#addTree(AnyObjectId)}.
*/
+ @Deprecated
public Tree mapTree(final String revstr) throws IOException {
final ObjectId id = resolve(revstr);
return id != null ? mapTree(id) : null;
* @param id
* @return Tree or null
* @throws IOException for I/O error or unexpected object type.
+ * @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk#addTree(AnyObjectId)}.
*/
+ @Deprecated
public Tree mapTree(final ObjectId id) throws IOException {
final ObjectLoader or = openObject(id);
if (or == null)
* @param revstr
* @return a Tag or null
* @throws IOException on I/O error or unexpected type
+ * @deprecated Use {@link #resolve(String)} and feed its return value to
+ * {@link org.eclipse.jgit.revwalk.RevWalk#parseTag(AnyObjectId)}.
*/
+ @Deprecated
public Tag mapTag(String revstr) throws IOException {
final ObjectId id = resolve(revstr);
return id != null ? mapTag(revstr, id) : null;
* @param id
* @return Commit or null
* @throws IOException for I/O error or unexpected object type.
+ * @deprecated Use {@link org.eclipse.jgit.revwalk.RevWalk#parseTag(AnyObjectId)}.
*/
+ @Deprecated
public Tag mapTag(final String refName, final ObjectId id) throws IOException {
final ObjectLoader or = openObject(id);
if (or == null)
* A tree entry representing a symbolic link.
*
* Note. Java cannot really handle these as file system objects.
+ *
+ * @deprecated To look up information about a single path, use
+ * {@link org.eclipse.jgit.treewalk.TreeWalk#forPath(Repository, String, org.eclipse.jgit.revwalk.RevTree)}.
+ * To lookup information about multiple paths at once, use a
+ * {@link org.eclipse.jgit.treewalk.TreeWalk} and obtain the current entry's
+ * information from its getter methods.
*/
+@Deprecated
public class SymlinkTreeEntry extends TreeEntry {
private static final long serialVersionUID = 1L;
/**
* A representation of a Git tree entry. A Tree is a directory in Git.
+ *
+ * @deprecated To look up information about a single path, use
+ * {@link org.eclipse.jgit.treewalk.TreeWalk#forPath(Repository, String, org.eclipse.jgit.revwalk.RevTree)}.
+ * To lookup information about multiple paths at once, use a
+ * {@link org.eclipse.jgit.treewalk.TreeWalk} and obtain the current entry's
+ * information from its getter methods.
*/
+@Deprecated
public class Tree extends TreeEntry implements Treeish {
private static final TreeEntry[] EMPTY_TREE = {};
/**
* This class represents an entry in a tree, like a blob or another tree.
+ *
+ * @deprecated To look up information about a single path, use
+ * {@link org.eclipse.jgit.treewalk.TreeWalk#forPath(Repository, String, org.eclipse.jgit.revwalk.RevTree)}.
+ * To lookup information about multiple paths at once, use a
+ * {@link org.eclipse.jgit.treewalk.TreeWalk} and obtain the current entry's
+ * information from its getter methods.
*/
+@Deprecated
public abstract class TreeEntry implements Comparable {
/**
* a flag for {@link TreeEntry#accept(TreeVisitor, int)} to visit only modified entries
* Default is to only visit leafs. An {@link Order} value can be supplied to
* make the iteration include Tree nodes as well either before or after the
* child nodes have been visited.
+ *
+ * @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk} instead.
*/
+@Deprecated
public class TreeIterator implements Iterator<TreeEntry> {
private Tree tree;
/**
* A TreeVisitor is invoked depth first for every node in a tree and is expected
* to perform different actions.
+ *
+ * @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk} instead.
*/
+@Deprecated
public interface TreeVisitor {
/**
* Visit to a tree node before child nodes are visited.
/**
* Abstract TreeVisitor for visiting all files known by a Tree.
+ *
+ * @deprecated Use {@link org.eclipse.jgit.treewalk.TreeWalk} instead, with a
+ * {@link org.eclipse.jgit.treewalk.FileTreeIterator} as one of its members.
*/
+@Deprecated
public abstract class TreeVisitorWithCurrentDirectory implements TreeVisitor {
private final ArrayList<File> stack = new ArrayList<File>(16);
/**
* 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
* with the index (actually a tree too).
*
* Three-way merges are no performed. See {@link #setFailOnConflict(boolean)}.
+ *
+ * @deprecated Use org.eclipse.jgit.dircache.DirCacheCheckout.
*/
+@Deprecated
public class WorkDirCheckout {
File root;
/**
* A tree visitor for writing a directory tree to the git object database. Blob
* data is fetched from the files, not the cached blobs.
+ *
+ * @deprecated Use {@link org.eclipse.jgit.dircache.DirCache} instead.
*/
+@Deprecated
public class WriteTree extends TreeVisitorWithCurrentDirectory {
private final ObjectWriter ow;
return c;
}
+ /**
+ * Locate a reference to a tag without loading it.
+ * <p>
+ * The tag may or may not exist in the repository. It is impossible to tell
+ * from this method's return value.
+ *
+ * @param id
+ * name of the tag object.
+ * @return reference to the tag object. Never null.
+ */
+ public RevTag lookupTag(final AnyObjectId id) {
+ RevTag c = (RevTag) objects.get(id);
+ if (c == null) {
+ c = new RevTag(id);
+ objects.add(c);
+ }
+ return c;
+ }
+
/**
* Locate a reference to any object without loading it.
* <p>
return t;
}
+ /**
+ * Locate a reference to an annotated tag and immediately parse its content.
+ * <p>
+ * Unlike {@link #lookupTag(AnyObjectId)} this method only returns
+ * successfully if the tag object exists, is verified to be a tag, and was
+ * parsed without error.
+ *
+ * @param id
+ * name of the tag object.
+ * @return reference to the tag object. Never null.
+ * @throws MissingObjectException
+ * the supplied tag does not exist.
+ * @throws IncorrectObjectTypeException
+ * the supplied id is not a tag or an annotated tag.
+ * @throws IOException
+ * a pack file or loose object could not be read.
+ */
+ public RevTag parseTag(final AnyObjectId id) throws MissingObjectException,
+ IncorrectObjectTypeException, IOException {
+ RevObject c = parseAny(id);
+ if (!(c instanceof RevTag))
+ throw new IncorrectObjectTypeException(id.toObjectId(),
+ Constants.TYPE_TAG);
+ return (RevTag) c;
+ }
+
/**
* Locate a reference to any object and immediately parse its headers.
* <p>
* @throws IOException
* a loose object or pack file could not be read.
*/
- public int addTree(final ObjectId id) throws MissingObjectException,
+ public int addTree(final AnyObjectId id) throws MissingObjectException,
IncorrectObjectTypeException, CorruptObjectException, IOException {
return addTree(parserFor(id));
}
projects / jgit.git / commitdiff