motiejus
/
jgit
1
Fork 0
Code Releases Activity

Download pack-*.idx to /tmp if not on local filesystem 

If the destination repository doesn't use an ObjectDirectory to
store its objects, we can't download to the object directory.
Instead pull the pack-*.idx files down to temporary files in the
JVM's default temporary directory.

Change-Id: Ied16bc89be624d87110ba42ba52d698a6ea7d982
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-06-24 11:30:19 -07:00
parent 2370ad9514
commit f39c9fc741
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java
View File

@ -70,6 +70,7 @@
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.MutableObjectId;
import org.eclipse.jgit.lib.ObjectChecker;
import org.eclipse.jgit.lib.ObjectDirectory;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PackIndex;
import org.eclipse.jgit.lib.PackLock;
@ -240,8 +241,10 @@ public void setPackLockMessage(final String message) {
@Override
public void close() {
for (final RemotePack p : unfetchedPacks)
p.tmpIdx.delete();
for (final RemotePack p : unfetchedPacks) {
if (p.tmpIdx != null)
p.tmpIdx.delete();
}
for (final WalkRemoteObjectDatabase r : remotes)
r.close();
}
@ -512,7 +515,8 @@ private boolean downloadPackedObject(final ProgressMonitor monitor,
// it failed the index and pack are unusable and we
// shouldn't consult them again.
//
pack.tmpIdx.delete();
if (pack.tmpIdx != null)
pack.tmpIdx.delete();
packItr.remove();
}
@ -788,12 +792,11 @@ private class RemotePack {
final String idxName;
final File tmpIdx;
File tmpIdx;
PackIndex index;
RemotePack(final WalkRemoteObjectDatabase c, final String pn) {
final File objdir = local.getObjectsDirectory();
connection = c;
packName = pn;
idxName = packName.substring(0, packName.length() - 5) + ".idx";
@ -803,13 +806,19 @@ private class RemotePack {
tn = tn.substring(5);
if (tn.endsWith(".idx"))
tn = tn.substring(0, tn.length() - 4);
tmpIdx = new File(objdir, "walk-" + tn + ".walkidx");
if (local.getObjectDatabase() instanceof ObjectDirectory) {
tmpIdx = new File(((ObjectDirectory) local.getObjectDatabase())
.getDirectory(), "walk-" + tn + ".walkidx");
}
}
void openIndex(final ProgressMonitor pm) throws IOException {
if (index != null)
return;
if (tmpIdx.isFile()) {
if (tmpIdx == null)
tmpIdx = File.createTempFile("jgit-walk-", ".idx");
else if (tmpIdx.isFile()) {
try {
index = PackIndex.open(tmpIdx);
return;