motiejus
/
jgit
1
Fork 0
Code Releases Activity

Use AnyLongObjectId instead of LongObjectId in LFS API 

Change-Id: I083ad1ea3e8d3685df7c306854c2498c92b05ffb
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2016-10-26 22:27:44 +02:00
parent 6dea5ec823
commit 4b7747ccff
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Lfs.java
View File

@ -46,7 +46,7 @@
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import org.eclipse.jgit.lfs.lib.LongObjectId; import org.eclipse.jgit.lfs.lib.AnyLongObjectId;
/** /**
* Class which represents the lfs folder hierarchy inside a .git folder * Class which represents the lfs folder hierarchy inside a .git folder
@ -104,8 +104,8 @@ public Path getLfsObjDir() {
* underneath * underneath
* "<repo>/.git/lfs/objects/<firstTwoLettersOfID>/<remainingLettersOfID>" * "<repo>/.git/lfs/objects/<firstTwoLettersOfID>/<remainingLettersOfID>"
*/ */
public Path getMediaFile(LongObjectId id) { public Path getMediaFile(AnyLongObjectId id) {
String idStr = LongObjectId.toString(id); String idStr = id.name();
return getLfsObjDir().resolve(idStr.substring(0, 2)) return getLfsObjDir().resolve(idStr.substring(0, 2))
.resolve(idStr.substring(2)); .resolve(idStr.substring(2));
} }

11
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java
View File

@ -50,6 +50,7 @@
import java.io.PrintStream; import java.io.PrintStream;
import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.annotations.Nullable;
import org.eclipse.jgit.lfs.lib.AnyLongObjectId;
import org.eclipse.jgit.lfs.lib.Constants; import org.eclipse.jgit.lfs.lib.Constants;
import org.eclipse.jgit.lfs.lib.LongObjectId; import org.eclipse.jgit.lfs.lib.LongObjectId;
@ -71,7 +72,7 @@ public class LfsPointer {
public static final String HASH_FUNCTION_NAME = Constants.LONG_HASH_FUNCTION public static final String HASH_FUNCTION_NAME = Constants.LONG_HASH_FUNCTION
.toLowerCase().replace("-", ""); //$NON-NLS-1$ //$NON-NLS-2$ .toLowerCase().replace("-", ""); //$NON-NLS-1$ //$NON-NLS-2$
private LongObjectId oid; private AnyLongObjectId oid;
private long size; private long size;
@ -81,7 +82,7 @@ public class LfsPointer {
* @param size * @param size
* the size of the content * the size of the content
*/ */
public LfsPointer(LongObjectId oid, long size) { public LfsPointer(AnyLongObjectId oid, long size) {
this.oid = oid; this.oid = oid;
this.size = size; this.size = size;
} }
@ -89,7 +90,7 @@ public LfsPointer(LongObjectId oid, long size) {
/** /**
* @return the id of the content * @return the id of the content
*/ */
public LongObjectId getOid() { public AnyLongObjectId getOid() {
return oid; return oid;
} }
@ -112,7 +113,7 @@ public void encode(OutputStream out) {
ps.print("version "); //$NON-NLS-1$ ps.print("version "); //$NON-NLS-1$
ps.println(VERSION); ps.println(VERSION);
ps.print("oid " + HASH_FUNCTION_NAME + ":"); //$NON-NLS-1$ //$NON-NLS-2$ ps.print("oid " + HASH_FUNCTION_NAME + ":"); //$NON-NLS-1$ //$NON-NLS-2$
ps.println(LongObjectId.toString(oid)); ps.println(oid.name());
ps.print("size "); //$NON-NLS-1$ ps.print("size "); //$NON-NLS-1$
ps.println(size); ps.println(size);
} }
@ -160,7 +161,7 @@ public static LfsPointer parseLfsPointer(InputStream in)
@Override @Override
public String toString() { public String toString() {
return "LfsPointer: oid=" + LongObjectId.toString(oid) + ", size=" //$NON-NLS-1$ //$NON-NLS-2$ return "LfsPointer: oid=" + oid.name() + ", size=" //$NON-NLS-1$ //$NON-NLS-2$
+ size; + size;
} }
} }