/* * Copyright (C) 2011, Chris Aniszczyk * 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.api.ResetCommand.ResetType.HARD; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; import java.io.IOException; import java.io.PrintWriter; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.errors.AmbiguousObjectException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.RepositoryTestCase; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.util.FileUtils; import org.junit.Assert; import org.junit.Test; public class ResetCommandTest extends RepositoryTestCase { private Git git; private RevCommit initialCommit; private RevCommit secondCommit; private File indexFile; private File untrackedFile; private DirCacheEntry prestage; public void setupRepository() throws IOException, JGitInternalException, GitAPIException { // create initial commit git = new Git(db); initialCommit = git.commit().setMessage("initial commit").call(); // create nested file File dir = new File(db.getWorkTree(), "dir"); FileUtils.mkdir(dir); File nestedFile = new File(dir, "b.txt"); FileUtils.createNewFile(nestedFile); PrintWriter nesterFileWriter = new PrintWriter(nestedFile); nesterFileWriter.print("content"); nesterFileWriter.flush(); // create file indexFile = new File(db.getWorkTree(), "a.txt"); FileUtils.createNewFile(indexFile); PrintWriter writer = new PrintWriter(indexFile); writer.print("content"); writer.flush(); // add file and commit it git.add().addFilepattern("dir").addFilepattern("a.txt").call(); secondCommit = git.commit().setMessage("adding a.txt and dir/b.txt") .call(); prestage = DirCache.read(db.getIndexFile(), db.getFS()).getEntry( indexFile.getName()); // modify file and add to index writer.print("new content"); writer.close(); nesterFileWriter.print("new content"); nesterFileWriter.close(); git.add().addFilepattern("a.txt").addFilepattern("dir").call(); // create a file not added to the index untrackedFile = new File(db.getWorkTree(), "notAddedToIndex.txt"); FileUtils.createNewFile(untrackedFile); PrintWriter writer2 = new PrintWriter(untrackedFile); writer2.print("content"); writer2.close(); } @Test public void testHardReset() throws JGitInternalException, AmbiguousObjectException, IOException, GitAPIException { setupRepository(); ObjectId prevHead = db.resolve(Constants.HEAD); git.reset().setMode(ResetType.HARD).setRef(initialCommit.getName()) .call(); // check if HEAD points to initial commit now ObjectId head = db.resolve(Constants.HEAD); assertTrue(head.equals(initialCommit)); // check if files were removed assertFalse(indexFile.exists()); assertTrue(untrackedFile.exists()); // fileInIndex must no longer be in HEAD and in the index String fileInIndexPath = indexFile.getAbsolutePath(); assertFalse(inHead(fileInIndexPath)); assertFalse(inIndex(indexFile.getName())); assertReflog(prevHead, head); assertEquals(prevHead, db.readOrigHead()); } @Test public void testResetToNonexistingHEAD() throws JGitInternalException, AmbiguousObjectException, IOException, GitAPIException { // create a file in the working tree of a fresh repo git = new Git(db); writeTrashFile("f", "content"); try { git.reset().setRef(Constants.HEAD).call(); fail("Expected JGitInternalException didn't occur"); } catch (JGitInternalException e) { // got the expected exception } } @Test public void testSoftReset() throws JGitInternalException, AmbiguousObjectException, IOException, GitAPIException { setupRepository(); ObjectId prevHead = db.resolve(Constants.HEAD); git.reset().setMode(ResetType.SOFT).setRef(initialCommit.getName()) .call(); // check if HEAD points to initial commit now ObjectId head = db.resolve(Constants.HEAD); assertTrue(head.equals(initialCommit)); // check if files still exist assertTrue(untrackedFile.exists()); assertTrue(indexFile.exists()); // fileInIndex must no longer be in HEAD but has to be in the index String fileInIndexPath = indexFile.getAbsolutePath(); assertFalse(inHead(fileInIndexPath)); assertTrue(inIndex(indexFile.getName())); assertReflog(prevHead, head); assertEquals(prevHead, db.readOrigHead()); } @Test public void testMixedReset() throws JGitInternalException, AmbiguousObjectException, IOException, GitAPIException { setupRepository(); ObjectId prevHead = db.resolve(Constants.HEAD); git.reset().setMode(ResetType.MIXED).setRef(initialCommit.getName()) .call(); // check if HEAD points to initial commit now ObjectId head = db.resolve(Constants.HEAD); assertTrue(head.equals(initialCommit)); // check if files still exist assertTrue(untrackedFile.exists()); assertTrue(indexFile.exists()); // fileInIndex must no longer be in HEAD and in the index String fileInIndexPath = indexFile.getAbsolutePath(); assertFalse(inHead(fileInIndexPath)); assertFalse(inIndex(indexFile.getName())); assertReflog(prevHead, head); assertEquals(prevHead, db.readOrigHead()); } @Test public void testMixedResetRetainsSizeAndModifiedTime() throws Exception { git = new Git(db); writeTrashFile("a.txt", "a").setLastModified( System.currentTimeMillis() - 60 * 1000); assertNotNull(git.add().addFilepattern("a.txt").call()); assertNotNull(git.commit().setMessage("a commit").call()); writeTrashFile("b.txt", "b").setLastModified( System.currentTimeMillis() - 60 * 1000); assertNotNull(git.add().addFilepattern("b.txt").call()); RevCommit commit2 = git.commit().setMessage("b commit").call(); assertNotNull(commit2); DirCache cache = db.readDirCache(); DirCacheEntry aEntry = cache.getEntry("a.txt"); assertNotNull(aEntry); assertTrue(aEntry.getLength() > 0); assertTrue(aEntry.getLastModified() > 0); DirCacheEntry bEntry = cache.getEntry("b.txt"); assertNotNull(bEntry); assertTrue(bEntry.getLength() > 0); assertTrue(bEntry.getLastModified() > 0); git.reset().setMode(ResetType.MIXED).setRef(commit2.getName()).call(); cache = db.readDirCache(); DirCacheEntry mixedAEntry = cache.getEntry("a.txt"); assertNotNull(mixedAEntry); assertEquals(aEntry.getLastModified(), mixedAEntry.getLastModified()); assertEquals(aEntry.getLastModified(), mixedAEntry.getLastModified()); DirCacheEntry mixedBEntry = cache.getEntry("b.txt"); assertNotNull(mixedBEntry); assertEquals(bEntry.getLastModified(), mixedBEntry.getLastModified()); assertEquals(bEntry.getLastModified(), mixedBEntry.getLastModified()); } @Test public void testPathsReset() throws Exception { setupRepository(); DirCacheEntry preReset = DirCache.read(db.getIndexFile(), db.getFS()) .getEntry(indexFile.getName()); assertNotNull(preReset); git.add().addFilepattern(untrackedFile.getName()).call(); // 'a.txt' has already been modified in setupRepository // 'notAddedToIndex.txt' has been added to repository git.reset().addPath(indexFile.getName()) .addPath(untrackedFile.getName()).call(); DirCacheEntry postReset = DirCache.read(db.getIndexFile(), db.getFS()) .getEntry(indexFile.getName()); assertNotNull(postReset); Assert.assertNotSame(preReset.getObjectId(), postReset.getObjectId()); Assert.assertEquals(prestage.getObjectId(), postReset.getObjectId()); // check that HEAD hasn't moved ObjectId head = db.resolve(Constants.HEAD); assertTrue(head.equals(secondCommit)); // check if files still exist assertTrue(untrackedFile.exists()); assertTrue(indexFile.exists()); assertTrue(inHead(indexFile.getName())); assertTrue(inIndex(indexFile.getName())); assertFalse(inIndex(untrackedFile.getName())); } @Test public void testPathsResetOnDirs() throws Exception { setupRepository(); DirCacheEntry preReset = DirCache.read(db.getIndexFile(), db.getFS()) .getEntry("dir/b.txt"); assertNotNull(preReset); git.add().addFilepattern(untrackedFile.getName()).call(); // 'dir/b.txt' has already been modified in setupRepository git.reset().addPath("dir").call(); DirCacheEntry postReset = DirCache.read(db.getIndexFile(), db.getFS()) .getEntry("dir/b.txt"); assertNotNull(postReset); Assert.assertNotSame(preReset.getObjectId(), postReset.getObjectId()); // check that HEAD hasn't moved ObjectId head = db.resolve(Constants.HEAD); assertTrue(head.equals(secondCommit)); // check if files still exist assertTrue(untrackedFile.exists()); assertTrue(inHead("dir/b.txt")); assertTrue(inIndex("dir/b.txt")); } @Test public void testPathsResetWithRef() throws Exception { setupRepository(); DirCacheEntry preReset = DirCache.read(db.getIndexFile(), db.getFS()) .getEntry(indexFile.getName()); assertNotNull(preReset); git.add().addFilepattern(untrackedFile.getName()).call(); // 'a.txt' has already been modified in setupRepository // 'notAddedToIndex.txt' has been added to repository // reset to the inital commit git.reset().setRef(initialCommit.getName()) .addPath(indexFile.getName()) .addPath(untrackedFile.getName()).call(); // check that HEAD hasn't moved ObjectId head = db.resolve(Constants.HEAD); assertTrue(head.equals(secondCommit)); // check if files still exist assertTrue(untrackedFile.exists()); assertTrue(indexFile.exists()); assertTrue(inHead(indexFile.getName())); assertFalse(inIndex(indexFile.getName())); assertFalse(inIndex(untrackedFile.getName())); } @Test public void testHardResetOnTag() throws Exception { setupRepository(); String tagName = "initialtag"; git.tag().setName(tagName).setObjectId(secondCommit) .setMessage("message").call(); DirCacheEntry preReset = DirCache.read(db.getIndexFile(), db.getFS()) .getEntry(indexFile.getName()); assertNotNull(preReset); git.add().addFilepattern(untrackedFile.getName()).call(); git.reset().setRef(tagName).setMode(HARD).call(); ObjectId head = db.resolve(Constants.HEAD); assertTrue(head.equals(secondCommit)); } private void assertReflog(ObjectId prevHead, ObjectId head) throws IOException { // Check the reflog for HEAD String actualHeadMessage = db.getReflogReader(Constants.HEAD) .getLastEntry().getComment(); String expectedHeadMessage = head.getName() + ": updating HEAD"; assertEquals(expectedHeadMessage, actualHeadMessage); assertEquals(head.getName(), db.getReflogReader(Constants.HEAD) .getLastEntry().getNewId().getName()); assertEquals(prevHead.getName(), db.getReflogReader(Constants.HEAD) .getLastEntry().getOldId().getName()); // The reflog for master contains the same as the one for HEAD String actualMasterMessage = db.getReflogReader("refs/heads/master") .getLastEntry().getComment(); String expectedMasterMessage = head.getName() + ": updating HEAD"; // yes! assertEquals(expectedMasterMessage, actualMasterMessage); assertEquals(head.getName(), db.getReflogReader(Constants.HEAD) .getLastEntry().getNewId().getName()); assertEquals(prevHead.getName(), db .getReflogReader("refs/heads/master").getLastEntry().getOldId() .getName()); } /** * Checks if a file with the given path exists in the HEAD tree * * @param path * @return true if the file exists * @throws IOException */ private boolean inHead(String path) throws IOException { ObjectId headId = db.resolve(Constants.HEAD); RevWalk rw = new RevWalk(db); TreeWalk tw = null; try { tw = TreeWalk.forPath(db, path, rw.parseTree(headId)); return tw != null; } finally { rw.release(); rw.dispose(); if (tw != null) tw.release(); } } /** * Checks if a file with the given path exists in the index * * @param path * @return true if the file exists * @throws IOException */ private boolean inIndex(String path) throws IOException { DirCache dc = DirCache.read(db.getIndexFile(), db.getFS()); return dc.getEntry(path) != null; } }