motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.9' 

* stable-5.9:
  Add constants for parsing git wire protocol version

Change-Id: I1e4174ae8bbefcb71a191dcbf32027d4b35c2b37
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2020-11-30 15:29:01 +01:00
parent c053b510b3 23389a6323
commit 180dfdefa4
5 changed files with 65 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java
View File

@ -38,6 +38,7 @@
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.junit.http.AccessEvent;
import org.eclipse.jgit.junit.http.AppServer;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate;
@ -49,6 +50,7 @@
import org.eclipse.jgit.transport.PacketLineIn;
import org.eclipse.jgit.transport.PacketLineOut;
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.TransferConfig;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.transport.http.HttpConnection;
@ -342,8 +344,10 @@ public void testHttpClientWantsV2ButServerNotConfigured() throws Exception {
@Test
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";
HttpConnection c = HttpTransport.getConnectionFactory()
@ -364,8 +368,10 @@ public void testV2HttpFirstResponse() throws Exception {
@Test
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";
HttpConnection c = HttpTransport.getConnectionFactory()

8
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
View File

@ -38,6 +38,7 @@
import org.eclipse.jgit.internal.storage.pack.CachedPack;
import org.eclipse.jgit.internal.storage.pack.CachedPackUriProvider;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
@ -370,7 +371,8 @@ private ByteArrayInputStream uploadPackSetup(String version,
ByteArrayInputStream send = linesAsInputStream(inputLines);
server.getConfig().setString("protocol", null, "version", version);
server.getConfig().setString(ConfigConstants.CONFIG_PROTOCOL_SECTION,
null, ConfigConstants.CONFIG_KEY_VERSION, version);
UploadPack up = new UploadPack(server);
if (postConstructionSetup != null) {
postConstructionSetup.accept(up);
@ -2253,7 +2255,9 @@ public void testGetPeerAgentProtocolV0() throws Exception {
@Test
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();
remote.update("one", one);

18
org.eclipse.jgit/.settings/.api_filters
View File

@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit" version="2">
<resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
<filter id="1141899266">
<message_arguments>
<message_argument value="5.9"/>
<message_argument value="5.10"/>
<message_argument value="CONFIG_PROTOCOL_SECTION"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter">
<filter id="404000815">
<message_arguments>
@ -36,4 +45,13 @@
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/transport/TransferConfig.java" type="org.eclipse.jgit.transport.TransferConfig$ProtocolVersion">
<filter id="1175453698">
<message_arguments>
<message_argument value="5.9"/>
<message_argument value="5.10"/>
<message_argument value="org.eclipse.jgit.transport.TransferConfig.ProtocolVersion"/>
</message_arguments>
</filter>
</resource>
</component>

8
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
View File

@ -92,6 +92,12 @@ public final class ConfigConstants {
*/
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
* @since 5.2
@ -685,7 +691,7 @@ public final class ConfigConstants {
public static final String CONFIG_INDEX_SECTION = "index";
/**
* The "index.version" key
* The "version" key
*
* @since 5.9
*/

28
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransferConfig.java
View File

@ -21,6 +21,7 @@
import org.eclipse.jgit.annotations.Nullable;
import org.eclipse.jgit.internal.storage.file.LazyObjectIdSetFile;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Config.SectionParser;
import org.eclipse.jgit.lib.ObjectChecker;
import org.eclipse.jgit.lib.ObjectIdSet;
@ -60,11 +61,19 @@ public enum FsckMode {
}
/**
* 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$
/**
* Git wire protocol version 2.
*/
V2("2"); //$NON-NLS-1$
final String name;
@ -73,6 +82,15 @@ enum ProtocolVersion {
this.name = name;
}
/**
* Returns version number
*
* @return string version
*/
public String version() {
return name;
}
@Nullable
static ProtocolVersion parse(@Nullable String name) {
if (name == null) {
@ -177,7 +195,9 @@ public TransferConfig(Config rc) {
"uploadpack", "allowreachablesha1inwant", false);
allowFilter = rc.getBoolean(
"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");
allowSidebandAll = rc.getBoolean(
"uploadpack", "allowsidebandall", false);