Browse Source
* stable-3.3:
Update scripts to deploy jgit on Maven central
Prepare 3.3.1-SNAPSHOT builds
JGit v3.3.0.201403021825-r
Fix merge/cherry-picking in CRLF mode
Expose the received pack size in ReceivePack
Revert "Add getPackFile to ReceivePack to make PostReceiveHook more usable"
Avoid an NPE after 7b01a53692
Add a launcher for Java 7 tests
Remove obsolete getRepositoryMethod from WorkingTreeIterator
Fix NPE when WorkingTreeIterator does not have a repository set
Add getPackFile to ReceivePack to make PostReceiveHook more usable
Possibility to limit the max pack size on receive-pack
Package httpclient and httpcore in o.e.j.http.apache.feature
Change-Id: I814a150980854bbaabd767f97b062d247af6cb50
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-3.4
Matthias Sohn
11 years ago
70 changed files with 830 additions and 299 deletions
@ -0,0 +1,165 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2014, Matthias Sohn <matthias.sohn@sap.com> |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
package org.eclipse.jgit.http.test; |
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals; |
||||||
|
|
||||||
|
import java.util.Collection; |
||||||
|
import java.util.Collections; |
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest; |
||||||
|
|
||||||
|
import org.eclipse.jetty.servlet.ServletContextHandler; |
||||||
|
import org.eclipse.jetty.servlet.ServletHolder; |
||||||
|
import org.eclipse.jgit.errors.RepositoryNotFoundException; |
||||||
|
import org.eclipse.jgit.http.server.GitServlet; |
||||||
|
import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory; |
||||||
|
import org.eclipse.jgit.junit.TestRepository; |
||||||
|
import org.eclipse.jgit.junit.http.HttpTestCase; |
||||||
|
import org.eclipse.jgit.lib.Constants; |
||||||
|
import org.eclipse.jgit.lib.NullProgressMonitor; |
||||||
|
import org.eclipse.jgit.lib.ObjectId; |
||||||
|
import org.eclipse.jgit.lib.Repository; |
||||||
|
import org.eclipse.jgit.lib.StoredConfig; |
||||||
|
import org.eclipse.jgit.revwalk.RevBlob; |
||||||
|
import org.eclipse.jgit.revwalk.RevCommit; |
||||||
|
import org.eclipse.jgit.transport.PostReceiveHook; |
||||||
|
import org.eclipse.jgit.transport.PushResult; |
||||||
|
import org.eclipse.jgit.transport.ReceiveCommand; |
||||||
|
import org.eclipse.jgit.transport.ReceivePack; |
||||||
|
import org.eclipse.jgit.transport.RemoteRefUpdate; |
||||||
|
import org.eclipse.jgit.transport.Transport; |
||||||
|
import org.eclipse.jgit.transport.URIish; |
||||||
|
import org.eclipse.jgit.transport.resolver.RepositoryResolver; |
||||||
|
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; |
||||||
|
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; |
||||||
|
import org.junit.Before; |
||||||
|
import org.junit.Test; |
||||||
|
|
||||||
|
public class MeasurePackSizeTest extends HttpTestCase { |
||||||
|
private Repository remoteRepository; |
||||||
|
|
||||||
|
private URIish remoteURI; |
||||||
|
|
||||||
|
long packSize = -1; |
||||||
|
|
||||||
|
@Before |
||||||
|
public void setUp() throws Exception { |
||||||
|
super.setUp(); |
||||||
|
|
||||||
|
final TestRepository<Repository> src = createTestRepository(); |
||||||
|
final String srcName = src.getRepository().getDirectory().getName(); |
||||||
|
|
||||||
|
ServletContextHandler app = server.addContext("/git"); |
||||||
|
GitServlet gs = new GitServlet(); |
||||||
|
gs.setRepositoryResolver(new RepositoryResolver<HttpServletRequest>() { |
||||||
|
public Repository open(HttpServletRequest req, String name) |
||||||
|
throws RepositoryNotFoundException, |
||||||
|
ServiceNotEnabledException { |
||||||
|
if (!name.equals(srcName)) |
||||||
|
throw new RepositoryNotFoundException(name); |
||||||
|
|
||||||
|
final Repository db = src.getRepository(); |
||||||
|
db.incrementOpen(); |
||||||
|
return db; |
||||||
|
} |
||||||
|
}); |
||||||
|
gs.setReceivePackFactory(new DefaultReceivePackFactory() { |
||||||
|
public ReceivePack create(HttpServletRequest req, Repository db) |
||||||
|
throws ServiceNotEnabledException, |
||||||
|
ServiceNotAuthorizedException { |
||||||
|
ReceivePack recv = super.create(req, db); |
||||||
|
recv.setPostReceiveHook(new PostReceiveHook() { |
||||||
|
|
||||||
|
public void onPostReceive(ReceivePack rp, |
||||||
|
Collection<ReceiveCommand> commands) { |
||||||
|
packSize = rp.getPackSize(); |
||||||
|
} |
||||||
|
}); |
||||||
|
return recv; |
||||||
|
} |
||||||
|
|
||||||
|
}); |
||||||
|
app.addServlet(new ServletHolder(gs), "/*"); |
||||||
|
|
||||||
|
server.setUp(); |
||||||
|
|
||||||
|
remoteRepository = src.getRepository(); |
||||||
|
remoteURI = toURIish(app, srcName); |
||||||
|
|
||||||
|
StoredConfig cfg = remoteRepository.getConfig(); |
||||||
|
cfg.setBoolean("http", null, "receivepack", true); |
||||||
|
cfg.save(); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testPush_packSize() throws Exception { |
||||||
|
final TestRepository src = createTestRepository(); |
||||||
|
final RevBlob Q_txt = src |
||||||
|
.blob("some blob content to measure pack size"); |
||||||
|
final RevCommit Q = src.commit().add("Q", Q_txt).create(); |
||||||
|
final Repository db = src.getRepository(); |
||||||
|
final String dstName = Constants.R_HEADS + "new.branch"; |
||||||
|
Transport t; |
||||||
|
PushResult result; |
||||||
|
|
||||||
|
t = Transport.open(db, remoteURI); |
||||||
|
try { |
||||||
|
final String srcExpr = Q.name(); |
||||||
|
final boolean forceUpdate = false; |
||||||
|
final String localName = null; |
||||||
|
final ObjectId oldId = null; |
||||||
|
|
||||||
|
RemoteRefUpdate update = new RemoteRefUpdate(src.getRepository(), |
||||||
|
srcExpr, dstName, forceUpdate, localName, oldId); |
||||||
|
result = t.push(NullProgressMonitor.INSTANCE, |
||||||
|
Collections.singleton(update)); |
||||||
|
} finally { |
||||||
|
t.close(); |
||||||
|
} |
||||||
|
assertEquals("expected 1 RemoteUpdate", 1, result.getRemoteUpdates() |
||||||
|
.size()); |
||||||
|
assertEquals("unexpected pack size", 1398, packSize); |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
@ -0,0 +1,20 @@ |
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
||||||
|
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig"> |
||||||
|
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> |
||||||
|
<listEntry value="/org.eclipse.jgit.java7.test"/> |
||||||
|
</listAttribute> |
||||||
|
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> |
||||||
|
<listEntry value="4"/> |
||||||
|
</listAttribute> |
||||||
|
<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> |
||||||
|
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> |
||||||
|
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> |
||||||
|
</listAttribute> |
||||||
|
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.jgit.java7.test"/> |
||||||
|
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> |
||||||
|
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> |
||||||
|
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> |
||||||
|
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> |
||||||
|
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> |
||||||
|
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.java7.test"/> |
||||||
|
</launchConfiguration> |
||||||
@ -0,0 +1,69 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2014, Sasa Zivkov <sasa.zivkov@sap.com>, SAP AG |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
|
||||||
|
package org.eclipse.jgit.errors; |
||||||
|
|
||||||
|
import java.io.IOException; |
||||||
|
import java.text.MessageFormat; |
||||||
|
|
||||||
|
import org.eclipse.jgit.internal.JGitText; |
||||||
|
|
||||||
|
/** |
||||||
|
* Thrown when a pack exceeds a given size limit |
||||||
|
* |
||||||
|
* @since 3.3 |
||||||
|
*/ |
||||||
|
public class TooLargePackException extends IOException { |
||||||
|
private static final long serialVersionUID = 1L; |
||||||
|
|
||||||
|
/** |
||||||
|
* Construct a too large pack exception. |
||||||
|
* |
||||||
|
* @param packSizeLimit |
||||||
|
* the pack size limit (in bytes) that was exceeded |
||||||
|
*/ |
||||||
|
public TooLargePackException(long packSizeLimit) { |
||||||
|
super(MessageFormat.format(JGitText.get().receivePackTooLarge, |
||||||
|
Long.valueOf(packSizeLimit))); |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,154 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2007 The Guava Authors |
||||||
|
* Copyright (C) 2014, Sasa Zivkov <sasa.zivkov@sap.com>, SAP AG |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
|
||||||
|
package org.eclipse.jgit.util.io; |
||||||
|
|
||||||
|
import java.io.FilterInputStream; |
||||||
|
import java.io.IOException; |
||||||
|
import java.io.InputStream; |
||||||
|
|
||||||
|
/** |
||||||
|
* Wraps a {@link InputStream}, limiting the number of bytes which can be |
||||||
|
* read. |
||||||
|
* |
||||||
|
* This class was copied and modifed from the Google Guava 16.0. Differently from |
||||||
|
* the original Guava code, when a caller tries to read from this stream past |
||||||
|
* the given limit and the wrapped stream hasn't yet reached its EOF this class
|
||||||
|
* will call the limitExceeded method instead of returning EOF. |
||||||
|
* |
||||||
|
* @since 3.3 |
||||||
|
*/ |
||||||
|
public abstract class LimitedInputStream extends FilterInputStream { |
||||||
|
|
||||||
|
private long left; |
||||||
|
/** Max number of bytes to be read from the wrapped stream */ |
||||||
|
protected final long limit; |
||||||
|
private long mark = -1; |
||||||
|
|
||||||
|
/** |
||||||
|
* Create a new LimitedInputStream |
||||||
|
* |
||||||
|
* @param in an InputStream |
||||||
|
* @param limit max number of bytes to read from the InputStream |
||||||
|
*/ |
||||||
|
protected LimitedInputStream(InputStream in, long limit) { |
||||||
|
super(in); |
||||||
|
left = limit; |
||||||
|
this.limit = limit; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public int available() throws IOException { |
||||||
|
return (int) Math.min(in.available(), left); |
||||||
|
} |
||||||
|
|
||||||
|
// it's okay to mark even if mark isn't supported, as reset won't work
|
||||||
|
@Override |
||||||
|
public synchronized void mark(int readLimit) { |
||||||
|
in.mark(readLimit); |
||||||
|
mark = left; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public int read() throws IOException { |
||||||
|
if (left == 0) { |
||||||
|
if (in.available() == 0) |
||||||
|
return -1; |
||||||
|
else |
||||||
|
limitExceeded(); |
||||||
|
} |
||||||
|
|
||||||
|
int result = in.read(); |
||||||
|
if (result != -1) |
||||||
|
--left; |
||||||
|
return result; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public int read(byte[] b, int off, int len) throws IOException { |
||||||
|
if (left == 0) { |
||||||
|
if (in.available() == 0) |
||||||
|
return -1; |
||||||
|
else |
||||||
|
limitExceeded(); |
||||||
|
} |
||||||
|
|
||||||
|
len = (int) Math.min(len, left); |
||||||
|
int result = in.read(b, off, len); |
||||||
|
if (result != -1) |
||||||
|
left -= result; |
||||||
|
return result; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public synchronized void reset() throws IOException { |
||||||
|
if (!in.markSupported()) |
||||||
|
throw new IOException("Mark not supported"); |
||||||
|
|
||||||
|
if (mark == -1) |
||||||
|
throw new IOException("Mark not set"); |
||||||
|
|
||||||
|
in.reset(); |
||||||
|
left = mark; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public long skip(long n) throws IOException { |
||||||
|
n = Math.min(n, left); |
||||||
|
long skipped = in.skip(n); |
||||||
|
left -= skipped; |
||||||
|
return skipped; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* Called when trying to read past the given {@link #limit} and the wrapped |
||||||
|
* InputStream {@link #in} hasn't yet reached its EOF |
||||||
|
* |
||||||
|
* @throws IOException |
||||||
|
* subclasses can throw an IOException when the limit is exceeded. |
||||||
|
* The throws IOException will be forwarded back to the caller of |
||||||
|
* the read method which read the stream past the limit. |
||||||
|
*/ |
||||||
|
protected abstract void limitExceeded() throws IOException; |
||||||
|
} |
||||||
Loading…
Reference in new issue