123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714 |
- /*
- * 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.junit.Assert.assertEquals;
- import static org.junit.Assert.assertNotNull;
- import static org.junit.Assert.fail;
-
- import java.io.File;
- import java.io.FileInputStream;
- import java.io.IOException;
- import java.io.PrintWriter;
-
- import org.eclipse.jgit.api.errors.NoFilepatternException;
- import org.eclipse.jgit.dircache.DirCache;
- import org.eclipse.jgit.dircache.DirCacheBuilder;
- import org.eclipse.jgit.dircache.DirCacheEntry;
- 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.RepositoryTestCase;
- import org.eclipse.jgit.lib.StoredConfig;
- import org.eclipse.jgit.revwalk.RevCommit;
- import org.eclipse.jgit.treewalk.TreeWalk;
- import org.eclipse.jgit.util.FS;
- import org.eclipse.jgit.util.FileUtils;
- import org.junit.Test;
-
- public class AddCommandTest extends RepositoryTestCase {
-
- @Test
- public void testAddNothing() {
- Git git = new Git(db);
-
- try {
- git.add().call();
- fail("Expected IllegalArgumentException");
- } catch (NoFilepatternException e) {
- // expected
- }
-
- }
-
- @Test
- public void testAddNonExistingSingleFile() throws NoFilepatternException {
- Git git = new Git(db);
-
- DirCache dc = git.add().addFilepattern("a.txt").call();
- assertEquals(0, dc.getEntryCount());
-
- }
-
- @Test
- public void testAddExistingSingleFile() throws IOException, NoFilepatternException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- Git git = new Git(db);
-
- git.add().addFilepattern("a.txt").call();
-
- assertEquals(
- "[a.txt, mode:100644, content:content]",
- indexState(CONTENT));
- }
-
- @Test
- public void testAddExistingSingleSmallFileWithNewLine() throws IOException,
- NoFilepatternException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("row1\r\nrow2");
- writer.close();
-
- 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, NoFilepatternException {
- 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", "");
- 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,
- NoFilepatternException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("row1\r\nrow2\u0000");
- writer.close();
-
- 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, NoFilepatternException {
- 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();
-
- 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, NoFilepatternException {
- File file = new File(db.getWorkTree(), "a.txt");
- FileUtils.createNewFile(file);
- PrintWriter writer = new PrintWriter(file);
- writer.print("content");
- writer.close();
-
- 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();
-
- 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();
-
- 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();
-
- 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
-
- 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();
-
- 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();
-
- 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();
-
- 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();
-
- 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();
-
- 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();
-
- 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 {
- 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 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() {
-
- public boolean supportsExecute() {
- return true;
- }
-
- public boolean setExecute(File f, boolean canExec) {
- return true;
- }
-
- public ProcessBuilder runInShell(String cmd, String[] args) {
- return null;
- }
-
- public boolean retryFailedLockFileCommit() {
- return false;
- }
-
- public FS newInstance() {
- return this;
- }
-
- protected File discoverGitPrefix() {
- return null;
- }
-
- public boolean canExecute(File f) {
- return true;
- }
- };
-
- Git git = Git.open(db.getDirectory(), executableFs);
- String path = "a.txt";
- writeTrashFile(path, "content");
- git.add().addFilepattern(path).call();
- RevCommit commit1 = git.commit().setMessage("commit").call();
- TreeWalk walk = TreeWalk.forPath(db, path, commit1.getTree());
- assertNotNull(walk);
- assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
-
- FS nonExecutableFs = new FS() {
-
- public boolean supportsExecute() {
- return false;
- }
-
- public boolean setExecute(File f, boolean canExec) {
- return false;
- }
-
- public ProcessBuilder runInShell(String cmd, String[] args) {
- return null;
- }
-
- public boolean retryFailedLockFileCommit() {
- return false;
- }
-
- public FS newInstance() {
- return this;
- }
-
- protected File discoverGitPrefix() {
- return null;
- }
-
- public boolean canExecute(File f) {
- return false;
- }
- };
-
- config = db.getConfig();
- config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
- ConfigConstants.CONFIG_KEY_FILEMODE, false);
- config.save();
-
- Git git2 = Git.open(db.getDirectory(), nonExecutableFs);
- writeTrashFile(path, "content2");
- git2.add().addFilepattern(path).call();
- RevCommit commit2 = git2.commit().setMessage("commit2").call();
- walk = TreeWalk.forPath(db, path, commit2.getTree());
- assertNotNull(walk);
- assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
- }
-
- private 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");
- }
-
- }
|