From f2d0b50e0a9aff4060f8e2caa6f5b662adf16f81 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 3 May 2013 16:19:07 +0200 Subject: [PATCH] Fix line endings Change-Id: I61c9c173237a535da8576a9299bfd4bb29e8f56b Signed-off-by: Matthias Sohn --- org.eclipse.jgit.junit.http/build.properties | 10 +- org.eclipse.jgit.junit.http/pom.xml | 242 +++++++++--------- .../feature.xml | 96 +++---- .../tst/org/eclipse/jgit/pgm/ReflogTest.java | 158 ++++++------ .../src/org/eclipse/jgit/pgm/Reflog.java | 164 ++++++------ 5 files changed, 335 insertions(+), 335 deletions(-) diff --git a/org.eclipse.jgit.junit.http/build.properties b/org.eclipse.jgit.junit.http/build.properties index f4ae97015..aa1a00826 100644 --- a/org.eclipse.jgit.junit.http/build.properties +++ b/org.eclipse.jgit.junit.http/build.properties @@ -1,5 +1,5 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.properties +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 1dc0626ac..78c1ca3ca 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -1,121 +1,121 @@ - - - - - 4.0.0 - - - org.eclipse.jgit - org.eclipse.jgit-parent - 3.0.0-SNAPSHOT - - - org.eclipse.jgit.junit.http - JGit - JUnit Http Utility Classes - - - Utility classes to support Http based JUnit testing of JGit applications. - - - - - - - - - org.eclipse.jgit - org.eclipse.jgit - ${project.version} - - - - junit - junit - provided - - - - org.eclipse.jgit - org.eclipse.jgit.http.server - ${project.version} - - - - org.eclipse.jgit - org.eclipse.jgit.junit - ${project.version} - - - - org.eclipse.jetty - jetty-servlet - - - - - src/ - - - - . - - plugin.properties - - - - - - - maven-jar-plugin - - - ${bundle-manifest} - - - - - - + + + + + 4.0.0 + + + org.eclipse.jgit + org.eclipse.jgit-parent + 3.0.0-SNAPSHOT + + + org.eclipse.jgit.junit.http + JGit - JUnit Http Utility Classes + + + Utility classes to support Http based JUnit testing of JGit applications. + + + + + + + + + org.eclipse.jgit + org.eclipse.jgit + ${project.version} + + + + junit + junit + provided + + + + org.eclipse.jgit + org.eclipse.jgit.http.server + ${project.version} + + + + org.eclipse.jgit + org.eclipse.jgit.junit + ${project.version} + + + + org.eclipse.jetty + jetty-servlet + + + + + src/ + + + + . + + plugin.properties + + + + + + + maven-jar-plugin + + + ${bundle-manifest} + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 1c1987d32..1b261aac5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -1,48 +1,48 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ReflogTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ReflogTest.java index 68346ec6a..ce808326b 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ReflogTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ReflogTest.java @@ -1,80 +1,80 @@ -/* - * Copyright (C) 2012, Tomasz Zarna - * 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.pgm; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; - -import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.lib.CLIRepositoryTestCase; -import org.junit.Test; - -public class ReflogTest extends CLIRepositoryTestCase { - @Test - public void testClean() throws Exception { - assertArrayEquals(new String[] { "" }, execute("git reflog")); - } - - @Test - public void testSingleCommit() throws Exception { - new Git(db).commit().setMessage("initial commit").call(); - - assertEquals("6fd41be HEAD@{0}: commit (initial): initial commit", - execute("git reflog")[0]); - } - - @Test - public void testBranch() throws Exception { - Git git = new Git(db); - git.commit().setMessage("first commit").call(); - git.checkout().setCreateBranch(true).setName("side").call(); - writeTrashFile("file", "side content"); - git.add().addFilepattern("file").call(); - git.commit().setMessage("side commit").call(); - - assertArrayEquals(new String[] { - "38890c7 side@{0}: commit: side commit", - "d216986 side@{1}: branch: Created from commit first commit", - "" }, execute("git reflog refs/heads/side")); - } +/* + * Copyright (C) 2012, Tomasz Zarna + * 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.pgm; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.lib.CLIRepositoryTestCase; +import org.junit.Test; + +public class ReflogTest extends CLIRepositoryTestCase { + @Test + public void testClean() throws Exception { + assertArrayEquals(new String[] { "" }, execute("git reflog")); + } + + @Test + public void testSingleCommit() throws Exception { + new Git(db).commit().setMessage("initial commit").call(); + + assertEquals("6fd41be HEAD@{0}: commit (initial): initial commit", + execute("git reflog")[0]); + } + + @Test + public void testBranch() throws Exception { + Git git = new Git(db); + git.commit().setMessage("first commit").call(); + git.checkout().setCreateBranch(true).setName("side").call(); + writeTrashFile("file", "side content"); + git.add().addFilepattern("file").call(); + git.commit().setMessage("side commit").call(); + + assertArrayEquals(new String[] { + "38890c7 side@{0}: commit: side commit", + "d216986 side@{1}: branch: Created from commit first commit", + "" }, execute("git reflog refs/heads/side")); + } } \ No newline at end of file diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java index db51a173f..aa90f8d50 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java @@ -1,82 +1,82 @@ -/* - * Copyright (C) 2012, Tomasz Zarna - * 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.pgm; - -import java.util.Collection; - -import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.ReflogCommand; -import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.ReflogEntry; -import org.eclipse.jgit.lib.Repository; -import org.kohsuke.args4j.Argument; - -@Command(common = true, usage = "usage_manageReflogInformation") -class Reflog extends TextBuiltin { - - @Argument(metaVar = "metaVar_ref") - private String ref; - - @Override - protected void run() throws Exception { - ReflogCommand cmd = new Git(db).reflog(); - if (ref != null) - cmd.setRef(ref); - Collection entries = cmd.call(); - int i = 0; - for (ReflogEntry entry : entries) { - outw.println(toString(entry, i++)); - } - } - - private String toString(ReflogEntry entry, int i) { - final StringBuilder s = new StringBuilder(); - s.append(entry.getNewId().abbreviate(7).name()); - s.append(" "); //$NON-NLS-1$ - s.append(ref == null ? Constants.HEAD : Repository.shortenRefName(ref)); - s.append("@{" + i + "}:"); //$NON-NLS-1$ //$NON-NLS-2$ - s.append(" "); //$NON-NLS-1$ - s.append(entry.getComment()); - return s.toString(); - } -} +/* + * Copyright (C) 2012, Tomasz Zarna + * 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.pgm; + +import java.util.Collection; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.ReflogCommand; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ReflogEntry; +import org.eclipse.jgit.lib.Repository; +import org.kohsuke.args4j.Argument; + +@Command(common = true, usage = "usage_manageReflogInformation") +class Reflog extends TextBuiltin { + + @Argument(metaVar = "metaVar_ref") + private String ref; + + @Override + protected void run() throws Exception { + ReflogCommand cmd = new Git(db).reflog(); + if (ref != null) + cmd.setRef(ref); + Collection entries = cmd.call(); + int i = 0; + for (ReflogEntry entry : entries) { + outw.println(toString(entry, i++)); + } + } + + private String toString(ReflogEntry entry, int i) { + final StringBuilder s = new StringBuilder(); + s.append(entry.getNewId().abbreviate(7).name()); + s.append(" "); //$NON-NLS-1$ + s.append(ref == null ? Constants.HEAD : Repository.shortenRefName(ref)); + s.append("@{" + i + "}:"); //$NON-NLS-1$ //$NON-NLS-2$ + s.append(" "); //$NON-NLS-1$ + s.append(entry.getComment()); + return s.toString(); + } +}