@ -221,41 +221,49 @@ public abstract class Repository {
} }
/ * * / * *
* @param id * Open an object from this repository .
* SHA - 1 of an object . * < p >
* This is a one - shot call interface which may be faster than allocating a
* { @link # newObjectReader ( ) } to perform the lookup .
* *
* @return a { @link ObjectLoader } for accessing the data of the named * @param objectId
* object , or null if the object does not exist . * identity of the object to open .
* @throws IOException * @return a { @link ObjectLoader } for accessing the object .
* / * @throws MissingObjectException
public ObjectLoader openObject ( final AnyObjectId id ) * the object does not exist .
throws IOException {
try {
return getObjectDatabase ( ) . openObject ( id ) ;
} catch ( MissingObjectException notFound ) {
// Legacy API, return null
return null ;
}
}
/ * *
* @param id
* SHA ' 1 of a blob
* @return an { @link ObjectLoader } for accessing the data of a named blob
* @throws IOException * @throws IOException
* the object store cannot be accessed .
* / * /
public ObjectLoader openBlob ( final ObjectId id ) throws IOException { public ObjectLoader open ( final AnyObjectId objectId )
return openObject ( id ) ; throws MissingObjectException , IOException {
return getObjectDatabase ( ) . openObject ( objectId ) ;
} }
/ * * / * *
* @param id * Open an object from this repository .
* SHA ' 1 of a tree * < p >
* @return an { @link ObjectLoader } for accessing the data of a named tree * This is a one - shot call interface which may be faster than allocating a
* { @link # newObjectReader ( ) } to perform the lookup .
*
* @param objectId
* identity of the object to open .
* @param typeHint
* hint about the type of object being requested ;
* { @link ObjectReader # OBJ_ANY } if the object type is not known ,
* or does not matter to the caller .
* @return a { @link ObjectLoader } for accessing the object .
* @throws MissingObjectException
* the object does not exist .
* @throws IncorrectObjectTypeException
* typeHint was not OBJ_ANY , and the object ' s actual type does
* not match typeHint .
* @throws IOException * @throws IOException
* the object store cannot be accessed .
* / * /
public ObjectLoader openTree ( final ObjectId id ) throws IOException { public ObjectLoader open ( AnyObjectId objectId , int typeHint )
return openObject ( id ) ; throws MissingObjectException , IncorrectObjectTypeException ,
IOException {
return getObjectDatabase ( ) . openObject ( objectId , typeHint ) ;
} }
/ * * / * *
@ -284,19 +292,22 @@ public abstract class Repository {
* @throws IOException * @throws IOException
* / * /
public Object mapObject ( final ObjectId id , final String refName ) throws IOException { public Object mapObject ( final ObjectId id , final String refName ) throws IOException {
final ObjectLoader or = openObject ( id ) ; final ObjectLoader or ;
if ( or = = null ) try {
or = open ( id ) ;
} catch ( MissingObjectException notFound ) {
return null ; return null ;
final byte [ ] raw = or . getBytes ( ) ; }
final byte [ ] raw = or . getCachedBytes ( ) ;
switch ( or . getType ( ) ) { switch ( or . getType ( ) ) {
case Constants . OBJ_TREE : case Constants . OBJ_TREE :
return makeTree ( id , raw ) ; return new Tree ( this , id , raw ) ;
case Constants . OBJ_COMMIT : case Constants . OBJ_COMMIT :
return makeCommit ( id , raw ) ; return new Commit ( this , id , raw ) ;
case Constants . OBJ_TAG : case Constants . OBJ_TAG :
return makeTag ( id , refName , raw ) ; return new Tag ( this , id , refName , raw ) ;
case Constants . OBJ_BLOB : case Constants . OBJ_BLOB :
return raw ; return raw ;
@ -314,18 +325,13 @@ public abstract class Repository {
* @throws IOException for I / O error or unexpected object type . * @throws IOException for I / O error or unexpected object type .
* / * /
public Commit mapCommit ( final ObjectId id ) throws IOException { public Commit mapCommit ( final ObjectId id ) throws IOException {
final ObjectLoader or = openObject ( id ) ; final ObjectLoader or ;
if ( or = = null ) try {
or = open ( id , Constants . OBJ_COMMIT ) ;
} catch ( MissingObjectException notFound ) {
return null ; return null ;
final byte [ ] raw = or . getBytes ( ) ; }
if ( Constants . OBJ_COMMIT = = or . getType ( ) ) return new Commit ( this , id , or . getCachedBytes ( ) ) ;
return new Commit ( this , id , raw ) ;
throw new IncorrectObjectTypeException ( id , Constants . TYPE_COMMIT ) ;
}
private Commit makeCommit ( final ObjectId id , final byte [ ] raw ) {
Commit ret = new Commit ( this , id , raw ) ;
return ret ;
} }
/ * * / * *
@ -351,10 +357,13 @@ public abstract class Repository {
* @throws IOException for I / O error or unexpected object type . * @throws IOException for I / O error or unexpected object type .
* / * /
public Tree mapTree ( final ObjectId id ) throws IOException { public Tree mapTree ( final ObjectId id ) throws IOException {
final ObjectLoader or = openObject ( id ) ; final ObjectLoader or ;
if ( or = = null ) try {
or = open ( id ) ;
} catch ( MissingObjectException notFound ) {
return null ; return null ;
final byte [ ] raw = or . getBytes ( ) ; }
final byte [ ] raw = or . getCachedBytes ( ) ;
switch ( or . getType ( ) ) { switch ( or . getType ( ) ) {
case Constants . OBJ_TREE : case Constants . OBJ_TREE :
return new Tree ( this , id , raw ) ; return new Tree ( this , id , raw ) ;
@ -367,16 +376,6 @@ public abstract class Repository {
} }
} }
private Tree makeTree ( final ObjectId id , final byte [ ] raw ) throws IOException {
Tree ret = new Tree ( this , id , raw ) ;
return ret ;
}
private Tag makeTag ( final ObjectId id , final String refName , final byte [ ] raw ) {
Tag ret = new Tag ( this , id , refName , raw ) ;
return ret ;
}
/ * * / * *
* Access a tag by symbolic name . * Access a tag by symbolic name .
* *
@ -397,12 +396,14 @@ public abstract class Repository {
* @throws IOException for I / O error or unexpected object type . * @throws IOException for I / O error or unexpected object type .
* / * /
public Tag mapTag ( final String refName , final ObjectId id ) throws IOException { public Tag mapTag ( final String refName , final ObjectId id ) throws IOException {
final ObjectLoader or = openObject ( id ) ; final ObjectLoader or ;
if ( or = = null ) try {
or = open ( id ) ;
} catch ( MissingObjectException notFound ) {
return null ; return null ;
final byte [ ] raw = or . getBytes ( ) ; }
if ( Constants . OBJ_TAG = = or . getType ( ) ) if ( or . getType ( ) = = Constants . OBJ_TAG )
return new Tag ( this , id , refName , raw ) ; return new Tag ( this , id , refName , or . getCachedBytes ( ) ) ;
return new Tag ( this , id , refName , null ) ; return new Tag ( this , id , refName , null ) ;
} }
Shawn O. Pearce
15 years ago