Browse Source
CQ: 6570 Bug: 351806 Change-Id: I5e47810376419264ecf4247b5a333af5c8945080 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>stable-2.1
Tomasz Zarna
13 years ago
committed by
Matthias Sohn
17 changed files with 765 additions and 60 deletions
@ -0,0 +1,77 @@
|
||||
/* |
||||
* Copyright (C) 2012, IBM Corporation and others. |
||||
* 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; |
||||
|
||||
import static org.junit.Assert.assertEquals; |
||||
import static org.junit.Assert.assertFalse; |
||||
|
||||
import java.io.File; |
||||
import java.io.FileOutputStream; |
||||
import java.io.IOException; |
||||
|
||||
import org.junit.Test; |
||||
|
||||
public class SquashCommitMsgTest extends RepositoryTestCase { |
||||
private static final String squashMsg = "squashed commit"; |
||||
|
||||
@Test |
||||
public void testReadWriteMergeMsg() throws IOException { |
||||
assertEquals(db.readSquashCommitMsg(), null); |
||||
assertFalse(new File(db.getDirectory(), Constants.SQUASH_MSG).exists()); |
||||
db.writeSquashCommitMsg(squashMsg); |
||||
assertEquals(squashMsg, db.readSquashCommitMsg()); |
||||
assertEquals(read(new File(db.getDirectory(), Constants.SQUASH_MSG)), |
||||
squashMsg); |
||||
db.writeSquashCommitMsg(null); |
||||
assertEquals(db.readSquashCommitMsg(), null); |
||||
assertFalse(new File(db.getDirectory(), Constants.SQUASH_MSG).exists()); |
||||
FileOutputStream fos = new FileOutputStream(new File(db.getDirectory(), |
||||
Constants.SQUASH_MSG)); |
||||
try { |
||||
fos.write(squashMsg.getBytes(Constants.CHARACTER_ENCODING)); |
||||
} finally { |
||||
fos.close(); |
||||
} |
||||
assertEquals(db.readSquashCommitMsg(), squashMsg); |
||||
} |
||||
} |
@ -0,0 +1,89 @@
|
||||
/* |
||||
* Copyright (C) 2012, IBM Corporation and others. |
||||
* 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.merge; |
||||
|
||||
import static org.junit.Assert.assertEquals; |
||||
|
||||
import java.util.Arrays; |
||||
|
||||
import org.eclipse.jgit.api.Git; |
||||
import org.eclipse.jgit.lib.Ref; |
||||
import org.eclipse.jgit.lib.SampleDataRepositoryTestCase; |
||||
import org.eclipse.jgit.revwalk.RevCommit; |
||||
import org.eclipse.jgit.util.GitDateFormatter; |
||||
import org.eclipse.jgit.util.GitDateFormatter.Format; |
||||
import org.junit.Before; |
||||
import org.junit.Test; |
||||
|
||||
/** |
||||
* Test construction of squash message by {@link SquashMessageFormatterTest}. |
||||
*/ |
||||
public class SquashMessageFormatterTest extends SampleDataRepositoryTestCase { |
||||
private GitDateFormatter dateFormatter; |
||||
private SquashMessageFormatter msgFormatter; |
||||
private RevCommit revCommit; |
||||
|
||||
@Override |
||||
@Before |
||||
public void setUp() throws Exception { |
||||
super.setUp(); |
||||
dateFormatter = new GitDateFormatter(Format.DEFAULT); |
||||
msgFormatter = new SquashMessageFormatter(); |
||||
} |
||||
|
||||
@Test |
||||
public void testCommit() throws Exception { |
||||
Git git = new Git(db); |
||||
revCommit = git.commit().setMessage("squash_me").call(); |
||||
|
||||
Ref master = db.getRef("refs/heads/master"); |
||||
String message = msgFormatter.format(Arrays.asList(revCommit), master); |
||||
assertEquals( |
||||
"Squashed commit of the following:\n\ncommit " |
||||
+ revCommit.getName() + "\nAuthor: " |
||||
+ revCommit.getAuthorIdent().getName() + " <" |
||||
+ revCommit.getAuthorIdent().getEmailAddress() |
||||
+ ">\nDate: " + dateFormatter.formatDate(author) |
||||
+ "\n\n\tsquash_me\n", message); |
||||
} |
||||
} |
@ -0,0 +1,106 @@
|
||||
/* |
||||
* Copyright (C) 2012, IBM Corporation and others. |
||||
* 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.merge; |
||||
|
||||
import java.util.List; |
||||
|
||||
import org.eclipse.jgit.lib.PersonIdent; |
||||
import org.eclipse.jgit.lib.Ref; |
||||
import org.eclipse.jgit.revwalk.RevCommit; |
||||
import org.eclipse.jgit.util.GitDateFormatter; |
||||
import org.eclipse.jgit.util.GitDateFormatter.Format; |
||||
|
||||
/** |
||||
* Formatter for constructing the commit message for a squashed commit. |
||||
* <p> |
||||
* The format should be the same as C Git does it, for compatibility. |
||||
*/ |
||||
public class SquashMessageFormatter { |
||||
|
||||
private GitDateFormatter dateFormatter; |
||||
|
||||
/** |
||||
* Create a new squash message formatter. |
||||
*/ |
||||
public SquashMessageFormatter() { |
||||
dateFormatter = new GitDateFormatter(Format.DEFAULT); |
||||
} |
||||
/** |
||||
* Construct the squashed commit message. |
||||
* |
||||
* @param squashedCommits |
||||
* the squashed commits |
||||
* @param target |
||||
* the target branch |
||||
* @return squashed commit message |
||||
*/ |
||||
public String format(List<RevCommit> squashedCommits, Ref target) { |
||||
StringBuilder sb = new StringBuilder(); |
||||
sb.append("Squashed commit of the following:\n"); |
||||
for (RevCommit c : squashedCommits) { |
||||
sb.append("\ncommit "); |
||||
sb.append(c.getName()); |
||||
sb.append("\n"); |
||||
sb.append(toString(c.getAuthorIdent())); |
||||
sb.append("\n\t"); |
||||
sb.append(c.getShortMessage()); |
||||
sb.append("\n"); |
||||
} |
||||
return sb.toString(); |
||||
} |
||||
|
||||
private String toString(PersonIdent author) { |
||||
final StringBuilder a = new StringBuilder(); |
||||
|
||||
a.append("Author: "); |
||||
a.append(author.getName()); |
||||
a.append(" <"); |
||||
a.append(author.getEmailAddress()); |
||||
a.append(">\n"); |
||||
a.append("Date: "); |
||||
a.append(dateFormatter.formatDate(author)); |
||||
a.append("\n"); |
||||
|
||||
return a.toString(); |
||||
} |
||||
} |
Loading…
Reference in new issue