- /*
- * Copyright (C) 2011, Abhishek Bhatnagar <abhatnag@redhat.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.lib;
- /*
- * USE CASE:
- * A commit already exists in the git repo.
- * I want to create another commit using CommitBuilder
- * The following does not work
- */
- import static org.junit.Assert.assertTrue;
- import java.util.LinkedList;
- import java.util.List;
- import org.eclipse.jgit.api.Git;
- import org.eclipse.jgit.api.Status;
- import org.eclipse.jgit.dircache.DirCache;
- import org.junit.Before;
- import org.junit.Test;
- public class CommitBuilderTest extends RepositoryTestCase {
- private Git git;
- @Before
- public void setUp() throws Exception {
- super.setUp();
- git = new Git(db);
- // create test files
- writeTrashFile("File1.txt", "commit me");
- writeTrashFile("File2.txt", "commit me");
- // add first file
- git.add().addFilepattern("File1.txt").call();
- git.commit().setMessage("Test file commit").call();
- }
- @Test
- public void testStash() {
- try {
- // repo, index, odi, indextree && headcommitid
- Repository repo = git.getRepository();
- DirCache index = repo.lockDirCache();
- ObjectInserter odi = repo.newObjectInserter();
- ObjectId indexTreeId = index.writeTree(odi);
- List<ObjectId> parents = new LinkedList<ObjectId>();
- ObjectId headCommitId = repo.resolve(Constants.HEAD + "^{commit}");
- System.out.println(headCommitId);
- // get parents
- parents.add(0, headCommitId);
- // create a commit object, populate it and write it
- CommitBuilder newCommit = new CommitBuilder();
- newCommit.setCommitter(committer);
- newCommit.setAuthor(author);
- newCommit.setMessage("commiting test file");
- newCommit.setParentIds(parents);
- newCommit.setTreeId(indexTreeId);
- // insert commit
- ObjectId newHead = odi.insert(newCommit);
- odi.flush();
- RefUpdate ru = repo.updateRef(Constants.R_STASH);
- ru.setNewObjectId(newHead);
- Result rc = ru.forceUpdate();
- // actual test
- Status status = git.status().call();
- assertTrue(status.getUntracked().size() == 0);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }