123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308 |
- /*
- * Copyright (C) 2010, Stefan Lay <stefan.lay@sap.com>
- * Copyright (C) 2010, Christian Halstrick <christian.halstrick@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.api;
-
- import static org.eclipse.jgit.util.FileUtils.RECURSIVE;
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertTrue;
- import static org.junit.Assert.fail;
-
- import java.io.File;
- import java.io.FileInputStream;
- import java.io.IOException;
- import java.io.PrintWriter;
- import java.util.Set;
-
- import org.eclipse.jgit.api.errors.FilterFailedException;
- import org.eclipse.jgit.api.errors.GitAPIException;
- import org.eclipse.jgit.api.errors.NoFilepatternException;
- import org.eclipse.jgit.attributes.FilterCommandRegistry;
- import org.eclipse.jgit.dircache.DirCache;
- import org.eclipse.jgit.dircache.DirCacheBuilder;
- import org.eclipse.jgit.dircache.DirCacheEntry;
- import org.eclipse.jgit.junit.JGitTestUtil;
- import org.eclipse.jgit.junit.RepositoryTestCase;
- import org.eclipse.jgit.lfs.CleanFilter;
- import org.eclipse.jgit.lfs.SmudgeFilter;
- import org.eclipse.jgit.lib.ConfigConstants;
- import org.eclipse.jgit.lib.Constants;
- import org.eclipse.jgit.lib.FileMode;
- import org.eclipse.jgit.lib.ObjectId;
- import org.eclipse.jgit.lib.ObjectInserter;
- import org.eclipse.jgit.lib.Repository;
- import org.eclipse.jgit.lib.StoredConfig;
- import org.eclipse.jgit.revwalk.RevCommit;
- import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
- import org.eclipse.jgit.treewalk.TreeWalk;
- import org.eclipse.jgit.treewalk.WorkingTreeOptions;
- import org.eclipse.jgit.util.FS;
- import org.eclipse.jgit.util.FileUtils;
- import org.junit.Test;
- import org.junit.experimental.theories.DataPoints;
- import org.junit.experimental.theories.Theories;
- import org.junit.experimental.theories.Theory;
- import org.junit.runner.RunWith;
-
- @RunWith(Theories.class)
- public class AddCommandTest extends RepositoryTestCase {
- @DataPoints
- public static boolean[] sleepBeforeAddOptions = { true, false };
-
-
- @Override
- public void setUp() throws Exception {
- CleanFilter.register();
- SmudgeFilter.register();
- super.setUp();
- }
-
- @Test
- public void testAddNothing() throws GitAPIException {
- try (Git git = new Git(db)) {
- git.add().call();
- fail("Expected IllegalArgumentException");
- } catch (NoFilepatternException e) {
- // expected
- }
-
- }
-
- @Test
- public void testAddNonExistingSingleFile() throws GitAPIException {
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
- assertEquals(0, dc.getEntryCount());
- }
- }
-
- @Test
- public void testAddExistingSingleFile() throws IOException, GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testCleanFilter() throws IOException, GitAPIException {
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
- writeTrashFile("src/a.tmp", "foo");
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- writeTrashFile("src/a.txt", "foo\n");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()));
- config.save();
-
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .call();
-
- assertEquals(
- "[src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:fee\n]",
- indexState(CONTENT));
- }
- }
-
- @Theory
- public void testBuiltinFilters(boolean sleepBeforeAdd)
- throws IOException,
- GitAPIException, InterruptedException {
- writeTrashFile(".gitattributes", "*.txt filter=lfs");
- writeTrashFile("src/a.tmp", "foo");
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- File script = writeTempFile("sed s/o/e/g");
- File f = writeTrashFile("src/a.txt", "foo\n");
-
- try (Git git = new Git(db)) {
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern(".gitattributes").call();
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "lfs", "clean",
- "sh " + slashify(script.getPath()));
- config.setString("filter", "lfs", "smudge",
- "sh " + slashify(script.getPath()));
- config.setBoolean("filter", "lfs", "useJGitBuiltin", true);
- config.save();
-
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .addFilepattern(".gitattributes").call();
-
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n]",
- indexState(CONTENT));
-
- RevCommit c1 = git.commit().setMessage("c1").call();
- assertTrue(git.status().call().isClean());
- f = writeTrashFile("src/a.txt", "foobar\n");
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern("src/a.txt").call();
- git.commit().setMessage("c2").call();
- assertTrue(git.status().call().isClean());
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:aec070645fe53ee3b3763059376134f058cc337247c978add178b6ccdfb0019f\nsize 7\n]",
- indexState(CONTENT));
- assertEquals("foobar\n", read("src/a.txt"));
- git.checkout().setName(c1.getName()).call();
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n]",
- indexState(CONTENT));
- assertEquals(
- "foo\n", read("src/a.txt"));
- }
- }
-
- @Theory
- public void testBuiltinCleanFilter(boolean sleepBeforeAdd)
- throws IOException, GitAPIException, InterruptedException {
- writeTrashFile(".gitattributes", "*.txt filter=lfs");
- writeTrashFile("src/a.tmp", "foo");
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- File script = writeTempFile("sed s/o/e/g");
- File f = writeTrashFile("src/a.txt", "foo\n");
-
- // unregister the smudge filter. Only clean filter should be builtin
- FilterCommandRegistry.unregister(
- org.eclipse.jgit.lib.Constants.BUILTIN_FILTER_PREFIX
- + "lfs/smudge");
-
- try (Git git = new Git(db)) {
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern(".gitattributes").call();
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "lfs", "clean",
- "sh " + slashify(script.getPath()));
- config.setString("filter", "lfs", "smudge",
- "sh " + slashify(script.getPath()));
- config.setBoolean("filter", "lfs", "useJGitBuiltin", true);
- config.save();
-
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .addFilepattern(".gitattributes").call();
-
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n]",
- indexState(CONTENT));
-
- RevCommit c1 = git.commit().setMessage("c1").call();
- assertTrue(git.status().call().isClean());
- f = writeTrashFile("src/a.txt", "foobar\n");
- if (!sleepBeforeAdd) {
- fsTick(f);
- }
- git.add().addFilepattern("src/a.txt").call();
- git.commit().setMessage("c2").call();
- assertTrue(git.status().call().isClean());
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:aec070645fe53ee3b3763059376134f058cc337247c978add178b6ccdfb0019f\nsize 7\n]",
- indexState(CONTENT));
- assertEquals("foobar\n", read("src/a.txt"));
- git.checkout().setName(c1.getName()).call();
- assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=lfs][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:version https://git-lfs.github.com/spec/v1\noid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n]",
- indexState(CONTENT));
- // due to lfs clean filter but dummy smudge filter we expect strange
- // content. The smudge filter converts from real content to pointer
- // file content (starting with "version ") but the smudge filter
- // replaces 'o' by 'e' which results in a text starting with
- // "versien "
- assertEquals(
- "versien https://git-lfs.github.cem/spec/v1\neid sha256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c\nsize 4\n",
- read("src/a.txt"));
- }
- }
-
- @Test
- public void testAttributesWithTreeWalkFilter()
- throws IOException, GitAPIException {
- writeTrashFile(".gitattributes", "*.txt filter=lfs");
- writeTrashFile("src/a.tmp", "foo");
- writeTrashFile("src/a.txt", "foo\n");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "lfs", "clean",
- "sh " + slashify(script.getPath()));
- config.save();
-
- git.add().addFilepattern(".gitattributes").call();
- git.commit().setMessage("attr").call();
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .addFilepattern(".gitattributes").call();
- git.commit().setMessage("c1").call();
- assertTrue(git.status().call().isClean());
- }
- }
-
- @Test
- public void testAttributesConflictingMatch() throws Exception {
- writeTrashFile(".gitattributes", "foo/** crlf=input\n*.jar binary");
- writeTrashFile("foo/bar.jar", "\r\n");
- // We end up with attributes [binary -diff -merge -text crlf=input].
- // crlf should have no effect when -text is present.
- try (Git git = new Git(db)) {
- git.add().addFilepattern(".").call();
- assertEquals(
- "[.gitattributes, mode:100644, content:foo/** crlf=input\n*.jar binary]"
- + "[foo/bar.jar, mode:100644, content:\r\n]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testCleanFilterEnvironment()
- throws IOException, GitAPIException {
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
- writeTrashFile("src/a.txt", "foo");
- File script = writeTempFile("echo $GIT_DIR; echo 1 >xyz");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()));
- config.save();
- git.add().addFilepattern("src/a.txt").call();
-
- String gitDir = db.getDirectory().getAbsolutePath();
- assertEquals("[src/a.txt, mode:100644, content:" + gitDir
- + "\n]", indexState(CONTENT));
- assertTrue(new File(db.getWorkTree(), "xyz").exists());
- }
- }
-
- @Test
- public void testMultipleCleanFilter() throws IOException, GitAPIException {
- writeTrashFile(".gitattributes",
- "*.txt filter=tstFilter\n*.tmp filter=tstFilter2");
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- writeTrashFile("src/a.tmp", "foo\n");
- writeTrashFile("src/a.txt", "foo\n");
- File script = writeTempFile("sed s/o/e/g");
- File script2 = writeTempFile("sed s/f/x/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()));
- config.setString("filter", "tstFilter2", "clean",
- "sh " + slashify(script2.getPath()));
- config.save();
-
- git.add().addFilepattern("src/a.txt").addFilepattern("src/a.tmp")
- .call();
-
- assertEquals(
- "[src/a.tmp, mode:100644, content:xoo\n][src/a.txt, mode:100644, content:fee\n]",
- indexState(CONTENT));
-
- // TODO: multiple clean filters for one file???
- }
- }
-
- /**
- * The path of an added file name contains ';' and afterwards malicious
- * commands. Make sure when calling filter commands to properly escape the
- * filenames
- *
- * @throws IOException
- * @throws GitAPIException
- */
- @Test
- public void testCommandInjection() throws IOException, GitAPIException {
- // Caution: we need a trailing '\n' since sed on mac always appends
- // linefeeds if missing
- writeTrashFile("; echo virus", "foo\n");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()) + " %f");
- writeTrashFile(".gitattributes", "* filter=tstFilter");
-
- git.add().addFilepattern("; echo virus").call();
- // Without proper escaping the content would be "feovirus". The sed
- // command and the "echo virus" would contribute to the content
- assertEquals("[; echo virus, mode:100644, content:fee\n]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testBadCleanFilter() throws IOException, GitAPIException {
- writeTrashFile("a.txt", "foo");
- File script = writeTempFile("sedfoo s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + script.getPath());
- config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
-
- try {
- git.add().addFilepattern("a.txt").call();
- fail("Didn't received the expected exception");
- } catch (FilterFailedException e) {
- assertEquals(127, e.getReturnCode());
- }
- }
- }
-
- @Test
- public void testBadCleanFilter2() throws IOException, GitAPIException {
- writeTrashFile("a.txt", "foo");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "shfoo " + script.getPath());
- config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
-
- try {
- git.add().addFilepattern("a.txt").call();
- fail("Didn't received the expected exception");
- } catch (FilterFailedException e) {
- assertEquals(127, e.getReturnCode());
- }
- }
- }
-
- @Test
- public void testCleanFilterReturning12() throws IOException,
- GitAPIException {
- writeTrashFile("a.txt", "foo");
- File script = writeTempFile("exit 12");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "clean",
- "sh " + slashify(script.getPath()));
- config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
-
- try {
- git.add().addFilepattern("a.txt").call();
- fail("Didn't received the expected exception");
- } catch (FilterFailedException e) {
- assertEquals(12, e.getReturnCode());
- }
- }
- }
-
- @Test
- public void testNotApplicableFilter() throws IOException, GitAPIException {
- writeTrashFile("a.txt", "foo");
- File script = writeTempFile("sed s/o/e/g");
-
- try (Git git = new Git(db)) {
- StoredConfig config = git.getRepository().getConfig();
- config.setString("filter", "tstFilter", "something",
- "sh " + script.getPath());
- config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
-
- git.add().addFilepattern("a.txt").call();
-
- assertEquals("[a.txt, mode:100644, content:foo]",
- indexState(CONTENT));
- }
- }
-
- private File writeTempFile(String body) throws IOException {
- File f = File.createTempFile("AddCommandTest_", "");
- JGitTestUtil.write(f, body);
- return f;
- }
-
- @Test
- public void testAddExistingSingleSmallFileWithNewLine() throws IOException,
- GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("row1\r\nrow2");
- writer.close();
-
- try (Git git = new Git(db)) {
- db.getConfig().setString("core", null, "autocrlf", "false");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\r\nrow2]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "true");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\nrow2]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "input");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\nrow2]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleMediumSizeFileWithNewLine()
- throws IOException, GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- StringBuilder data = new StringBuilder();
- for (int i = 0; i < 1000; ++i) {
- data.append("row1\r\nrow2");
- }
- String crData = data.toString();
- PrintWriter writer = new PrintWriter(file);
- writer.print(crData);
- writer.close();
- String lfData = data.toString().replaceAll("\r", "");
- try (Git git = new Git(db)) {
- db.getConfig().setString("core", null, "autocrlf", "false");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:" + data + "]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "true");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:" + lfData + "]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "input");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:" + lfData + "]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleBinaryFile() throws IOException,
- GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("row1\r\nrow2\u0000");
- writer.close();
-
- try (Git git = new Git(db)) {
- db.getConfig().setString("core", null, "autocrlf", "false");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\r\nrow2\u0000]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "true");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\r\nrow2\u0000]",
- indexState(CONTENT));
- db.getConfig().setString("core", null, "autocrlf", "input");
- git.add().addFilepattern("a.txt").call();
- assertEquals("[a.txt, mode:100644, content:row1\r\nrow2\u0000]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleFileInSubDir() throws IOException,
- GitAPIException {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub/a.txt").call();
-
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleFileTwice() throws IOException,
- GitAPIException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
-
- dc.getEntry(0).getObjectId();
-
- writer = new PrintWriter(file);
- writer.print("other content");
- writer.close();
-
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:other content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddExistingSingleFileTwiceWithCommit() throws Exception {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
-
- dc.getEntry(0).getObjectId();
-
- git.commit().setMessage("commit a.txt").call();
-
- writer = new PrintWriter(file);
- writer.print("other content");
- writer.close();
-
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:other content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddRemovedFile() throws Exception {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
-
- dc.getEntry(0).getObjectId();
- FileUtils.delete(file);
-
- // is supposed to do nothing
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddRemovedCommittedFile() throws Exception {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- try (Git git = new Git(db)) {
- DirCache dc = git.add().addFilepattern("a.txt").call();
-
- git.commit().setMessage("commit a.txt").call();
-
- dc.getEntry(0).getObjectId();
- FileUtils.delete(file);
-
- // is supposed to do nothing
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddWithConflicts() throws Exception {
- // prepare conflict
-
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- File file2 = new File(db.getWorkTree(), "b.txt");
- FileUtils.createNewFile(file2);
- writer = new PrintWriter(file2);
- writer.print("content b");
- writer.close();
-
- ObjectInserter newObjectInserter = db.newObjectInserter();
- DirCache dc = db.lockDirCache();
- DirCacheBuilder builder = dc.builder();
-
- addEntryToBuilder("b.txt", file2, newObjectInserter, builder, 0);
- addEntryToBuilder("a.txt", file, newObjectInserter, builder, 1);
-
- writer = new PrintWriter(file);
- writer.print("other content");
- writer.close();
- addEntryToBuilder("a.txt", file, newObjectInserter, builder, 3);
-
- writer = new PrintWriter(file);
- writer.print("our content");
- writer.close();
- addEntryToBuilder("a.txt", file, newObjectInserter, builder, 2)
- .getObjectId();
-
- builder.commit();
-
- assertEquals(
- "[a.txt, mode:100644, stage:1, content:content]" +
- "[a.txt, mode:100644, stage:2, content:our content]" +
- "[a.txt, mode:100644, stage:3, content:other content]" +
- "[b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
-
- // now the test begins
-
- try (Git git = new Git(db)) {
- dc = git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:our content]" +
- "[b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddTwoFiles() throws Exception {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- File file2 = new File(db.getWorkTree(), "b.txt");
- FileUtils.createNewFile(file2);
- writer = new PrintWriter(file2);
- writer.print("content b");
- writer.close();
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("a.txt").addFilepattern("b.txt").call();
- assertEquals(
- "[a.txt, mode:100644, content:content]" +
- "[b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddFolder() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- writer = new PrintWriter(file2);
- writer.print("content b");
- writer.close();
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub").call();
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]" +
- "[sub/b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddIgnoredFile() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- File ignoreFile = new File(db.getWorkTree(), ".gitignore");
- FileUtils.createNewFile(ignoreFile);
- writer = new PrintWriter(ignoreFile);
- writer.print("sub/b.txt");
- writer.close();
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- writer = new PrintWriter(file2);
- writer.print("content b");
- writer.close();
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub").call();
-
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAddWholeRepo() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- writer = new PrintWriter(file2);
- writer.print("content b");
- writer.close();
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern(".").call();
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]" +
- "[sub/b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
- }
- }
-
- // the same three cases as in testAddWithParameterUpdate
- // file a exists in workdir and in index -> added
- // file b exists not in workdir but in index -> unchanged
- // file c exists in workdir but not in index -> added
- @Test
- public void testAddWithoutParameterUpdate() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- writer = new PrintWriter(file2);
- writer.print("content b");
- writer.close();
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub").call();
-
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]" +
- "[sub/b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
-
- git.commit().setMessage("commit").call();
-
- // new unstaged file sub/c.txt
- File file3 = new File(db.getWorkTree(), "sub/c.txt");
- FileUtils.createNewFile(file3);
- writer = new PrintWriter(file3);
- writer.print("content c");
- writer.close();
-
- // file sub/a.txt is modified
- writer = new PrintWriter(file);
- writer.print("modified content");
- writer.close();
-
- // file sub/b.txt is deleted
- FileUtils.delete(file2);
-
- git.add().addFilepattern("sub").call();
- // change in sub/a.txt is staged
- // deletion of sub/b.txt is not staged
- // sub/c.txt is staged
- assertEquals(
- "[sub/a.txt, mode:100644, content:modified content]" +
- "[sub/b.txt, mode:100644, content:content b]" +
- "[sub/c.txt, mode:100644, content:content c]",
- indexState(CONTENT));
- }
- }
-
- // file a exists in workdir and in index -> added
- // file b exists not in workdir but in index -> deleted
- // file c exists in workdir but not in index -> unchanged
- @Test
- public void testAddWithParameterUpdate() throws Exception {
- FileUtils.mkdir(new File(db.getWorkTree(), "sub"));
- File file = new File(db.getWorkTree(), "sub/a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- File file2 = new File(db.getWorkTree(), "sub/b.txt");
- FileUtils.createNewFile(file2);
- writer = new PrintWriter(file2);
- writer.print("content b");
- writer.close();
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("sub").call();
-
- assertEquals(
- "[sub/a.txt, mode:100644, content:content]" +
- "[sub/b.txt, mode:100644, content:content b]",
- indexState(CONTENT));
-
- git.commit().setMessage("commit").call();
-
- // new unstaged file sub/c.txt
- File file3 = new File(db.getWorkTree(), "sub/c.txt");
- FileUtils.createNewFile(file3);
- writer = new PrintWriter(file3);
- writer.print("content c");
- writer.close();
-
- // file sub/a.txt is modified
- writer = new PrintWriter(file);
- writer.print("modified content");
- writer.close();
-
- FileUtils.delete(file2);
-
- // change in sub/a.txt is staged
- // deletion of sub/b.txt is staged
- // sub/c.txt is not staged
- git.add().addFilepattern("sub").setUpdate(true).call();
- // change in sub/a.txt is staged
- assertEquals(
- "[sub/a.txt, mode:100644, content:modified content]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testAssumeUnchanged() throws Exception {
- try (Git git = new Git(db)) {
- String path = "a.txt";
- writeTrashFile(path, "content");
- git.add().addFilepattern(path).call();
- String path2 = "b.txt";
- writeTrashFile(path2, "content");
- git.add().addFilepattern(path2).call();
- git.commit().setMessage("commit").call();
- assertEquals("[a.txt, mode:100644, content:"
- + "content, assume-unchanged:false]"
- + "[b.txt, mode:100644, content:content, "
- + "assume-unchanged:false]", indexState(CONTENT
- | ASSUME_UNCHANGED));
- assumeUnchanged(path2);
- assertEquals("[a.txt, mode:100644, content:content, "
- + "assume-unchanged:false][b.txt, mode:100644, "
- + "content:content, assume-unchanged:true]", indexState(CONTENT
- | ASSUME_UNCHANGED));
- writeTrashFile(path, "more content");
- writeTrashFile(path2, "more content");
-
- git.add().addFilepattern(".").call();
-
- assertEquals("[a.txt, mode:100644, content:more content,"
- + " assume-unchanged:false][b.txt, mode:100644,"
- + " content:content, assume-unchanged:true]",
- indexState(CONTENT
- | ASSUME_UNCHANGED));
- }
- }
-
- @Test
- public void testReplaceFileWithDirectory()
- throws IOException, NoFilepatternException, GitAPIException {
- try (Git git = new Git(db)) {
- writeTrashFile("df", "before replacement");
- git.add().addFilepattern("df").call();
- assertEquals("[df, mode:100644, content:before replacement]",
- indexState(CONTENT));
- FileUtils.delete(new File(db.getWorkTree(), "df"));
- writeTrashFile("df/f", "after replacement");
- git.add().addFilepattern("df").call();
- assertEquals("[df/f, mode:100644, content:after replacement]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testReplaceDirectoryWithFile()
- throws IOException, NoFilepatternException, GitAPIException {
- try (Git git = new Git(db)) {
- writeTrashFile("df/f", "before replacement");
- git.add().addFilepattern("df").call();
- assertEquals("[df/f, mode:100644, content:before replacement]",
- indexState(CONTENT));
- FileUtils.delete(new File(db.getWorkTree(), "df"), RECURSIVE);
- writeTrashFile("df", "after replacement");
- git.add().addFilepattern("df").call();
- assertEquals("[df, mode:100644, content:after replacement]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testReplaceFileByPartOfDirectory()
- throws IOException, NoFilepatternException, GitAPIException {
- try (Git git = new Git(db)) {
- writeTrashFile("src/main", "df", "before replacement");
- writeTrashFile("src/main", "z", "z");
- writeTrashFile("z", "z2");
- git.add().addFilepattern("src/main/df")
- .addFilepattern("src/main/z")
- .addFilepattern("z")
- .call();
- assertEquals(
- "[src/main/df, mode:100644, content:before replacement]" +
- "[src/main/z, mode:100644, content:z]" +
- "[z, mode:100644, content:z2]",
- indexState(CONTENT));
- FileUtils.delete(new File(db.getWorkTree(), "src/main/df"));
- writeTrashFile("src/main/df", "a", "after replacement");
- writeTrashFile("src/main/df", "b", "unrelated file");
- git.add().addFilepattern("src/main/df/a").call();
- assertEquals(
- "[src/main/df/a, mode:100644, content:after replacement]" +
- "[src/main/z, mode:100644, content:z]" +
- "[z, mode:100644, content:z2]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testReplaceDirectoryConflictsWithFile()
- throws IOException, NoFilepatternException, GitAPIException {
- DirCache dc = db.lockDirCache();
- try (ObjectInserter oi = db.newObjectInserter()) {
- DirCacheBuilder builder = dc.builder();
- File f = writeTrashFile("a", "df", "content");
- addEntryToBuilder("a", f, oi, builder, 1);
-
- f = writeTrashFile("a", "df", "other content");
- addEntryToBuilder("a/df", f, oi, builder, 3);
-
- f = writeTrashFile("a", "df", "our content");
- addEntryToBuilder("a/df", f, oi, builder, 2);
-
- f = writeTrashFile("z", "z");
- addEntryToBuilder("z", f, oi, builder, 0);
- builder.commit();
- }
- assertEquals(
- "[a, mode:100644, stage:1, content:content]" +
- "[a/df, mode:100644, stage:2, content:our content]" +
- "[a/df, mode:100644, stage:3, content:other content]" +
- "[z, mode:100644, content:z]",
- indexState(CONTENT));
-
- try (Git git = new Git(db)) {
- FileUtils.delete(new File(db.getWorkTree(), "a"), RECURSIVE);
- writeTrashFile("a", "merged");
- git.add().addFilepattern("a").call();
- assertEquals("[a, mode:100644, content:merged]" +
- "[z, mode:100644, content:z]",
- indexState(CONTENT));
- }
- }
-
- @Test
- public void testExecutableRetention() throws Exception {
- StoredConfig config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_FILEMODE, true);
- config.save();
-
- FS executableFs = new FS() {
-
- @Override
- public boolean supportsExecute() {
- return true;
- }
-
- @Override
- public boolean setExecute(File f, boolean canExec) {
- return true;
- }
-
- @Override
- public ProcessBuilder runInShell(String cmd, String[] args) {
- return null;
- }
-
- @Override
- public boolean retryFailedLockFileCommit() {
- return false;
- }
-
- @Override
- public FS newInstance() {
- return this;
- }
-
- @Override
- protected File discoverGitExe() {
- return null;
- }
-
- @Override
- public boolean canExecute(File f) {
- try {
- return read(f).startsWith("binary:");
- } catch (IOException e) {
- return false;
- }
- }
-
- @Override
- public boolean isCaseSensitive() {
- return false;
- }
- };
-
- Git git = Git.open(db.getDirectory(), executableFs);
- String path = "a.txt";
- String path2 = "a.sh";
- writeTrashFile(path, "content");
- writeTrashFile(path2, "binary: content");
- git.add().addFilepattern(path).addFilepattern(path2).call();
- RevCommit commit1 = git.commit().setMessage("commit").call();
- try (TreeWalk walk = new TreeWalk(db)) {
- walk.addTree(commit1.getTree());
- walk.next();
- assertEquals(path2, walk.getPathString());
- assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
- walk.next();
- assertEquals(path, walk.getPathString());
- assertEquals(FileMode.REGULAR_FILE, walk.getFileMode(0));
- }
-
- config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_FILEMODE, false);
- config.save();
-
- Git git2 = Git.open(db.getDirectory(), executableFs);
- writeTrashFile(path2, "content2");
- writeTrashFile(path, "binary: content2");
- git2.add().addFilepattern(path).addFilepattern(path2).call();
- RevCommit commit2 = git2.commit().setMessage("commit2").call();
- try (TreeWalk walk = new TreeWalk(db)) {
- walk.addTree(commit2.getTree());
- walk.next();
- assertEquals(path2, walk.getPathString());
- assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
- walk.next();
- assertEquals(path, walk.getPathString());
- assertEquals(FileMode.REGULAR_FILE, walk.getFileMode(0));
- }
- }
-
- @Test
- public void testAddGitlink() throws Exception {
- createNestedRepo("git-link-dir");
- try (Git git = new Git(db)) {
- git.add().addFilepattern("git-link-dir").call();
-
- assertEquals(
- "[git-link-dir, mode:160000]",
- indexState(0));
- Set<String> untrackedFiles = git.status().call().getUntracked();
- assert (untrackedFiles.isEmpty());
- }
-
- }
-
- @Test
- public void testAddSubrepoWithDirNoGitlinks() throws Exception {
- createNestedRepo("nested-repo");
-
- // Set DIR_NO_GITLINKS
- StoredConfig config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, true);
- config.save();
-
- assert (db.getConfig().get(WorkingTreeOptions.KEY).isDirNoGitLinks());
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("nested-repo").call();
-
- assertEquals(
- "[nested-repo/README1.md, mode:100644]" +
- "[nested-repo/README2.md, mode:100644]",
- indexState(0));
- }
-
- // Turn off DIR_NO_GITLINKS, ensure nested-repo is still treated as
- // a normal directory
- // Set DIR_NO_GITLINKS
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, false);
- config.save();
-
- writeTrashFile("nested-repo", "README3.md", "content");
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("nested-repo").call();
-
- assertEquals(
- "[nested-repo/README1.md, mode:100644]" +
- "[nested-repo/README2.md, mode:100644]" +
- "[nested-repo/README3.md, mode:100644]",
- indexState(0));
- }
- }
-
- @Test
- public void testAddGitlinkDoesNotChange() throws Exception {
- createNestedRepo("nested-repo");
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("nested-repo").call();
-
- assertEquals(
- "[nested-repo, mode:160000]",
- indexState(0));
- }
-
- // Set DIR_NO_GITLINKS
- StoredConfig config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, true);
- config.save();
-
- assert (db.getConfig().get(WorkingTreeOptions.KEY).isDirNoGitLinks());
-
- try (Git git = new Git(db)) {
- git.add().addFilepattern("nested-repo").call();
-
- assertEquals(
- "[nested-repo, mode:160000]",
- indexState(0));
- }
- }
-
- private static DirCacheEntry addEntryToBuilder(String path, File file,
- ObjectInserter newObjectInserter, DirCacheBuilder builder, int stage)
- throws IOException {
- FileInputStream inputStream = new FileInputStream(file);
- ObjectId id = newObjectInserter.insert(
- Constants.OBJ_BLOB, file.length(), inputStream);
- inputStream.close();
- DirCacheEntry entry = new DirCacheEntry(path, stage);
- entry.setObjectId(id);
- entry.setFileMode(FileMode.REGULAR_FILE);
- entry.setLastModified(file.lastModified());
- entry.setLength((int) file.length());
-
- builder.add(entry);
- return entry;
- }
-
- private void assumeUnchanged(String path) throws IOException {
- final DirCache dirc = db.lockDirCache();
- final DirCacheEntry ent = dirc.getEntry(path);
- if (ent != null)
- ent.setAssumeValid(true);
- dirc.write();
- if (!dirc.commit())
- throw new IOException("could not commit");
- }
-
- private void createNestedRepo(String path) throws IOException {
- File gitLinkDir = new File(db.getWorkTree(), path);
- FileUtils.mkdir(gitLinkDir);
-
- FileRepositoryBuilder nestedBuilder = new FileRepositoryBuilder();
- nestedBuilder.setWorkTree(gitLinkDir);
-
- Repository nestedRepo = nestedBuilder.build();
- nestedRepo.create();
-
- writeTrashFile(path, "README1.md", "content");
- writeTrashFile(path, "README2.md", "content");
-
- // Commit these changes in the subrepo
- try (Git git = new Git(nestedRepo)) {
- git.add().addFilepattern(".").call();
- git.commit().setMessage("subrepo commit").call();
- } catch (GitAPIException e) {
- throw new RuntimeException(e);
- }
- }
- }
|