Browse Source

Add constants for parsing git wire protocol version

This would allow other JGit users to access and reuse the constants.

Change-Id: I1608802f45586af5f8582afa592e26679e9cebe3
Signed-off-by: David Ostrovsky <david@ostrovsky.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v5.10.0.202012021225-rc1
David Ostrovsky 3 years ago
parent
commit
23389a6323

+ 10
- 4
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java View File

import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.junit.http.AccessEvent; import org.eclipse.jgit.junit.http.AccessEvent;
import org.eclipse.jgit.junit.http.AppServer; import org.eclipse.jgit.junit.http.AppServer;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.transport.PacketLineIn; import org.eclipse.jgit.transport.PacketLineIn;
import org.eclipse.jgit.transport.PacketLineOut; import org.eclipse.jgit.transport.PacketLineOut;
import org.eclipse.jgit.transport.Transport; import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.TransferConfig;
import org.eclipse.jgit.transport.URIish; import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.transport.http.HttpConnection; import org.eclipse.jgit.transport.http.HttpConnection;


@Test @Test
public void testV2HttpFirstResponse() throws Exception { public void testV2HttpFirstResponse() throws Exception {
remoteRepository.getRepository().getConfig().setInt(
"protocol", null, "version", 2);
remoteRepository.getRepository().getConfig().setString(
ConfigConstants.CONFIG_PROTOCOL_SECTION, null,
ConfigConstants.CONFIG_KEY_VERSION,
TransferConfig.ProtocolVersion.V2.version());


String url = smartAuthNoneURI.toString() + "/info/refs?service=git-upload-pack"; String url = smartAuthNoneURI.toString() + "/info/refs?service=git-upload-pack";
HttpConnection c = HttpTransport.getConnectionFactory() HttpConnection c = HttpTransport.getConnectionFactory()


@Test @Test
public void testV2HttpSubsequentResponse() throws Exception { public void testV2HttpSubsequentResponse() throws Exception {
remoteRepository.getRepository().getConfig().setInt(
"protocol", null, "version", 2);
remoteRepository.getRepository().getConfig().setString(
ConfigConstants.CONFIG_PROTOCOL_SECTION, null,
ConfigConstants.CONFIG_KEY_VERSION,
TransferConfig.ProtocolVersion.V2.version());


String url = smartAuthNoneURI.toString() + "/git-upload-pack"; String url = smartAuthNoneURI.toString() + "/git-upload-pack";
HttpConnection c = HttpTransport.getConnectionFactory() HttpConnection c = HttpTransport.getConnectionFactory()

+ 7
- 2
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java View File

import org.eclipse.jgit.internal.storage.pack.CachedPack; import org.eclipse.jgit.internal.storage.pack.CachedPack;
import org.eclipse.jgit.internal.storage.pack.CachedPackUriProvider; import org.eclipse.jgit.internal.storage.pack.CachedPackUriProvider;
import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectInserter;


ByteArrayInputStream send = linesAsInputStream(inputLines); ByteArrayInputStream send = linesAsInputStream(inputLines);


server.getConfig().setString("protocol", null, "version", "2");
server.getConfig().setString(ConfigConstants.CONFIG_PROTOCOL_SECTION,
null, ConfigConstants.CONFIG_KEY_VERSION,
TransferConfig.ProtocolVersion.V2.version());
UploadPack up = new UploadPack(server); UploadPack up = new UploadPack(server);
if (postConstructionSetup != null) { if (postConstructionSetup != null) {
postConstructionSetup.accept(up); postConstructionSetup.accept(up);


@Test @Test
public void testGetPeerAgentProtocolV2() throws Exception { public void testGetPeerAgentProtocolV2() throws Exception {
server.getConfig().setString("protocol", null, "version", "2");
server.getConfig().setString(ConfigConstants.CONFIG_PROTOCOL_SECTION,
null, ConfigConstants.CONFIG_KEY_VERSION,
TransferConfig.ProtocolVersion.V2.version());


RevCommit one = remote.commit().message("1").create(); RevCommit one = remote.commit().message("1").create();
remote.update("one", one); remote.update("one", one);

+ 7
- 1
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java View File

*/ */
public static final String CONFIG_GPG_SECTION = "gpg"; public static final String CONFIG_GPG_SECTION = "gpg";


/**
* The "protocol" section
* @since 5.9
*/
public static final String CONFIG_PROTOCOL_SECTION = "protocol";

/** /**
* The "format" key * The "format" key
* @since 5.2 * @since 5.2
public static final String CONFIG_INDEX_SECTION = "index"; public static final String CONFIG_INDEX_SECTION = "index";


/** /**
* The "index.version" key
* The "version" key
* *
* @since 5.9 * @since 5.9
*/ */

+ 24
- 4
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java View File

import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.annotations.Nullable;
import org.eclipse.jgit.internal.storage.file.LazyObjectIdSetFile; import org.eclipse.jgit.internal.storage.file.LazyObjectIdSetFile;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Config.SectionParser; import org.eclipse.jgit.lib.Config.SectionParser;
import org.eclipse.jgit.lib.ObjectChecker; import org.eclipse.jgit.lib.ObjectChecker;
import org.eclipse.jgit.lib.ObjectIdSet; import org.eclipse.jgit.lib.ObjectIdSet;
} }


/** /**
* A git configuration variable for which versions of the Git protocol to prefer.
* Used in protocol.version.
* A git configuration variable for which versions of the Git protocol to
* prefer. Used in protocol.version.
*
* @since 5.9
*/ */
enum ProtocolVersion {
public enum ProtocolVersion {
/**
* Git wire protocol version 0 (the default).
*/
V0("0"), //$NON-NLS-1$ V0("0"), //$NON-NLS-1$
/**
* Git wire protocol version 2.
*/
V2("2"); //$NON-NLS-1$ V2("2"); //$NON-NLS-1$


final String name; final String name;
this.name = name; this.name = name;
} }


/**
* Returns version number
*
* @return string version
*/
public String version() {
return name;
}

@Nullable @Nullable
static ProtocolVersion parse(@Nullable String name) { static ProtocolVersion parse(@Nullable String name) {
if (name == null) { if (name == null) {
"uploadpack", "allowreachablesha1inwant", false); "uploadpack", "allowreachablesha1inwant", false);
allowFilter = rc.getBoolean( allowFilter = rc.getBoolean(
"uploadpack", "allowfilter", false); "uploadpack", "allowfilter", false);
protocolVersion = ProtocolVersion.parse(rc.getString("protocol", null, "version"));
protocolVersion = ProtocolVersion.parse(rc
.getString(ConfigConstants.CONFIG_PROTOCOL_SECTION, null,
ConfigConstants.CONFIG_KEY_VERSION));
hideRefs = rc.getStringList("uploadpack", null, "hiderefs"); hideRefs = rc.getStringList("uploadpack", null, "hiderefs");
allowSidebandAll = rc.getBoolean( allowSidebandAll = rc.getBoolean(
"uploadpack", "allowsidebandall", false); "uploadpack", "allowsidebandall", false);

Loading…
Cancel
Save