Show changes to 6 files +69 −26
org.spearce.jgit/src/org/spearce/jgit/transport/BaseFetchConnection.java, org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java, org.spearce.jgit/src/org/spearce/jgit/transport/FetchConnection.java, org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java, org.spearce.jgit/src/org/spearce/jgit/transport/TransportBundle.java, org.spearce.jgit/src/org/spearce/jgit/transport/WalkFetchConnection.java
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BaseFetchConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BaseFetchConnection.java
index 6709bfc..bb81296 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/BaseFetchConnection.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BaseFetchConnection.java
@@ -38,8 +38,10 @@
package org.spearce.jgit.transport;
import java.util.Collection;
+import java.util.Set;
import org.spearce.jgit.errors.TransportException;
+import org.spearce.jgit.lib.ObjectId;
import org.spearce.jgit.lib.ProgressMonitor;
import org.spearce.jgit.lib.Ref;
@@ -54,9 +56,10 @@
abstract class BaseFetchConnection extends BaseConnection implements
FetchConnection {
public final void fetch(final ProgressMonitor monitor,
- final Collection<Ref> want) throws TransportException {
+ final Collection<Ref> want, final Set<ObjectId> have)
+ throws TransportException {
markStartedOperation();
- doFetch(monitor, want);
+ doFetch(monitor, want, have);
}
/**
@@ -68,19 +71,22 @@ public boolean didFetchIncludeTags() {
}
/**
- * Implementation of {@link #fetch(ProgressMonitor, Collection)} without
- * checking for multiple fetch.
+ * Implementation of {@link #fetch(ProgressMonitor, Collection, Set)}
+ * without checking for multiple fetch.
*
* @param monitor
- * as in {@link #fetch(ProgressMonitor, Collection)}
+ * as in {@link #fetch(ProgressMonitor, Collection, Set)}
* @param want
- * as in {@link #fetch(ProgressMonitor, Collection)}
+ * as in {@link #fetch(ProgressMonitor, Collection, Set)}
+ * @param have
+ * as in {@link #fetch(ProgressMonitor, Collection, Set)}
* @throws TransportException
- * as in {@link #fetch(ProgressMonitor, Collection)}, but
+ * as in {@link #fetch(ProgressMonitor, Collection, Set)}, but
* implementation doesn't have to care about multiple
- * {@link #fetch(ProgressMonitor, Collection)} calls, as it is
- * checked in this class.
+ * {@link #fetch(ProgressMonitor, Collection, Set)} calls, as it
+ * is checked in this class.
*/
protected abstract void doFetch(final ProgressMonitor monitor,
- final Collection<Ref> want) throws TransportException;
+ final Collection<Ref> want, final Set<ObjectId> have)
+ throws TransportException;
}
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java
index 542a8a9..2cb9b64 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java
@@ -41,10 +41,12 @@
import java.io.IOException;
import java.util.Collection;
import java.util.Date;
+import java.util.Set;
import org.spearce.jgit.errors.TransportException;
import org.spearce.jgit.lib.AnyObjectId;
import org.spearce.jgit.lib.MutableObjectId;
+import org.spearce.jgit.lib.ObjectId;
import org.spearce.jgit.lib.ProgressMonitor;
import org.spearce.jgit.lib.Ref;
import org.spearce.jgit.revwalk.RevCommit;
@@ -137,9 +139,10 @@ BasePackFetchConnection(final PackTransport packTransport) {
}
public final void fetch(final ProgressMonitor monitor,
- final Collection<Ref> want) throws TransportException {
+ final Collection<Ref> want, final Set<ObjectId> have)
+ throws TransportException {
markStartedOperation();
- doFetch(monitor, want);
+ doFetch(monitor, want, have);
}
public boolean didFetchIncludeTags() {
@@ -151,10 +154,11 @@ public boolean didFetchTestConnectivity() {
}
protected void doFetch(final ProgressMonitor monitor,
- final Collection<Ref> want) throws TransportException {
+ final Collection<Ref> want, final Set<ObjectId> have)
+ throws TransportException {
try {
markRefsAdvertised();
- markReachable(maxTimeWanted(want));
+ markReachable(have, maxTimeWanted(want));
if (sendWants(want)) {
negotiate(monitor);
@@ -193,7 +197,8 @@ private int maxTimeWanted(final Collection<Ref> wants) {
return maxTime;
}
- private void markReachable(final int maxTime) throws IOException {
+ private void markReachable(final Set<ObjectId> have, final int maxTime)
+ throws IOException {
for (final Ref r : local.getAllRefs().values()) {
try {
final RevCommit o = walk.parseCommit(r.getObjectId());
@@ -204,6 +209,16 @@ private void markReachable(final int maxTime) throws IOException {
}
}
+ for (final ObjectId id : have) {
+ try {
+ final RevCommit o = walk.parseCommit(id);
+ o.add(REACHABLE);
+ reachableCommits.add(o);
+ } catch (IOException readError) {
+ // If we cannot read the value of the ref skip it.
+ }
+ }
+
if (maxTime > 0) {
// Mark reachable commits until we reach maxTime. These may
// wind up later matching up against things we want and we
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchConnection.java
index a56ca6c..61ef219 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchConnection.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchConnection.java
@@ -38,8 +38,10 @@
package org.spearce.jgit.transport;
import java.util.Collection;
+import java.util.Set;
import org.spearce.jgit.errors.TransportException;
+import org.spearce.jgit.lib.ObjectId;
import org.spearce.jgit.lib.ProgressMonitor;
import org.spearce.jgit.lib.Ref;
@@ -85,23 +87,29 @@
* @param want
* one or more refs advertised by this connection that the caller
* wants to store locally.
+ * @param have
+ * additional objects known to exist in the destination
+ * repository, especially if they aren't yet reachable by the ref
+ * database. Connections should take this set as an addition to
+ * what is reachable through all Refs, not in replace of it.
* @throws TransportException
* objects could not be copied due to a network failure,
* protocol error, or error on remote side, or connection was
* already used for fetch.
*/
- public void fetch(final ProgressMonitor monitor, final Collection<Ref> want)
+ public void fetch(final ProgressMonitor monitor,
+ final Collection<Ref> want, final Set<ObjectId> have)
throws TransportException;
/**
- * Did the last {@link #fetch(ProgressMonitor, Collection)} get tags?
+ * Did the last {@link #fetch(ProgressMonitor, Collection, Set)} get tags?
* <p>
* Some Git aware transports are able to implicitly grab an annotated tag if
* {@link TagOpt#AUTO_FOLLOW} or {@link TagOpt#FETCH_TAGS} was selected and
* the object the tag peels to (references) was transferred as part of the
- * last {@link #fetch(ProgressMonitor, Collection)} call. If it is possible
- * for such tags to have been included in the transfer this method returns
- * true, allowing the caller to attempt tag discovery.
+ * last {@link #fetch(ProgressMonitor, Collection, Set)} call. If it is
+ * possible for such tags to have been included in the transfer this method
+ * returns true, allowing the caller to attempt tag discovery.
* <p>
* By returning only true/false (and not the actual list of tags obtained)
* the transport itself does not need to be aware of whether or not tags
@@ -113,7 +121,8 @@ public void fetch(final ProgressMonitor monitor, final Collection<Ref> want)
public boolean didFetchIncludeTags();
/**
- * Did the last {@link #fetch(ProgressMonitor, Collection)} validate graph?
+ * Did the last {@link #fetch(ProgressMonitor, Collection, Set)} validate
+ * graph?
* <p>
* Some transports walk the object graph on the client side, with the client
* looking for what objects it is missing and requesting them individually
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java
index bb2d051..09718eb 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java
@@ -75,6 +75,9 @@
/** Set of refs we will actually wind up asking to obtain. */
private final HashMap<ObjectId, Ref> askFor = new HashMap<ObjectId, Ref>();
+ /** Objects we know we have locally. */
+ private final HashSet<ObjectId> have = new HashSet<ObjectId>();
+
/** Updates to local tracking branches (if any). */
private final ArrayList<TrackingRefUpdate> localUpdates = new ArrayList<TrackingRefUpdate>();
@@ -133,6 +136,7 @@ else if (tagopt == TagOpt.FETCH_TAGS)
// There are more tags that we want to follow, but
// not all were asked for on the initial request.
//
+ have.addAll(askFor.keySet());
askFor.clear();
for (final Ref r : additionalTags) {
final ObjectId id = r.getPeeledObjectId();
@@ -173,7 +177,7 @@ else if (tagopt == TagOpt.FETCH_TAGS)
private void fetchObjects(final ProgressMonitor monitor)
throws TransportException {
- conn.fetch(monitor, askFor.values());
+ conn.fetch(monitor, askFor.values(), have);
if (transport.isCheckFetchedObjects()
&& !conn.didFetchTestConnectivity() && !askForIsComplete())
throw new TransportException(transport.getURI(),
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportBundle.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportBundle.java
index 7d38b02..1734d94 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportBundle.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportBundle.java
@@ -171,7 +171,8 @@ public boolean didFetchTestConnectivity() {
@Override
protected void doFetch(final ProgressMonitor monitor,
- final Collection<Ref> want) throws TransportException {
+ final Collection<Ref> want, final Set<ObjectId> have)
+ throws TransportException {
verifyPrerequisites();
try {
final IndexPack ip = newIndexPack();
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkFetchConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkFetchConnection.java
index d089f7b..91c5ea8 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkFetchConnection.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkFetchConnection.java
@@ -195,8 +195,9 @@ public boolean didFetchTestConnectivity() {
@Override
protected void doFetch(final ProgressMonitor monitor,
- final Collection<Ref> want) throws TransportException {
- markLocalRefsComplete();
+ final Collection<Ref> want, final Set<ObjectId> have)
+ throws TransportException {
+ markLocalRefsComplete(have);
queueWants(want);
while (!monitor.isCancelled() && !workQueue.isEmpty()) {
@@ -642,7 +643,7 @@ private void saveLooseObject(final AnyObjectId id, final byte[] compressed)
return null;
}
- private void markLocalRefsComplete() throws TransportException {
+ private void markLocalRefsComplete(final Set<ObjectId> have) throws TransportException {
for (final Ref r : local.getAllRefs().values()) {
try {
markLocalObjComplete(revWalk.parseAny(r.getObjectId()));
@@ -651,6 +652,13 @@ private void markLocalRefsComplete() throws TransportException {
+ " is missing object(s).", readError);
}
}
+ for (final ObjectId id : have) {
+ try {
+ markLocalObjComplete(revWalk.parseAny(id));
+ } catch (IOException readError) {
+ throw new TransportException("Missing assumed "+id.name(), readError);
+ }
+ }
}
private void markLocalObjComplete(RevObject obj) throws IOException {
Shawn O. Pearce
