From 7d5e1f8497966b78b4c810904baef320a4ea6d69 Mon Sep 17 00:00:00 2001 From: Gustaf Lundh Date: Mon, 24 Mar 2014 18:05:32 +0100 Subject: [PATCH 1/2] Fixed RevWalk.isMergedInto() returning wrong results Under certain circumstances isMergedInto() returned false even though base is reachable from the tip. This will hinder pushes and receives by falsely detecting "non fast forward" merges. o---o---o---o---o / \ / o---o---A---o---M / / ---2---1- if M (tip) was compared to 1 (base), the method isMergedInto() could still return false, since two mergeBases will be detected and the return statement will only look at one of them: return next() == base; In most cases this would pass, but if "A" is a commit with an old timestamp, the Generator would walk down to "2" before completing the walk pass "A" and first finding the other merge base "1". In this case, the first call to next() returns 2, which compared to base evaluates as false. This is fixed by iterating merge bases and returning true if base is found among them. Change-Id: If2ee1f4270f5ea4bee73ecb0e9c933f8234818da Signed-off-by: Gustaf Lundh Signed-off-by: Sven Selberg --- org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index e92035359..b3c4cced7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007, Robin Rosenberg * Copyright (C) 2008, Shawn O. Pearce + * Copyright (C) 2014, Gustaf Lundh * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -388,7 +389,11 @@ public boolean isMergedInto(final RevCommit base, final RevCommit tip) treeFilter = TreeFilter.ALL; markStart(tip); markStart(base); - return next() == base; + RevCommit mergeBase; + while ((mergeBase = next()) != null) + if (mergeBase == base) + return true; + return false; } finally { filter = oldRF; treeFilter = oldTF; From 0f8a18cfca7fc69e6467eee2844c25d849e7d2a2 Mon Sep 17 00:00:00 2001 From: Sven Selberg Date: Mon, 24 Mar 2014 18:05:32 +0100 Subject: [PATCH 2/2] Added TestCase for 7d5e1f Fixed RevWalk.isMergedInto() Change-Id: Id9a641dd67c4182bb3a0dc83a6864fee43e7653f Signed-off-by: Gustaf Lundh Signed-off-by: Sven Selberg --- .../jgit/revwalk/RevWalkMergedIntoTest.java | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java new file mode 100644 index 000000000..581e13c6d --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2014, Sven Selberg + * 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.revwalk; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class RevWalkMergedIntoTest extends RevWalkTestCase { + + @Test + public void testOldCommitWalk() throws Exception { + /* + * Sometimes a merge is performed on a machine with faulty time. + * This makes the traversal of the graph, when trying to find out if B + * is merged into T, complex since the algorithm uses the time stamps + * of commits to find the best route. + * When for example O(ld) has a very old time stamp compared to one of the + * commits (N(ew)) on the upper route between T and F(alse base), the route + * to False is deemed the better option even though the alternate route leeds + * to B(ase) which was the commit we were after. + * + * o---o---o---o---N + * / \ + * / o---o---o---O---T + * / / + * ---F---B + * + * This test is asserting that isMergedInto(B, T) returns true even + * under those circumstances. + */ + final int threeDaysInSecs = 3 * 24 * 60 * 60; + final RevCommit f = commit(); + final RevCommit b = commit(f); + final RevCommit o = commit(-threeDaysInSecs, commit(commit(commit(b)))); + final RevCommit n = commit(commit(commit(commit(commit(f))))); + final RevCommit t = commit(n, o); + assertTrue(rw.isMergedInto(b, t)); + } +}