aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Borowitz2012-03-07 15:52:19 (EST)
committerDave Borowitz2012-03-07 15:52:47 (EST)
commit2b0044f2225d5ba10c74a5f4b210a9301ab06a60 (patch)
treed134473bc4a23fce43f311e9d98ded3fc6e77a79
parenteea8581da5b61fb882be24e5657528b761a379e0 (diff)
downloadjgit-2b0044f2225d5ba10c74a5f4b210a9301ab06a60.zip
jgit-2b0044f2225d5ba10c74a5f4b210a9301ab06a60.tar.gz
jgit-2b0044f2225d5ba10c74a5f4b210a9301ab06a60.tar.bz2
Make capability strings in BasePack{Fetch,Push}Connection publicrefs/changes/94/5294/1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java30
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java12
2 files changed, 28 insertions, 14 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
index 4a86da7..e71b64f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
@@ -120,25 +120,35 @@ public abstract class BasePackFetchConnection extends BasePackConnection
*/
protected static final int MIN_CLIENT_BUFFER = 2 * 32 * 46 + 8;
- static final String OPTION_INCLUDE_TAG = "include-tag";
+ /** Include tags if we are also including the referenced objects. */
+ public static final String OPTION_INCLUDE_TAG = "include-tag";
- static final String OPTION_MULTI_ACK = "multi_ack";
+ /** Mutli-ACK support for improved negotiation. */
+ public static final String OPTION_MULTI_ACK = "multi_ack";
- static final String OPTION_MULTI_ACK_DETAILED = "multi_ack_detailed";
+ /** Mutli-ACK detailed support for improved negotiation. */
+ public static final String OPTION_MULTI_ACK_DETAILED = "multi_ack_detailed";
- static final String OPTION_THIN_PACK = "thin-pack";
+ /** The client supports packs with deltas but not their bases. */
+ public static final String OPTION_THIN_PACK = "thin-pack";
- static final String OPTION_SIDE_BAND = "side-band";
+ /** The client supports using the side-band for progress messages. */
+ public static final String OPTION_SIDE_BAND = "side-band";
- static final String OPTION_SIDE_BAND_64K = "side-band-64k";
+ /** The client supports using the 64K side-band for progress messages. */
+ public static final String OPTION_SIDE_BAND_64K = "side-band-64k";
- static final String OPTION_OFS_DELTA = "ofs-delta";
+ /** The client supports packs with OFS deltas. */
+ public static final String OPTION_OFS_DELTA = "ofs-delta";
- static final String OPTION_SHALLOW = "shallow";
+ /** The client supports shallow fetches. */
+ public static final String OPTION_SHALLOW = "shallow";
- static final String OPTION_NO_PROGRESS = "no-progress";
+ /** The client does not want progress messages and will ignore them. */
+ public static final String OPTION_NO_PROGRESS = "no-progress";
- static final String OPTION_NO_DONE = "no-done";
+ /** The client supports receiving a pack before it has sent "done". */
+ public static final String OPTION_NO_DONE = "no-done";
static enum MultiAck {
OFF, CONTINUE, DETAILED;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java
index 61f3df1..8ffca25 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java
@@ -83,13 +83,17 @@ import org.eclipse.jgit.transport.RemoteRefUpdate.Status;
*/
public abstract class BasePackPushConnection extends BasePackConnection implements
PushConnection {
- static final String CAPABILITY_REPORT_STATUS = "report-status";
+ /** The client expects a status report after the server processes the pack. */
+ public static final String CAPABILITY_REPORT_STATUS = "report-status";
- static final String CAPABILITY_DELETE_REFS = "delete-refs";
+ /** The server supports deleting refs. */
+ public static final String CAPABILITY_DELETE_REFS = "delete-refs";
- static final String CAPABILITY_OFS_DELTA = "ofs-delta";
+ /** The server supports packs with OFS deltas. */
+ public static final String CAPABILITY_OFS_DELTA = "ofs-delta";
- static final String CAPABILITY_SIDE_BAND_64K = "side-band-64k";
+ /** The client supports using the 64K side-band for progress messages. */
+ public static final String CAPABILITY_SIDE_BAND_64K = "side-band-64k";
private final boolean thinPack;