12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156 |
- package org.eclipse.jgit.transport;
-
- import static org.hamcrest.Matchers.containsString;
- import static org.hamcrest.Matchers.hasItems;
- import static org.hamcrest.Matchers.is;
- import static org.hamcrest.Matchers.notNullValue;
- import static org.hamcrest.Matchers.theInstance;
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertNotNull;
- import static org.junit.Assert.assertThat;
- import static org.junit.Assert.assertTrue;
- import static org.junit.Assert.fail;
-
- import java.io.ByteArrayInputStream;
- import java.io.ByteArrayOutputStream;
- import java.io.IOException;
- import java.io.StringWriter;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collections;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
-
- import org.eclipse.jgit.dircache.DirCache;
- import org.eclipse.jgit.dircache.DirCacheBuilder;
- import org.eclipse.jgit.dircache.DirCacheEntry;
- import org.eclipse.jgit.errors.PackProtocolException;
- import org.eclipse.jgit.errors.TransportException;
- import org.eclipse.jgit.internal.storage.dfs.DfsGarbageCollector;
- import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
- import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
- import org.eclipse.jgit.junit.TestRepository;
- import org.eclipse.jgit.lib.NullProgressMonitor;
- import org.eclipse.jgit.lib.ObjectId;
- import org.eclipse.jgit.lib.ObjectInserter;
- import org.eclipse.jgit.lib.PersonIdent;
- import org.eclipse.jgit.lib.ProgressMonitor;
- import org.eclipse.jgit.lib.Ref;
- import org.eclipse.jgit.lib.Repository;
- import org.eclipse.jgit.lib.Sets;
- import org.eclipse.jgit.lib.TextProgressMonitor;
- import org.eclipse.jgit.revwalk.RevBlob;
- import org.eclipse.jgit.revwalk.RevCommit;
- import org.eclipse.jgit.revwalk.RevTag;
- import org.eclipse.jgit.revwalk.RevTree;
- import org.eclipse.jgit.storage.pack.PackStatistics;
- import org.eclipse.jgit.transport.UploadPack.RequestPolicy;
- import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
- import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
- import org.eclipse.jgit.transport.resolver.UploadPackFactory;
- import org.eclipse.jgit.util.io.NullOutputStream;
- import org.hamcrest.Matchers;
- import org.junit.After;
- import org.junit.Before;
- import org.junit.Rule;
- import org.junit.Test;
- import org.junit.rules.ExpectedException;
-
- /**
- * Tests for server upload-pack utilities.
- */
- public class UploadPackTest {
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
- private URIish uri;
-
- private TestProtocol<Object> testProtocol;
-
- private Object ctx = new Object();
-
- private InMemoryRepository server;
-
- private InMemoryRepository client;
-
- private TestRepository<InMemoryRepository> remote;
-
- private PackStatistics stats;
-
- @Before
- public void setUp() throws Exception {
- server = newRepo("server");
- client = newRepo("client");
-
- remote = new TestRepository<>(server);
- }
-
- @After
- public void tearDown() {
- Transport.unregister(testProtocol);
- }
-
- private static InMemoryRepository newRepo(String name) {
- return new InMemoryRepository(new DfsRepositoryDescription(name));
- }
-
- private void generateBitmaps(InMemoryRepository repo) throws Exception {
- new DfsGarbageCollector(repo).pack(null);
- repo.scanForRepoChanges();
- }
-
- private static TestProtocol<Object> generateReachableCommitUploadPackProtocol() {
- return new TestProtocol<>(
- new UploadPackFactory<Object>() {
- @Override
- public UploadPack create(Object req, Repository db)
- throws ServiceNotEnabledException,
- ServiceNotAuthorizedException {
- UploadPack up = new UploadPack(db);
- up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT);
- return up;
- }
- }, null);
- }
-
- @Test
- public void testFetchParentOfShallowCommit() throws Exception {
- RevCommit commit0 = remote.commit().message("0").create();
- RevCommit commit1 = remote.commit().message("1").parent(commit0).create();
- RevCommit tip = remote.commit().message("2").parent(commit1).create();
- remote.update("master", tip);
-
- testProtocol = new TestProtocol<>(
- new UploadPackFactory<Object>() {
- @Override
- public UploadPack create(Object req, Repository db)
- throws ServiceNotEnabledException,
- ServiceNotAuthorizedException {
- UploadPack up = new UploadPack(db);
- up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT);
- // assume client has a shallow commit
- up.getRevWalk().assumeShallow(
- Collections.singleton(commit1.getId()));
- return up;
- }
- }, null);
- uri = testProtocol.register(ctx, server);
-
- assertFalse(client.getObjectDatabase().has(commit0.toObjectId()));
-
- // Fetch of the parent of the shallow commit
- try (Transport tn = testProtocol.open(uri, client, "server")) {
- tn.fetch(NullProgressMonitor.INSTANCE,
- Collections.singletonList(new RefSpec(commit0.name())));
- assertTrue(client.getObjectDatabase().has(commit0.toObjectId()));
- }
- }
-
- @Test
- public void testFetchUnreachableBlobWithBitmap() throws Exception {
- RevBlob blob = remote.blob("foo");
- remote.commit(remote.tree(remote.file("foo", blob)));
- generateBitmaps(server);
-
- testProtocol = generateReachableCommitUploadPackProtocol();
- uri = testProtocol.register(ctx, server);
-
- assertFalse(client.getObjectDatabase().has(blob.toObjectId()));
-
- try (Transport tn = testProtocol.open(uri, client, "server")) {
- thrown.expect(TransportException.class);
- thrown.expectMessage(Matchers.containsString(
- "want " + blob.name() + " not valid"));
- tn.fetch(NullProgressMonitor.INSTANCE,
- Collections.singletonList(new RefSpec(blob.name())));
- }
- }
-
- @Test
- public void testFetchReachableBlobWithBitmap() throws Exception {
- RevBlob blob = remote.blob("foo");
- RevCommit commit = remote.commit(remote.tree(remote.file("foo", blob)));
- remote.update("master", commit);
- generateBitmaps(server);
-
- testProtocol = generateReachableCommitUploadPackProtocol();
- uri = testProtocol.register(ctx, server);
-
- assertFalse(client.getObjectDatabase().has(blob.toObjectId()));
-
- try (Transport tn = testProtocol.open(uri, client, "server")) {
- tn.fetch(NullProgressMonitor.INSTANCE,
- Collections.singletonList(new RefSpec(blob.name())));
- assertTrue(client.getObjectDatabase().has(blob.toObjectId()));
- }
- }
-
- @Test
- public void testFetchReachableBlobWithoutBitmap() throws Exception {
- RevBlob blob = remote.blob("foo");
- RevCommit commit = remote.commit(remote.tree(remote.file("foo", blob)));
- remote.update("master", commit);
-
- testProtocol = generateReachableCommitUploadPackProtocol();
- uri = testProtocol.register(ctx, server);
-
- assertFalse(client.getObjectDatabase().has(blob.toObjectId()));
-
- try (Transport tn = testProtocol.open(uri, client, "server")) {
- thrown.expect(TransportException.class);
- thrown.expectMessage(Matchers.containsString(
- "want " + blob.name() + " not valid"));
- tn.fetch(NullProgressMonitor.INSTANCE,
- Collections.singletonList(new RefSpec(blob.name())));
- }
- }
-
- @Test
- public void testFetchWithBlobNoneFilter() throws Exception {
- InMemoryRepository server2 = newRepo("server2");
- try (TestRepository<InMemoryRepository> remote2 = new TestRepository<>(
- server2)) {
- RevBlob blob1 = remote2.blob("foobar");
- RevBlob blob2 = remote2.blob("fooba");
- RevTree tree = remote2.tree(remote2.file("1", blob1),
- remote2.file("2", blob2));
- RevCommit commit = remote2.commit(tree);
- remote2.update("master", commit);
-
- server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
- true);
-
- testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
- @Override
- public UploadPack create(Object req, Repository db)
- throws ServiceNotEnabledException,
- ServiceNotAuthorizedException {
- UploadPack up = new UploadPack(db);
- return up;
- }
- }, null);
- uri = testProtocol.register(ctx, server2);
-
- try (Transport tn = testProtocol.open(uri, client, "server2")) {
- tn.setFilterSpec(FilterSpec.withBlobLimit(0));
- tn.fetch(NullProgressMonitor.INSTANCE,
- Collections.singletonList(new RefSpec(commit.name())));
- assertTrue(client.getObjectDatabase().has(tree.toObjectId()));
- assertFalse(client.getObjectDatabase().has(blob1.toObjectId()));
- assertFalse(client.getObjectDatabase().has(blob2.toObjectId()));
- }
- }
- }
-
- @Test
- public void testFetchExplicitBlobWithFilter() throws Exception {
- InMemoryRepository server2 = newRepo("server2");
- try (TestRepository<InMemoryRepository> remote2 = new TestRepository<>(
- server2)) {
- RevBlob blob1 = remote2.blob("foobar");
- RevBlob blob2 = remote2.blob("fooba");
- RevTree tree = remote2.tree(remote2.file("1", blob1),
- remote2.file("2", blob2));
- RevCommit commit = remote2.commit(tree);
- remote2.update("master", commit);
- remote2.update("a_blob", blob1);
-
- server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
- true);
-
- testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
- @Override
- public UploadPack create(Object req, Repository db)
- throws ServiceNotEnabledException,
- ServiceNotAuthorizedException {
- UploadPack up = new UploadPack(db);
- return up;
- }
- }, null);
- uri = testProtocol.register(ctx, server2);
-
- try (Transport tn = testProtocol.open(uri, client, "server2")) {
- tn.setFilterSpec(FilterSpec.withBlobLimit(0));
- tn.fetch(NullProgressMonitor.INSTANCE, Arrays.asList(
- new RefSpec(commit.name()), new RefSpec(blob1.name())));
- assertTrue(client.getObjectDatabase().has(tree.toObjectId()));
- assertTrue(client.getObjectDatabase().has(blob1.toObjectId()));
- assertFalse(client.getObjectDatabase().has(blob2.toObjectId()));
- }
- }
- }
-
- @Test
- public void testFetchWithBlobLimitFilter() throws Exception {
- InMemoryRepository server2 = newRepo("server2");
- try (TestRepository<InMemoryRepository> remote2 = new TestRepository<>(
- server2)) {
- RevBlob longBlob = remote2.blob("foobar");
- RevBlob shortBlob = remote2.blob("fooba");
- RevTree tree = remote2.tree(remote2.file("1", longBlob),
- remote2.file("2", shortBlob));
- RevCommit commit = remote2.commit(tree);
- remote2.update("master", commit);
-
- server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
- true);
-
- testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
- @Override
- public UploadPack create(Object req, Repository db)
- throws ServiceNotEnabledException,
- ServiceNotAuthorizedException {
- UploadPack up = new UploadPack(db);
- return up;
- }
- }, null);
- uri = testProtocol.register(ctx, server2);
-
- try (Transport tn = testProtocol.open(uri, client, "server2")) {
- tn.setFilterSpec(FilterSpec.withBlobLimit(5));
- tn.fetch(NullProgressMonitor.INSTANCE,
- Collections.singletonList(new RefSpec(commit.name())));
- assertFalse(
- client.getObjectDatabase().has(longBlob.toObjectId()));
- assertTrue(
- client.getObjectDatabase().has(shortBlob.toObjectId()));
- }
- }
- }
-
- @Test
- public void testFetchExplicitBlobWithFilterAndBitmaps() throws Exception {
- InMemoryRepository server2 = newRepo("server2");
- try (TestRepository<InMemoryRepository> remote2 = new TestRepository<>(
- server2)) {
- RevBlob blob1 = remote2.blob("foobar");
- RevBlob blob2 = remote2.blob("fooba");
- RevTree tree = remote2.tree(remote2.file("1", blob1),
- remote2.file("2", blob2));
- RevCommit commit = remote2.commit(tree);
- remote2.update("master", commit);
- remote2.update("a_blob", blob1);
-
- server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
- true);
-
- // generate bitmaps
- new DfsGarbageCollector(server2).pack(null);
- server2.scanForRepoChanges();
-
- testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
- @Override
- public UploadPack create(Object req, Repository db)
- throws ServiceNotEnabledException,
- ServiceNotAuthorizedException {
- UploadPack up = new UploadPack(db);
- return up;
- }
- }, null);
- uri = testProtocol.register(ctx, server2);
-
- try (Transport tn = testProtocol.open(uri, client, "server2")) {
- tn.setFilterSpec(FilterSpec.withBlobLimit(0));
- tn.fetch(NullProgressMonitor.INSTANCE, Arrays.asList(
- new RefSpec(commit.name()), new RefSpec(blob1.name())));
- assertTrue(client.getObjectDatabase().has(blob1.toObjectId()));
- assertFalse(client.getObjectDatabase().has(blob2.toObjectId()));
- }
- }
- }
-
- @Test
- public void testFetchWithBlobLimitFilterAndBitmaps() throws Exception {
- InMemoryRepository server2 = newRepo("server2");
- try (TestRepository<InMemoryRepository> remote2 = new TestRepository<>(
- server2)) {
- RevBlob longBlob = remote2.blob("foobar");
- RevBlob shortBlob = remote2.blob("fooba");
- RevTree tree = remote2.tree(remote2.file("1", longBlob),
- remote2.file("2", shortBlob));
- RevCommit commit = remote2.commit(tree);
- remote2.update("master", commit);
-
- server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
- true);
-
- // generate bitmaps
- new DfsGarbageCollector(server2).pack(null);
- server2.scanForRepoChanges();
-
- testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
- @Override
- public UploadPack create(Object req, Repository db)
- throws ServiceNotEnabledException,
- ServiceNotAuthorizedException {
- UploadPack up = new UploadPack(db);
- return up;
- }
- }, null);
- uri = testProtocol.register(ctx, server2);
-
- try (Transport tn = testProtocol.open(uri, client, "server2")) {
- tn.setFilterSpec(FilterSpec.withBlobLimit(5));
- tn.fetch(NullProgressMonitor.INSTANCE,
- Collections.singletonList(new RefSpec(commit.name())));
- assertFalse(
- client.getObjectDatabase().has(longBlob.toObjectId()));
- assertTrue(
- client.getObjectDatabase().has(shortBlob.toObjectId()));
- }
- }
- }
-
- @Test
- public void testFetchWithNonSupportingServer() throws Exception {
- InMemoryRepository server2 = newRepo("server2");
- try (TestRepository<InMemoryRepository> remote2 = new TestRepository<>(
- server2)) {
- RevBlob blob = remote2.blob("foo");
- RevTree tree = remote2.tree(remote2.file("1", blob));
- RevCommit commit = remote2.commit(tree);
- remote2.update("master", commit);
-
- server2.getConfig().setBoolean("uploadpack", null, "allowfilter",
- false);
-
- testProtocol = new TestProtocol<>(new UploadPackFactory<Object>() {
- @Override
- public UploadPack create(Object req, Repository db)
- throws ServiceNotEnabledException,
- ServiceNotAuthorizedException {
- UploadPack up = new UploadPack(db);
- return up;
- }
- }, null);
- uri = testProtocol.register(ctx, server2);
-
- try (Transport tn = testProtocol.open(uri, client, "server2")) {
- tn.setFilterSpec(FilterSpec.withBlobLimit(0));
-
- thrown.expect(TransportException.class);
- thrown.expectMessage(
- "filter requires server to advertise that capability");
-
- tn.fetch(NullProgressMonitor.INSTANCE,
- Collections.singletonList(new RefSpec(commit.name())));
- }
- }
- }
-
- /*
- * Invokes UploadPack with protocol v2 and sends it the given lines,
- * and returns UploadPack's output stream.
- */
- private ByteArrayInputStream uploadPackV2Setup(RequestPolicy requestPolicy,
- RefFilter refFilter, ProtocolV2Hook hook, String... inputLines)
- throws Exception {
-
- ByteArrayInputStream send = linesAsInputStream(inputLines);
-
- server.getConfig().setString("protocol", null, "version", "2");
- UploadPack up = new UploadPack(server);
- if (requestPolicy != null)
- up.setRequestPolicy(requestPolicy);
- if (refFilter != null)
- up.setRefFilter(refFilter);
- up.setExtraParameters(Sets.of("version=2"));
- if (hook != null) {
- up.setProtocolV2Hook(hook);
- }
-
- ByteArrayOutputStream recv = new ByteArrayOutputStream();
- up.upload(send, recv, null);
- stats = up.getStatistics();
-
- return new ByteArrayInputStream(recv.toByteArray());
- }
-
- private static ByteArrayInputStream linesAsInputStream(String... inputLines)
- throws IOException {
- try (ByteArrayOutputStream send = new ByteArrayOutputStream()) {
- PacketLineOut pckOut = new PacketLineOut(send);
- for (String line : inputLines) {
- if (line == PacketLineIn.END) {
- pckOut.end();
- } else if (line == PacketLineIn.DELIM) {
- pckOut.writeDelim();
- } else {
- pckOut.writeString(line);
- }
- }
- return new ByteArrayInputStream(send.toByteArray());
- }
- }
-
- /*
- * Invokes UploadPack with protocol v2 and sends it the given lines.
- * Returns UploadPack's output stream, not including the capability
- * advertisement by the server.
- */
- private ByteArrayInputStream uploadPackV2(RequestPolicy requestPolicy,
- RefFilter refFilter, ProtocolV2Hook hook, String... inputLines)
- throws Exception {
- ByteArrayInputStream recvStream =
- uploadPackV2Setup(requestPolicy, refFilter, hook, inputLines);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- // drain capabilities
- while (pckIn.readString() != PacketLineIn.END) {
- // do nothing
- }
- return recvStream;
- }
-
- private ByteArrayInputStream uploadPackV2(String... inputLines) throws Exception {
- return uploadPackV2(null, null, null, inputLines);
- }
-
- private static class TestV2Hook implements ProtocolV2Hook {
- private CapabilitiesV2Request capabilitiesRequest;
-
- private LsRefsV2Request lsRefsRequest;
-
- private FetchV2Request fetchRequest;
-
- @Override
- public void onCapabilities(CapabilitiesV2Request req) {
- capabilitiesRequest = req;
- }
-
- @Override
- public void onLsRefs(LsRefsV2Request req) {
- lsRefsRequest = req;
- }
-
- @Override
- public void onFetch(FetchV2Request req) {
- fetchRequest = req;
- }
- }
-
- @Test
- public void testV2Capabilities() throws Exception {
- TestV2Hook hook = new TestV2Hook();
- ByteArrayInputStream recvStream =
- uploadPackV2Setup(null, null, hook, PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(hook.capabilitiesRequest, notNullValue());
- assertThat(pckIn.readString(), is("version 2"));
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString(),
- pckIn.readString()),
- // TODO(jonathantanmy) This check is written this way
- // to make it simple to see that we expect this list of
- // capabilities, but probably should be loosened to
- // allow additional commands to be added to the list,
- // and additional capabilities to be added to existing
- // commands without requiring test changes.
- hasItems("ls-refs", "fetch=shallow", "server-option"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2CapabilitiesAllowFilter() throws Exception {
- server.getConfig().setBoolean("uploadpack", null, "allowfilter", true);
- ByteArrayInputStream recvStream =
- uploadPackV2Setup(null, null, null, PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("version 2"));
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString(),
- pckIn.readString()),
- // TODO(jonathantanmy) This check overspecifies the
- // order of the capabilities of "fetch".
- hasItems("ls-refs", "fetch=filter shallow", "server-option"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2CapabilitiesRefInWant() throws Exception {
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant", true);
- ByteArrayInputStream recvStream =
- uploadPackV2Setup(null, null, null, PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("version 2"));
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString(),
- pckIn.readString()),
- // TODO(jonathantanmy) This check overspecifies the
- // order of the capabilities of "fetch".
- hasItems("ls-refs", "fetch=ref-in-want shallow",
- "server-option"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2CapabilitiesRefInWantNotAdvertisedIfUnallowed() throws Exception {
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant", false);
- ByteArrayInputStream recvStream =
- uploadPackV2Setup(null, null, null, PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("version 2"));
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString(),
- pckIn.readString()),
- hasItems("ls-refs", "fetch=shallow", "server-option"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2CapabilitiesRefInWantNotAdvertisedIfAdvertisingForbidden() throws Exception {
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant", true);
- server.getConfig().setBoolean("uploadpack", null, "advertiserefinwant", false);
- ByteArrayInputStream recvStream =
- uploadPackV2Setup(null, null, null, PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("version 2"));
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString(),
- pckIn.readString()),
- hasItems("ls-refs", "fetch=shallow", "server-option"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2EmptyRequest() throws Exception {
- ByteArrayInputStream recvStream = uploadPackV2(PacketLineIn.END);
- // Verify that there is nothing more after the capability
- // advertisement.
- assertEquals(0, recvStream.available());
- }
-
- @Test
- public void testV2LsRefs() throws Exception {
- RevCommit tip = remote.commit().message("message").create();
- remote.update("master", tip);
- server.updateRef("HEAD").link("refs/heads/master");
- RevTag tag = remote.tag("tag", tip);
- remote.update("refs/tags/tag", tag);
-
- TestV2Hook hook = new TestV2Hook();
- ByteArrayInputStream recvStream = uploadPackV2(null, null, hook,
- "command=ls-refs\n", PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(hook.lsRefsRequest, notNullValue());
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " HEAD"));
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/master"));
- assertThat(pckIn.readString(), is(tag.toObjectId().getName() + " refs/tags/tag"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2LsRefsSymrefs() throws Exception {
- RevCommit tip = remote.commit().message("message").create();
- remote.update("master", tip);
- server.updateRef("HEAD").link("refs/heads/master");
- RevTag tag = remote.tag("tag", tip);
- remote.update("refs/tags/tag", tag);
-
- ByteArrayInputStream recvStream = uploadPackV2("command=ls-refs\n", PacketLineIn.DELIM, "symrefs", PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " HEAD symref-target:refs/heads/master"));
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/master"));
- assertThat(pckIn.readString(), is(tag.toObjectId().getName() + " refs/tags/tag"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2LsRefsPeel() throws Exception {
- RevCommit tip = remote.commit().message("message").create();
- remote.update("master", tip);
- server.updateRef("HEAD").link("refs/heads/master");
- RevTag tag = remote.tag("tag", tip);
- remote.update("refs/tags/tag", tag);
-
- ByteArrayInputStream recvStream = uploadPackV2("command=ls-refs\n", PacketLineIn.DELIM, "peel", PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " HEAD"));
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/master"));
- assertThat(
- pckIn.readString(),
- is(tag.toObjectId().getName() + " refs/tags/tag peeled:"
- + tip.toObjectId().getName()));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2LsRefsMultipleCommands() throws Exception {
- RevCommit tip = remote.commit().message("message").create();
- remote.update("master", tip);
- server.updateRef("HEAD").link("refs/heads/master");
- RevTag tag = remote.tag("tag", tip);
- remote.update("refs/tags/tag", tag);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=ls-refs\n", PacketLineIn.DELIM, "symrefs", "peel", PacketLineIn.END,
- "command=ls-refs\n", PacketLineIn.DELIM, PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " HEAD symref-target:refs/heads/master"));
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/master"));
- assertThat(
- pckIn.readString(),
- is(tag.toObjectId().getName() + " refs/tags/tag peeled:"
- + tip.toObjectId().getName()));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " HEAD"));
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/master"));
- assertThat(pckIn.readString(), is(tag.toObjectId().getName() + " refs/tags/tag"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2LsRefsRefPrefix() throws Exception {
- RevCommit tip = remote.commit().message("message").create();
- remote.update("master", tip);
- remote.update("other", tip);
- remote.update("yetAnother", tip);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=ls-refs\n",
- PacketLineIn.DELIM,
- "ref-prefix refs/heads/maste",
- "ref-prefix refs/heads/other",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/master"));
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/other"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2LsRefsRefPrefixNoSlash() throws Exception {
- RevCommit tip = remote.commit().message("message").create();
- remote.update("master", tip);
- remote.update("other", tip);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=ls-refs\n",
- PacketLineIn.DELIM,
- "ref-prefix refs/heads/maste",
- "ref-prefix r",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/master"));
- assertThat(pckIn.readString(), is(tip.toObjectId().getName() + " refs/heads/other"));
- assertTrue(pckIn.readString() == PacketLineIn.END);
- }
-
- @Test
- public void testV2LsRefsUnrecognizedArgument() throws Exception {
- thrown.expect(PackProtocolException.class);
- thrown.expectMessage("unexpected invalid-argument");
- uploadPackV2(
- "command=ls-refs\n",
- PacketLineIn.DELIM,
- "invalid-argument\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2LsRefsServerOptions() throws Exception {
- String[] lines = { "command=ls-refs\n",
- "server-option=one\n", "server-option=two\n",
- PacketLineIn.DELIM,
- PacketLineIn.END };
-
- TestV2Hook testHook = new TestV2Hook();
- uploadPackV2Setup(null, null, testHook, lines);
-
- LsRefsV2Request req = testHook.lsRefsRequest;
- assertEquals(2, req.getServerOptions().size());
- assertThat(req.getServerOptions(), hasItems("one", "two"));
- }
-
- /*
- * Parse multiplexed packfile output from upload-pack using protocol V2
- * into the client repository.
- */
- private ReceivedPackStatistics parsePack(ByteArrayInputStream recvStream) throws Exception {
- return parsePack(recvStream, NullProgressMonitor.INSTANCE);
- }
-
- private ReceivedPackStatistics parsePack(ByteArrayInputStream recvStream, ProgressMonitor pm)
- throws Exception {
- SideBandInputStream sb = new SideBandInputStream(
- recvStream, pm,
- new StringWriter(), NullOutputStream.INSTANCE);
- PackParser pp = client.newObjectInserter().newPackParser(sb);
- pp.parse(NullProgressMonitor.INSTANCE);
-
- // Ensure that there is nothing left in the stream.
- assertEquals(-1, recvStream.read());
-
- return pp.getReceivedPackStatistics();
- }
-
- @Test
- public void testV2FetchRequestPolicyAdvertised() throws Exception {
- RevCommit advertized = remote.commit().message("x").create();
- RevCommit unadvertized = remote.commit().message("y").create();
- remote.update("branch1", advertized);
-
- // This works
- uploadPackV2(
- RequestPolicy.ADVERTISED,
- null,
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + advertized.name() + "\n",
- PacketLineIn.END);
-
- // This doesn't
- thrown.expect(TransportException.class);
- thrown.expectMessage(Matchers.containsString(
- "want " + unadvertized.name() + " not valid"));
- uploadPackV2(
- RequestPolicy.ADVERTISED,
- null,
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + unadvertized.name() + "\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchRequestPolicyReachableCommit() throws Exception {
- RevCommit reachable = remote.commit().message("x").create();
- RevCommit advertized = remote.commit().message("x").parent(reachable).create();
- RevCommit unreachable = remote.commit().message("y").create();
- remote.update("branch1", advertized);
-
- // This works
- uploadPackV2(
- RequestPolicy.REACHABLE_COMMIT,
- null,
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + reachable.name() + "\n",
- PacketLineIn.END);
-
- // This doesn't
- thrown.expect(TransportException.class);
- thrown.expectMessage(Matchers.containsString(
- "want " + unreachable.name() + " not valid"));
- uploadPackV2(
- RequestPolicy.REACHABLE_COMMIT,
- null,
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + unreachable.name() + "\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchRequestPolicyTip() throws Exception {
- RevCommit parentOfTip = remote.commit().message("x").create();
- RevCommit tip = remote.commit().message("y").parent(parentOfTip).create();
- remote.update("secret", tip);
-
- // This works
- uploadPackV2(
- RequestPolicy.TIP,
- new RejectAllRefFilter(),
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + tip.name() + "\n",
- PacketLineIn.END);
-
- // This doesn't
- thrown.expect(TransportException.class);
- thrown.expectMessage(Matchers.containsString(
- "want " + parentOfTip.name() + " not valid"));
- uploadPackV2(
- RequestPolicy.TIP,
- new RejectAllRefFilter(),
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + parentOfTip.name() + "\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchRequestPolicyReachableCommitTip() throws Exception {
- RevCommit parentOfTip = remote.commit().message("x").create();
- RevCommit tip = remote.commit().message("y").parent(parentOfTip).create();
- RevCommit unreachable = remote.commit().message("y").create();
- remote.update("secret", tip);
-
- // This works
- uploadPackV2(
- RequestPolicy.REACHABLE_COMMIT_TIP,
- new RejectAllRefFilter(),
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + parentOfTip.name() + "\n",
- PacketLineIn.END);
-
- // This doesn't
- thrown.expect(TransportException.class);
- thrown.expectMessage(Matchers.containsString(
- "want " + unreachable.name() + " not valid"));
- uploadPackV2(
- RequestPolicy.REACHABLE_COMMIT_TIP,
- new RejectAllRefFilter(),
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + unreachable.name() + "\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchRequestPolicyAny() throws Exception {
- RevCommit unreachable = remote.commit().message("y").create();
-
- // Exercise to make sure that even unreachable commits can be fetched
- uploadPackV2(
- RequestPolicy.ANY,
- null,
- null,
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + unreachable.name() + "\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchServerDoesNotStopNegotiation() throws Exception {
- RevCommit fooParent = remote.commit().message("x").create();
- RevCommit fooChild = remote.commit().message("x").parent(fooParent).create();
- RevCommit barParent = remote.commit().message("y").create();
- RevCommit barChild = remote.commit().message("y").parent(barParent).create();
- remote.update("branch1", fooChild);
- remote.update("branch2", barChild);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + fooChild.toObjectId().getName() + "\n",
- "want " + barChild.toObjectId().getName() + "\n",
- "have " + fooParent.toObjectId().getName() + "\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("acknowledgments"));
- assertThat(pckIn.readString(), is("ACK " + fooParent.toObjectId().getName()));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.END));
- }
-
- @Test
- public void testV2FetchServerStopsNegotiation() throws Exception {
- RevCommit fooParent = remote.commit().message("x").create();
- RevCommit fooChild = remote.commit().message("x").parent(fooParent).create();
- RevCommit barParent = remote.commit().message("y").create();
- RevCommit barChild = remote.commit().message("y").parent(barParent).create();
- remote.update("branch1", fooChild);
- remote.update("branch2", barChild);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + fooChild.toObjectId().getName() + "\n",
- "want " + barChild.toObjectId().getName() + "\n",
- "have " + fooParent.toObjectId().getName() + "\n",
- "have " + barParent.toObjectId().getName() + "\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("acknowledgments"));
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString()),
- hasItems(
- "ACK " + fooParent.toObjectId().getName(),
- "ACK " + barParent.toObjectId().getName()));
- assertThat(pckIn.readString(), is("ready"));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertFalse(client.getObjectDatabase().has(fooParent.toObjectId()));
- assertTrue(client.getObjectDatabase().has(fooChild.toObjectId()));
- assertFalse(client.getObjectDatabase().has(barParent.toObjectId()));
- assertTrue(client.getObjectDatabase().has(barChild.toObjectId()));
- }
-
- @Test
- public void testV2FetchClientStopsNegotiation() throws Exception {
- RevCommit fooParent = remote.commit().message("x").create();
- RevCommit fooChild = remote.commit().message("x").parent(fooParent).create();
- RevCommit barParent = remote.commit().message("y").create();
- RevCommit barChild = remote.commit().message("y").parent(barParent).create();
- remote.update("branch1", fooChild);
- remote.update("branch2", barChild);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + fooChild.toObjectId().getName() + "\n",
- "want " + barChild.toObjectId().getName() + "\n",
- "have " + fooParent.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertFalse(client.getObjectDatabase().has(fooParent.toObjectId()));
- assertTrue(client.getObjectDatabase().has(fooChild.toObjectId()));
- assertTrue(client.getObjectDatabase().has(barParent.toObjectId()));
- assertTrue(client.getObjectDatabase().has(barChild.toObjectId()));
- }
-
- @Test
- public void testV2FetchThinPack() throws Exception {
- String commonInBlob = "abcdefghijklmnopqrstuvwxyz";
-
- RevBlob parentBlob = remote.blob(commonInBlob + "a");
- RevCommit parent = remote.commit(remote.tree(remote.file("foo", parentBlob)));
- RevBlob childBlob = remote.blob(commonInBlob + "b");
- RevCommit child = remote.commit(remote.tree(remote.file("foo", childBlob)), parent);
- remote.update("branch1", child);
-
- // Pretend that we have parent to get a thin pack based on it.
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + child.toObjectId().getName() + "\n",
- "have " + parent.toObjectId().getName() + "\n",
- "thin-pack\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("packfile"));
-
- // Verify that we received a thin pack by trying to apply it
- // against the client repo, which does not have parent.
- thrown.expect(IOException.class);
- thrown.expectMessage("pack has unresolved deltas");
- parsePack(recvStream);
- }
-
- @Test
- public void testV2FetchNoProgress() throws Exception {
- RevCommit commit = remote.commit().message("x").create();
- remote.update("branch1", commit);
-
- // Without no-progress, progress is reported.
- StringWriter sw = new StringWriter();
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + commit.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream, new TextProgressMonitor(sw));
- assertFalse(sw.toString().isEmpty());
-
- // With no-progress, progress is not reported.
- sw = new StringWriter();
- recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + commit.toObjectId().getName() + "\n",
- "no-progress\n",
- "done\n",
- PacketLineIn.END);
- pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream, new TextProgressMonitor(sw));
- assertTrue(sw.toString().isEmpty());
- }
-
- @Test
- public void testV2FetchIncludeTag() throws Exception {
- RevCommit commit = remote.commit().message("x").create();
- RevTag tag = remote.tag("tag", commit);
- remote.update("branch1", commit);
- remote.update("refs/tags/tag", tag);
-
- // Without include-tag.
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + commit.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertFalse(client.getObjectDatabase().has(tag.toObjectId()));
-
- // With tag.
- recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + commit.toObjectId().getName() + "\n",
- "include-tag\n",
- "done\n",
- PacketLineIn.END);
- pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertTrue(client.getObjectDatabase().has(tag.toObjectId()));
- }
-
- @Test
- public void testV2FetchOfsDelta() throws Exception {
- String commonInBlob = "abcdefghijklmnopqrstuvwxyz";
-
- RevBlob parentBlob = remote.blob(commonInBlob + "a");
- RevCommit parent = remote.commit(remote.tree(remote.file("foo", parentBlob)));
- RevBlob childBlob = remote.blob(commonInBlob + "b");
- RevCommit child = remote.commit(remote.tree(remote.file("foo", childBlob)), parent);
- remote.update("branch1", child);
-
- // Without ofs-delta.
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + child.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- ReceivedPackStatistics stats = parsePack(recvStream);
- assertTrue(stats.getNumOfsDelta() == 0);
-
- // With ofs-delta.
- recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + child.toObjectId().getName() + "\n",
- "ofs-delta\n",
- "done\n",
- PacketLineIn.END);
- pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- stats = parsePack(recvStream);
- assertTrue(stats.getNumOfsDelta() != 0);
- }
-
- @Test
- public void testV2FetchShallow() throws Exception {
- RevCommit commonParent = remote.commit().message("parent").create();
- RevCommit fooChild = remote.commit().message("x").parent(commonParent).create();
- RevCommit barChild = remote.commit().message("y").parent(commonParent).create();
- remote.update("branch1", barChild);
-
- // Without shallow, the server thinks that we have
- // commonParent, so it doesn't send it.
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + barChild.toObjectId().getName() + "\n",
- "have " + fooChild.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertTrue(client.getObjectDatabase().has(barChild.toObjectId()));
- assertFalse(client.getObjectDatabase().has(commonParent.toObjectId()));
-
- // With shallow, the server knows that we don't have
- // commonParent, so it sends it.
- recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + barChild.toObjectId().getName() + "\n",
- "have " + fooChild.toObjectId().getName() + "\n",
- "shallow " + fooChild.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertTrue(client.getObjectDatabase().has(commonParent.toObjectId()));
- }
-
- @Test
- public void testV2FetchDeepenAndDone() throws Exception {
- RevCommit parent = remote.commit().message("parent").create();
- RevCommit child = remote.commit().message("x").parent(parent).create();
- remote.update("branch1", child);
-
- // "deepen 1" sends only the child.
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + child.toObjectId().getName() + "\n",
- "deepen 1\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("shallow-info"));
- assertThat(pckIn.readString(), is("shallow " + child.toObjectId().getName()));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertTrue(client.getObjectDatabase().has(child.toObjectId()));
- assertFalse(client.getObjectDatabase().has(parent.toObjectId()));
-
- // Without that, the parent is sent too.
- recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + child.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertTrue(client.getObjectDatabase().has(parent.toObjectId()));
- }
-
- @Test
- public void testV2FetchDeepenWithoutDone() throws Exception {
- RevCommit parent = remote.commit().message("parent").create();
- RevCommit child = remote.commit().message("x").parent(parent).create();
- remote.update("branch1", child);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + child.toObjectId().getName() + "\n",
- "deepen 1\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- // Verify that only the correct section is sent. "shallow-info"
- // is not sent because, according to the specification, it is
- // sent only if a packfile is sent.
- assertThat(pckIn.readString(), is("acknowledgments"));
- assertThat(pckIn.readString(), is("NAK"));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.END));
- }
-
- @Test
- public void testV2FetchShallowSince() throws Exception {
- PersonIdent person = new PersonIdent(remote.getRepository());
-
- RevCommit beyondBoundary = remote.commit()
- .committer(new PersonIdent(person, 1510000000, 0)).create();
- RevCommit boundary = remote.commit().parent(beyondBoundary)
- .committer(new PersonIdent(person, 1520000000, 0)).create();
- RevCommit tooOld = remote.commit()
- .committer(new PersonIdent(person, 1500000000, 0)).create();
- RevCommit merge = remote.commit().parent(boundary).parent(tooOld)
- .committer(new PersonIdent(person, 1530000000, 0)).create();
-
- remote.update("branch1", merge);
-
- // Report that we only have "boundary" as a shallow boundary.
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "shallow " + boundary.toObjectId().getName() + "\n",
- "deepen-since 1510000\n",
- "want " + merge.toObjectId().getName() + "\n",
- "have " + boundary.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("shallow-info"));
-
- // "merge" is shallow because one of its parents is committed
- // earlier than the given deepen-since time.
- assertThat(pckIn.readString(), is("shallow " + merge.toObjectId().getName()));
-
- // "boundary" is unshallow because its parent committed at or
- // later than the given deepen-since time.
- assertThat(pckIn.readString(), is("unshallow " + boundary.toObjectId().getName()));
-
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
-
- // The server does not send this because it is committed
- // earlier than the given deepen-since time.
- assertFalse(client.getObjectDatabase().has(tooOld.toObjectId()));
-
- // The server does not send this because the client claims to
- // have it.
- assertFalse(client.getObjectDatabase().has(boundary.toObjectId()));
-
- // The server sends both these commits.
- assertTrue(client.getObjectDatabase().has(beyondBoundary.toObjectId()));
- assertTrue(client.getObjectDatabase().has(merge.toObjectId()));
- }
-
- @Test
- public void testV2FetchShallowSince_excludedParentWithMultipleChildren() throws Exception {
- PersonIdent person = new PersonIdent(remote.getRepository());
-
- RevCommit base = remote.commit()
- .committer(new PersonIdent(person, 1500000000, 0)).create();
- RevCommit child1 = remote.commit().parent(base)
- .committer(new PersonIdent(person, 1510000000, 0)).create();
- RevCommit child2 = remote.commit().parent(base)
- .committer(new PersonIdent(person, 1520000000, 0)).create();
-
- remote.update("branch1", child1);
- remote.update("branch2", child2);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "deepen-since 1510000\n",
- "want " + child1.toObjectId().getName() + "\n",
- "want " + child2.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("shallow-info"));
-
- // "base" is excluded, so its children are shallow.
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString()),
- hasItems(
- "shallow " + child1.toObjectId().getName(),
- "shallow " + child2.toObjectId().getName()));
-
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
-
- // Only the children are sent.
- assertFalse(client.getObjectDatabase().has(base.toObjectId()));
- assertTrue(client.getObjectDatabase().has(child1.toObjectId()));
- assertTrue(client.getObjectDatabase().has(child2.toObjectId()));
- }
-
- @Test
- public void testV2FetchShallowSince_noCommitsSelected() throws Exception {
- PersonIdent person = new PersonIdent(remote.getRepository());
-
- RevCommit tooOld = remote.commit()
- .committer(new PersonIdent(person, 1500000000, 0)).create();
-
- remote.update("branch1", tooOld);
-
- thrown.expect(PackProtocolException.class);
- thrown.expectMessage("No commits selected for shallow request");
- uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "deepen-since 1510000\n",
- "want " + tooOld.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchDeepenNot() throws Exception {
- RevCommit one = remote.commit().message("one").create();
- RevCommit two = remote.commit().message("two").parent(one).create();
- RevCommit three = remote.commit().message("three").parent(two).create();
- RevCommit side = remote.commit().message("side").parent(one).create();
- RevCommit merge = remote.commit().message("merge")
- .parent(three).parent(side).create();
-
- remote.update("branch1", merge);
- remote.update("side", side);
-
- // The client is a shallow clone that only has "three", and
- // wants "merge" while excluding "side".
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "shallow " + three.toObjectId().getName() + "\n",
- "deepen-not side\n",
- "want " + merge.toObjectId().getName() + "\n",
- "have " + three.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("shallow-info"));
-
- // "merge" is shallow because "side" is excluded by deepen-not.
- // "two" is shallow because "one" (as parent of "side") is excluded by deepen-not.
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString()),
- hasItems(
- "shallow " + merge.toObjectId().getName(),
- "shallow " + two.toObjectId().getName()));
-
- // "three" is unshallow because its parent "two" is now available.
- assertThat(pckIn.readString(), is("unshallow " + three.toObjectId().getName()));
-
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
-
- // The server does not send these because they are excluded by
- // deepen-not.
- assertFalse(client.getObjectDatabase().has(side.toObjectId()));
- assertFalse(client.getObjectDatabase().has(one.toObjectId()));
-
- // The server does not send this because the client claims to
- // have it.
- assertFalse(client.getObjectDatabase().has(three.toObjectId()));
-
- // The server sends both these commits.
- assertTrue(client.getObjectDatabase().has(merge.toObjectId()));
- assertTrue(client.getObjectDatabase().has(two.toObjectId()));
- }
-
- @Test
- public void testV2FetchDeepenNot_excludeDescendantOfWant() throws Exception {
- RevCommit one = remote.commit().message("one").create();
- RevCommit two = remote.commit().message("two").parent(one).create();
- RevCommit three = remote.commit().message("three").parent(two).create();
- RevCommit four = remote.commit().message("four").parent(three).create();
-
- remote.update("two", two);
- remote.update("four", four);
-
- thrown.expect(PackProtocolException.class);
- thrown.expectMessage("No commits selected for shallow request");
- uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "deepen-not four\n",
- "want " + two.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchDeepenNot_supportAnnotatedTags() throws Exception {
- RevCommit one = remote.commit().message("one").create();
- RevCommit two = remote.commit().message("two").parent(one).create();
- RevCommit three = remote.commit().message("three").parent(two).create();
- RevCommit four = remote.commit().message("four").parent(three).create();
- RevTag twoTag = remote.tag("twotag", two);
-
- remote.update("refs/tags/twotag", twoTag);
- remote.update("four", four);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "deepen-not twotag\n",
- "want " + four.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("shallow-info"));
- assertThat(pckIn.readString(), is("shallow " + three.toObjectId().getName()));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertFalse(client.getObjectDatabase().has(one.toObjectId()));
- assertFalse(client.getObjectDatabase().has(two.toObjectId()));
- assertTrue(client.getObjectDatabase().has(three.toObjectId()));
- assertTrue(client.getObjectDatabase().has(four.toObjectId()));
- }
-
- @Test
- public void testV2FetchDeepenNot_excludedParentWithMultipleChildren() throws Exception {
- PersonIdent person = new PersonIdent(remote.getRepository());
-
- RevCommit base = remote.commit()
- .committer(new PersonIdent(person, 1500000000, 0)).create();
- RevCommit child1 = remote.commit().parent(base)
- .committer(new PersonIdent(person, 1510000000, 0)).create();
- RevCommit child2 = remote.commit().parent(base)
- .committer(new PersonIdent(person, 1520000000, 0)).create();
-
- remote.update("base", base);
- remote.update("branch1", child1);
- remote.update("branch2", child2);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "deepen-not base\n",
- "want " + child1.toObjectId().getName() + "\n",
- "want " + child2.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("shallow-info"));
-
- // "base" is excluded, so its children are shallow.
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString()),
- hasItems(
- "shallow " + child1.toObjectId().getName(),
- "shallow " + child2.toObjectId().getName()));
-
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
-
- // Only the children are sent.
- assertFalse(client.getObjectDatabase().has(base.toObjectId()));
- assertTrue(client.getObjectDatabase().has(child1.toObjectId()));
- assertTrue(client.getObjectDatabase().has(child2.toObjectId()));
- }
-
- @Test
- public void testV2FetchUnrecognizedArgument() throws Exception {
- thrown.expect(PackProtocolException.class);
- thrown.expectMessage("unexpected invalid-argument");
- uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "invalid-argument\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchServerOptions() throws Exception {
- String[] lines = { "command=fetch\n", "server-option=one\n",
- "server-option=two\n", PacketLineIn.DELIM,
- PacketLineIn.END };
-
- TestV2Hook testHook = new TestV2Hook();
- uploadPackV2Setup(null, null, testHook, lines);
-
- FetchV2Request req = testHook.fetchRequest;
- assertNotNull(req);
- assertEquals(2, req.getServerOptions().size());
- assertThat(req.getServerOptions(), hasItems("one", "two"));
- }
-
- @Test
- public void testV2FetchFilter() throws Exception {
- RevBlob big = remote.blob("foobar");
- RevBlob small = remote.blob("fooba");
- RevTree tree = remote.tree(remote.file("1", big),
- remote.file("2", small));
- RevCommit commit = remote.commit(tree);
- remote.update("master", commit);
-
- server.getConfig().setBoolean("uploadpack", null, "allowfilter", true);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + commit.toObjectId().getName() + "\n",
- "filter blob:limit=5\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
-
- assertFalse(client.getObjectDatabase().has(big.toObjectId()));
- assertTrue(client.getObjectDatabase().has(small.toObjectId()));
- }
-
- abstract class TreeBuilder {
- abstract void addElements(DirCacheBuilder dcBuilder) throws Exception;
-
- RevTree build() throws Exception {
- DirCache dc = DirCache.newInCore();
- DirCacheBuilder dcBuilder = dc.builder();
- addElements(dcBuilder);
- dcBuilder.finish();
- ObjectId id;
- try (ObjectInserter ins =
- remote.getRepository().newObjectInserter()) {
- id = dc.writeTree(ins);
- ins.flush();
- }
- return remote.getRevWalk().parseTree(id);
- }
- }
-
- class DeepTreePreparator {
- RevBlob blobLowDepth = remote.blob("lo");
- RevBlob blobHighDepth = remote.blob("hi");
-
- RevTree subtree = remote.tree(remote.file("1", blobHighDepth));
- RevTree rootTree = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.add(remote.file("1", blobLowDepth));
- dcBuilder.addTree(new byte[] {'2'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree);
- }
- }).build();
- RevCommit commit = remote.commit(rootTree);
-
- DeepTreePreparator() throws Exception {}
- }
-
- private void uploadV2WithTreeDepthFilter(
- long depth, ObjectId... wants) throws Exception {
- server.getConfig().setBoolean("uploadpack", null, "allowfilter", true);
-
- List<String> input = new ArrayList();
- input.add("command=fetch\n");
- input.add(PacketLineIn.DELIM);
- for (ObjectId want : wants) {
- input.add("want " + want.getName() + "\n");
- }
- input.add("filter tree:" + depth + "\n");
- input.add("done\n");
- input.add(PacketLineIn.END);
- ByteArrayInputStream recvStream =
- uploadPackV2(RequestPolicy.ANY, /*refFilter=*/null,
- /*hook=*/null, input.toArray(new String[0]));
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- }
-
- @Test
- public void testV2FetchFilterTreeDepth0() throws Exception {
- DeepTreePreparator preparator = new DeepTreePreparator();
- remote.update("master", preparator.commit);
-
- uploadV2WithTreeDepthFilter(0, preparator.commit.toObjectId());
-
- assertFalse(client.getObjectDatabase()
- .has(preparator.rootTree.toObjectId()));
- assertFalse(client.getObjectDatabase()
- .has(preparator.subtree.toObjectId()));
- assertFalse(client.getObjectDatabase()
- .has(preparator.blobLowDepth.toObjectId()));
- assertFalse(client.getObjectDatabase()
- .has(preparator.blobHighDepth.toObjectId()));
- assertEquals(1, stats.getTreesTraversed());
- }
-
- @Test
- public void testV2FetchFilterTreeDepth1_serverHasBitmap() throws Exception {
- DeepTreePreparator preparator = new DeepTreePreparator();
- remote.update("master", preparator.commit);
-
- // The bitmap should be ignored since we need to track the depth while
- // traversing the trees.
- generateBitmaps(server);
-
- uploadV2WithTreeDepthFilter(1, preparator.commit.toObjectId());
-
- assertTrue(client.getObjectDatabase()
- .has(preparator.rootTree.toObjectId()));
- assertFalse(client.getObjectDatabase()
- .has(preparator.subtree.toObjectId()));
- assertFalse(client.getObjectDatabase()
- .has(preparator.blobLowDepth.toObjectId()));
- assertFalse(client.getObjectDatabase()
- .has(preparator.blobHighDepth.toObjectId()));
- assertEquals(1, stats.getTreesTraversed());
- }
-
- @Test
- public void testV2FetchFilterTreeDepth2() throws Exception {
- DeepTreePreparator preparator = new DeepTreePreparator();
- remote.update("master", preparator.commit);
-
- uploadV2WithTreeDepthFilter(2, preparator.commit.toObjectId());
-
- assertTrue(client.getObjectDatabase()
- .has(preparator.rootTree.toObjectId()));
- assertTrue(client.getObjectDatabase()
- .has(preparator.subtree.toObjectId()));
- assertTrue(client.getObjectDatabase()
- .has(preparator.blobLowDepth.toObjectId()));
- assertFalse(client.getObjectDatabase()
- .has(preparator.blobHighDepth.toObjectId()));
- assertEquals(2, stats.getTreesTraversed());
- }
-
- /**
- * Creates a commit with the following files:
- * <pre>
- * a/x/b/foo
- * x/b/foo
- * </pre>
- * which has an identical tree in two locations: once at / and once at /a
- */
- class RepeatedSubtreePreparator {
- RevBlob foo = remote.blob("foo");
- RevTree subtree3 = remote.tree(remote.file("foo", foo));
- RevTree subtree2 = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'b'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree3);
- }
- }).build();
- RevTree subtree1 = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'x'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree2);
- }
- }).build();
- RevTree rootTree = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'a'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree1);
- dcBuilder.addTree(new byte[] {'x'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree2);
- }
- }).build();
- RevCommit commit = remote.commit(rootTree);
-
- RepeatedSubtreePreparator() throws Exception {}
- }
-
- @Test
- public void testV2FetchFilterTreeDepth_iterateOverTreeAtTwoLevels()
- throws Exception {
- // Test tree:<depth> where a tree is iterated to twice - once where a
- // subentry is too deep to be included, and again where the blob inside
- // it is shallow enough to be included.
- RepeatedSubtreePreparator preparator = new RepeatedSubtreePreparator();
- remote.update("master", preparator.commit);
-
- uploadV2WithTreeDepthFilter(4, preparator.commit.toObjectId());
-
- assertTrue(client.getObjectDatabase()
- .has(preparator.foo.toObjectId()));
- }
-
- /**
- * Creates a commit with the following files:
- * <pre>
- * a/x/b/foo
- * b/u/c/baz
- * y/x/b/foo
- * z/v/c/baz
- * </pre>
- * which has two pairs of identical trees:
- * <ul>
- * <li>one at /a and /y
- * <li>one at /b/u and /z/v
- * </ul>
- * Note that this class defines unique 8 trees (rootTree and subtree1-7)
- * which means PackStatistics should report having visited 8 trees.
- */
- class RepeatedSubtreeAtSameLevelPreparator {
- RevBlob foo = remote.blob("foo");
-
- /** foo */
- RevTree subtree1 = remote.tree(remote.file("foo", foo));
-
- /** b/foo */
- RevTree subtree2 = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'b'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree1);
- }
- }).build();
-
- /** x/b/foo */
- RevTree subtree3 = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'x'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree2);
- }
- }).build();
-
- RevBlob baz = remote.blob("baz");
-
- /** baz */
- RevTree subtree4 = remote.tree(remote.file("baz", baz));
-
- /** c/baz */
- RevTree subtree5 = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'c'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree4);
- }
- }).build();
-
- /** u/c/baz */
- RevTree subtree6 = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'u'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree5);
- }
- }).build();
-
- /** v/c/baz */
- RevTree subtree7 = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'v'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree5);
- }
- }).build();
-
- RevTree rootTree = (new TreeBuilder() {
- @Override
- void addElements(DirCacheBuilder dcBuilder) throws Exception {
- dcBuilder.addTree(new byte[] {'a'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree3);
- dcBuilder.addTree(new byte[] {'b'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree6);
- dcBuilder.addTree(new byte[] {'y'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree3);
- dcBuilder.addTree(new byte[] {'z'}, DirCacheEntry.STAGE_0,
- remote.getRevWalk().getObjectReader(), subtree7);
- }
- }).build();
- RevCommit commit = remote.commit(rootTree);
-
- RepeatedSubtreeAtSameLevelPreparator() throws Exception {}
- }
-
- @Test
- public void testV2FetchFilterTreeDepth_repeatTreeAtSameLevelIncludeFile()
- throws Exception {
- RepeatedSubtreeAtSameLevelPreparator preparator =
- new RepeatedSubtreeAtSameLevelPreparator();
- remote.update("master", preparator.commit);
-
- uploadV2WithTreeDepthFilter(5, preparator.commit.toObjectId());
-
- assertTrue(client.getObjectDatabase()
- .has(preparator.foo.toObjectId()));
- assertTrue(client.getObjectDatabase()
- .has(preparator.baz.toObjectId()));
- assertEquals(8, stats.getTreesTraversed());
- }
-
- @Test
- public void testV2FetchFilterTreeDepth_repeatTreeAtSameLevelExcludeFile()
- throws Exception {
- RepeatedSubtreeAtSameLevelPreparator preparator =
- new RepeatedSubtreeAtSameLevelPreparator();
- remote.update("master", preparator.commit);
-
- uploadV2WithTreeDepthFilter(4, preparator.commit.toObjectId());
-
- assertFalse(client.getObjectDatabase()
- .has(preparator.foo.toObjectId()));
- assertFalse(client.getObjectDatabase()
- .has(preparator.baz.toObjectId()));
- assertEquals(8, stats.getTreesTraversed());
- }
-
- @Test
- public void testWantFilteredObject() throws Exception {
- RepeatedSubtreePreparator preparator = new RepeatedSubtreePreparator();
- remote.update("master", preparator.commit);
-
- // Specify wanted blob objects that are deep enough to be filtered. We
- // should still upload them.
- uploadV2WithTreeDepthFilter(
- 3,
- preparator.commit.toObjectId(),
- preparator.foo.toObjectId());
- assertTrue(client.getObjectDatabase()
- .has(preparator.foo.toObjectId()));
-
- client = newRepo("client");
- // Specify a wanted tree object that is deep enough to be filtered. We
- // should still upload it.
- uploadV2WithTreeDepthFilter(
- 2,
- preparator.commit.toObjectId(),
- preparator.subtree3.toObjectId());
- assertTrue(client.getObjectDatabase()
- .has(preparator.foo.toObjectId()));
- assertTrue(client.getObjectDatabase()
- .has(preparator.subtree3.toObjectId()));
- }
-
- @Test
- public void testV2FetchFilterWhenNotAllowed() throws Exception {
- RevCommit commit = remote.commit().message("0").create();
- remote.update("master", commit);
-
- server.getConfig().setBoolean("uploadpack", null, "allowfilter", false);
-
- thrown.expect(PackProtocolException.class);
- thrown.expectMessage("unexpected filter blob:limit=5");
- uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want " + commit.toObjectId().getName() + "\n",
- "filter blob:limit=5\n",
- "done\n",
- PacketLineIn.END);
- }
-
- @Test
- public void testV2FetchWantRefIfNotAllowed() throws Exception {
- RevCommit one = remote.commit().message("1").create();
- remote.update("one", one);
-
- try {
- uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want-ref refs/heads/one\n",
- "done\n",
- PacketLineIn.END);
- } catch (PackProtocolException e) {
- assertThat(
- e.getMessage(),
- containsString("unexpected want-ref refs/heads/one"));
- return;
- }
- fail("expected PackProtocolException");
- }
-
- @Test
- public void testV2FetchWantRef() throws Exception {
- RevCommit one = remote.commit().message("1").create();
- RevCommit two = remote.commit().message("2").create();
- RevCommit three = remote.commit().message("3").create();
- remote.update("one", one);
- remote.update("two", two);
- remote.update("three", three);
-
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant", true);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want-ref refs/heads/one\n",
- "want-ref refs/heads/two\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("wanted-refs"));
- assertThat(
- Arrays.asList(pckIn.readString(), pckIn.readString()),
- hasItems(
- one.toObjectId().getName() + " refs/heads/one",
- two.toObjectId().getName() + " refs/heads/two"));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
-
- assertTrue(client.getObjectDatabase().has(one.toObjectId()));
- assertTrue(client.getObjectDatabase().has(two.toObjectId()));
- assertFalse(client.getObjectDatabase().has(three.toObjectId()));
- }
-
- @Test
- public void testV2FetchBadWantRef() throws Exception {
- RevCommit one = remote.commit().message("1").create();
- remote.update("one", one);
-
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant", true);
-
- try {
- uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want-ref refs/heads/one\n",
- "want-ref refs/heads/nonExistentRef\n",
- "done\n",
- PacketLineIn.END);
- } catch (PackProtocolException e) {
- assertThat(
- e.getMessage(),
- containsString("Invalid ref name: refs/heads/nonExistentRef"));
- return;
- }
- fail("expected PackProtocolException");
- }
-
- @Test
- public void testV2FetchMixedWantRef() throws Exception {
- RevCommit one = remote.commit().message("1").create();
- RevCommit two = remote.commit().message("2").create();
- RevCommit three = remote.commit().message("3").create();
- remote.update("one", one);
- remote.update("two", two);
- remote.update("three", three);
-
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant", true);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want-ref refs/heads/one\n",
- "want " + two.toObjectId().getName() + "\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
- assertThat(pckIn.readString(), is("wanted-refs"));
- assertThat(
- pckIn.readString(),
- is(one.toObjectId().getName() + " refs/heads/one"));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
-
- assertTrue(client.getObjectDatabase().has(one.toObjectId()));
- assertTrue(client.getObjectDatabase().has(two.toObjectId()));
- assertFalse(client.getObjectDatabase().has(three.toObjectId()));
- }
-
- @Test
- public void testV2FetchWantRefWeAlreadyHave() throws Exception {
- RevCommit one = remote.commit().message("1").create();
- remote.update("one", one);
-
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant", true);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want-ref refs/heads/one\n",
- "have " + one.toObjectId().getName(),
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- // The client still needs to know the hash of the object that
- // refs/heads/one points to, even though it already has the
- // object ...
- assertThat(pckIn.readString(), is("wanted-refs"));
- assertThat(
- pckIn.readString(),
- is(one.toObjectId().getName() + " refs/heads/one"));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
-
- // ... but the client does not need the object itself.
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertFalse(client.getObjectDatabase().has(one.toObjectId()));
- }
-
- @Test
- public void testV2FetchWantRefAndDeepen() throws Exception {
- RevCommit parent = remote.commit().message("parent").create();
- RevCommit child = remote.commit().message("x").parent(parent).create();
- remote.update("branch1", child);
-
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant", true);
-
- ByteArrayInputStream recvStream = uploadPackV2(
- "command=fetch\n",
- PacketLineIn.DELIM,
- "want-ref refs/heads/branch1\n",
- "deepen 1\n",
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- // shallow-info appears first, then wanted-refs.
- assertThat(pckIn.readString(), is("shallow-info"));
- assertThat(pckIn.readString(), is("shallow " + child.toObjectId().getName()));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("wanted-refs"));
- assertThat(pckIn.readString(), is(child.toObjectId().getName() + " refs/heads/branch1"));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
- assertTrue(client.getObjectDatabase().has(child.toObjectId()));
- assertFalse(client.getObjectDatabase().has(parent.toObjectId()));
- }
-
- @Test
- public void testV2FetchMissingShallow() throws Exception {
- RevCommit one = remote.commit().message("1").create();
- RevCommit two = remote.commit().message("2").parent(one).create();
- RevCommit three = remote.commit().message("3").parent(two).create();
- remote.update("three", three);
-
- server.getConfig().setBoolean("uploadpack", null, "allowrefinwant",
- true);
-
- ByteArrayInputStream recvStream = uploadPackV2("command=fetch\n",
- PacketLineIn.DELIM,
- "want-ref refs/heads/three\n",
- "deepen 3",
- "shallow 0123012301230123012301230123012301230123",
- "shallow " + two.getName() + '\n',
- "done\n",
- PacketLineIn.END);
- PacketLineIn pckIn = new PacketLineIn(recvStream);
-
- assertThat(pckIn.readString(), is("shallow-info"));
- assertThat(pckIn.readString(),
- is("shallow " + one.toObjectId().getName()));
- assertThat(pckIn.readString(),
- is("unshallow " + two.toObjectId().getName()));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("wanted-refs"));
- assertThat(pckIn.readString(),
- is(three.toObjectId().getName() + " refs/heads/three"));
- assertThat(pckIn.readString(), theInstance(PacketLineIn.DELIM));
- assertThat(pckIn.readString(), is("packfile"));
- parsePack(recvStream);
-
- assertTrue(client.getObjectDatabase().has(one.toObjectId()));
- assertTrue(client.getObjectDatabase().has(two.toObjectId()));
- assertTrue(client.getObjectDatabase().has(three.toObjectId()));
- }
-
- @Test
- public void testGetPeerAgentProtocolV0() throws Exception {
- RevCommit one = remote.commit().message("1").create();
- remote.update("one", one);
-
- UploadPack up = new UploadPack(server);
- ByteArrayInputStream send = linesAsInputStream(
- "want " + one.getName() + " agent=JGit-test/1.2.3\n",
- PacketLineIn.END,
- "have 11cedf1b796d44207da702f7d420684022fc0f09\n", "done\n");
-
- ByteArrayOutputStream recv = new ByteArrayOutputStream();
- up.upload(send, recv, null);
-
- assertEquals(up.getPeerUserAgent(), "JGit-test/1.2.3");
- }
-
- @Test
- public void testGetPeerAgentProtocolV2() throws Exception {
- server.getConfig().setString("protocol", null, "version", "2");
-
- RevCommit one = remote.commit().message("1").create();
- remote.update("one", one);
-
- UploadPack up = new UploadPack(server);
- up.setExtraParameters(Sets.of("version=2"));
-
- ByteArrayInputStream send = linesAsInputStream(
- "command=fetch\n", "agent=JGit-test/1.2.4\n",
- PacketLineIn.DELIM, "want " + one.getName() + "\n",
- "have 11cedf1b796d44207da702f7d420684022fc0f09\n", "done\n",
- PacketLineIn.END);
-
- ByteArrayOutputStream recv = new ByteArrayOutputStream();
- up.upload(send, recv, null);
-
- assertEquals(up.getPeerUserAgent(), "JGit-test/1.2.4");
- }
-
- private static class RejectAllRefFilter implements RefFilter {
- @Override
- public Map<String, Ref> filter(Map<String, Ref> refs) {
- return new HashMap<>();
- }
- }
- }
|