From 900bdbac5bad9d40df8d310a8f319ab616d1420b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 22 Nov 2011 16:14:30 -0800 Subject: [PATCH] Support adding all refs to LogCommand Bug: 353310 Change-Id: Ifa2e7ed58c7f2bdfe3aafbd500b5a38c1f94c2ec Signed-off-by: Kevin Sawicki --- .../org/eclipse/jgit/api/LogCommandTest.java | 91 +++++++++++++++++++ .../src/org/eclipse/jgit/api/LogCommand.java | 19 ++++ 2 files changed, 110 insertions(+) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogCommandTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogCommandTest.java new file mode 100644 index 000000000..48fcf53ec --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogCommandTest.java @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2011, GitHub Inc. + * 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.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RepositoryTestCase; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Test; + +public class LogCommandTest extends RepositoryTestCase { + + @Test + public void logAllCommits() throws Exception { + List commits = new ArrayList(); + Git git = Git.wrap(db); + + writeTrashFile("Test.txt", "Hello world"); + git.add().addFilepattern("Test.txt").call(); + commits.add(git.commit().setMessage("initial commit").call()); + + git.branchCreate().setName("branch1").call(); + Ref checkedOut = git.checkout().setName("branch1").call(); + assertEquals("refs/heads/branch1", checkedOut.getName()); + writeTrashFile("Test1.txt", "Hello world!"); + git.add().addFilepattern("Test1.txt").call(); + commits.add(git.commit().setMessage("branch1 commit").call()); + + checkedOut = git.checkout().setName("master").call(); + assertEquals("refs/heads/master", checkedOut.getName()); + writeTrashFile("Test2.txt", "Hello world!!"); + git.add().addFilepattern("Test2.txt").call(); + commits.add(git.commit().setMessage("branch1 commit").call()); + + Iterator log = git.log().all().call().iterator(); + assertTrue(log.hasNext()); + assertTrue(commits.contains(log.next())); + assertTrue(log.hasNext()); + assertTrue(commits.contains(log.next())); + assertTrue(log.hasNext()); + assertTrue(commits.contains(log.next())); + assertFalse(log.hasNext()); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java index cbdfe5610..8708098a8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java @@ -55,6 +55,7 @@ import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; @@ -213,6 +214,24 @@ public class LogCommand extends GitCommand> { return not(since).add(until); } + /** + * Add all refs as commits to start the graph traversal from. + * + * @see #add(AnyObjectId) + * @return {@code this} + * @throws IOException + * the references could not be accessed + */ + public LogCommand all() throws IOException { + for (Ref ref : getRepository().getAllRefs().values()) { + ObjectId objectId = ref.getPeeledObjectId(); + if (objectId == null) + objectId = ref.getObjectId(); + add(objectId); + } + return this; + } + /** * Show only commits that affect any of the specified paths. The path must * either name a file or a directory exactly. Note that regex expressions or