Include description for missing bundle prereqs
When throwing MissingBundlePrerequisiteException we also include the short description, if available, of each missing object. This is the fix for the following issue: http://code.google.com/p/egit/issues/detail?id=25 Change-Id: I5d45aec7873af76a12170d9a500626a7264f2c42 Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
4cfc7baf9e
commit
96690904f5
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2008, Google Inc.
|
* Copyright (C) 2008, Google Inc.
|
||||||
|
* Copyright (C) 2009, Sasa Zivkov <sasa.zivkov@sap.com>
|
||||||
* and other copyright owners as documented in the project's IP log.
|
* and other copyright owners as documented in the project's IP log.
|
||||||
*
|
*
|
||||||
* This program and the accompanying materials are made available
|
* This program and the accompanying materials are made available
|
||||||
|
@ -43,7 +44,7 @@
|
||||||
|
|
||||||
package org.eclipse.jgit.errors;
|
package org.eclipse.jgit.errors;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.eclipse.jgit.lib.ObjectId;
|
import org.eclipse.jgit.lib.ObjectId;
|
||||||
import org.eclipse.jgit.transport.URIish;
|
import org.eclipse.jgit.transport.URIish;
|
||||||
|
@ -54,12 +55,14 @@
|
||||||
public class MissingBundlePrerequisiteException extends TransportException {
|
public class MissingBundlePrerequisiteException extends TransportException {
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private static String format(final Collection<ObjectId> ids) {
|
private static String format(final Map<ObjectId, String> missingCommits) {
|
||||||
final StringBuilder r = new StringBuilder();
|
final StringBuilder r = new StringBuilder();
|
||||||
r.append("missing prerequisite commits:");
|
r.append("missing prerequisite commits:");
|
||||||
for (final ObjectId p : ids) {
|
for (final Map.Entry<ObjectId, String> e : missingCommits.entrySet()) {
|
||||||
r.append("\n ");
|
r.append("\n ");
|
||||||
r.append(p.name());
|
r.append(e.getKey().name());
|
||||||
|
if (e.getValue() != null)
|
||||||
|
r.append(" ").append(e.getValue());
|
||||||
}
|
}
|
||||||
return r.toString();
|
return r.toString();
|
||||||
}
|
}
|
||||||
|
@ -69,11 +72,12 @@ private static String format(final Collection<ObjectId> ids) {
|
||||||
*
|
*
|
||||||
* @param uri
|
* @param uri
|
||||||
* URI used for transport
|
* URI used for transport
|
||||||
* @param ids
|
* @param missingCommits
|
||||||
* the ids of the base/common object(s) we don't have.
|
* the Map of the base/common object(s) we don't have. Keys are
|
||||||
|
* ids of the missing objects and values are short descriptions.
|
||||||
*/
|
*/
|
||||||
public MissingBundlePrerequisiteException(final URIish uri,
|
public MissingBundlePrerequisiteException(final URIish uri,
|
||||||
final Collection<ObjectId> ids) {
|
final Map<ObjectId, String> missingCommits) {
|
||||||
super(uri, format(ids));
|
super(uri, format(missingCommits));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
* Copyright (C) 2008-2009, Google Inc.
|
* Copyright (C) 2008-2009, Google Inc.
|
||||||
* Copyright (C) 2009, Matthias Sohn <matthias.sohn@sap.com>
|
* Copyright (C) 2009, Matthias Sohn <matthias.sohn@sap.com>
|
||||||
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
|
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
|
||||||
|
* Copyright (C) 2009, Sasa Zivkov <sasa.zivkov@sap.com>
|
||||||
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
|
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
|
||||||
* and other copyright owners as documented in the project's IP log.
|
* and other copyright owners as documented in the project's IP log.
|
||||||
*
|
*
|
||||||
|
@ -53,9 +54,10 @@
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashSet;
|
import java.util.HashMap;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.eclipse.jgit.errors.MissingBundlePrerequisiteException;
|
import org.eclipse.jgit.errors.MissingBundlePrerequisiteException;
|
||||||
|
@ -84,7 +86,7 @@ class BundleFetchConnection extends BaseFetchConnection {
|
||||||
|
|
||||||
InputStream bin;
|
InputStream bin;
|
||||||
|
|
||||||
final Set<ObjectId> prereqs = new HashSet<ObjectId>();
|
final Map<ObjectId, String> prereqs = new HashMap<ObjectId, String>();
|
||||||
|
|
||||||
private String lockMessage;
|
private String lockMessage;
|
||||||
|
|
||||||
|
@ -129,7 +131,11 @@ private void readBundleV2() throws IOException {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (line.charAt(0) == '-') {
|
if (line.charAt(0) == '-') {
|
||||||
prereqs.add(ObjectId.fromString(line.substring(1, 41)));
|
ObjectId id = ObjectId.fromString(line.substring(1, 41));
|
||||||
|
String shortDesc = null;
|
||||||
|
if (line.length() > 42)
|
||||||
|
shortDesc = line.substring(42);
|
||||||
|
prereqs.put(id, shortDesc);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -208,9 +214,10 @@ private void verifyPrerequisites() throws TransportException {
|
||||||
final RevFlag PREREQ = rw.newFlag("PREREQ");
|
final RevFlag PREREQ = rw.newFlag("PREREQ");
|
||||||
final RevFlag SEEN = rw.newFlag("SEEN");
|
final RevFlag SEEN = rw.newFlag("SEEN");
|
||||||
|
|
||||||
final List<ObjectId> missing = new ArrayList<ObjectId>();
|
final Map<ObjectId, String> missing = new HashMap<ObjectId, String>();
|
||||||
final List<RevObject> commits = new ArrayList<RevObject>();
|
final List<RevObject> commits = new ArrayList<RevObject>();
|
||||||
for (final ObjectId p : prereqs) {
|
for (final Map.Entry<ObjectId, String> e : prereqs.entrySet()) {
|
||||||
|
ObjectId p = e.getKey();
|
||||||
try {
|
try {
|
||||||
final RevCommit c = rw.parseCommit(p);
|
final RevCommit c = rw.parseCommit(p);
|
||||||
if (!c.has(PREREQ)) {
|
if (!c.has(PREREQ)) {
|
||||||
|
@ -218,7 +225,7 @@ private void verifyPrerequisites() throws TransportException {
|
||||||
commits.add(c);
|
commits.add(c);
|
||||||
}
|
}
|
||||||
} catch (MissingObjectException notFound) {
|
} catch (MissingObjectException notFound) {
|
||||||
missing.add(p);
|
missing.put(p, e.getValue());
|
||||||
} catch (IOException err) {
|
} catch (IOException err) {
|
||||||
throw new TransportException(transport.uri, "Cannot read commit "
|
throw new TransportException(transport.uri, "Cannot read commit "
|
||||||
+ p.name(), err);
|
+ p.name(), err);
|
||||||
|
@ -252,7 +259,7 @@ private void verifyPrerequisites() throws TransportException {
|
||||||
if (remaining > 0) {
|
if (remaining > 0) {
|
||||||
for (final RevObject o : commits) {
|
for (final RevObject o : commits) {
|
||||||
if (!o.has(SEEN))
|
if (!o.has(SEEN))
|
||||||
missing.add(o);
|
missing.put(o, prereqs.get(o));
|
||||||
}
|
}
|
||||||
throw new MissingBundlePrerequisiteException(transport.uri, missing);
|
throw new MissingBundlePrerequisiteException(transport.uri, missing);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue