Browse Source
Change-Id: I61c9c173237a535da8576a9299bfd4bb29e8f56b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>stable-3.0
Matthias Sohn
12 years ago
5 changed files with 335 additions and 335 deletions
@ -1,5 +1,5 @@ |
|||||||
source.. = src/ |
source.. = src/ |
||||||
output.. = bin/ |
output.. = bin/ |
||||||
bin.includes = META-INF/,\ |
bin.includes = META-INF/,\ |
||||||
.,\ |
.,\ |
||||||
plugin.properties |
plugin.properties |
||||||
|
@ -1,121 +1,121 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<!-- |
<!-- |
||||||
Copyright (C) 2010, Jens Baumgart <jens.baumgart@sap.com> |
Copyright (C) 2010, Jens Baumgart <jens.baumgart@sap.com> |
||||||
and other copyright owners as documented in the project's IP log. |
and other copyright owners as documented in the project's IP log. |
||||||
|
|
||||||
This program and the accompanying materials are made available |
This program and the accompanying materials are made available |
||||||
under the terms of the Eclipse Distribution License v1.0 which |
under the terms of the Eclipse Distribution License v1.0 which |
||||||
accompanies this distribution, is reproduced below, and is |
accompanies this distribution, is reproduced below, and is |
||||||
available at http://www.eclipse.org/org/documents/edl-v10.php |
available at http://www.eclipse.org/org/documents/edl-v10.php |
||||||
|
|
||||||
All rights reserved. |
All rights reserved. |
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or |
Redistribution and use in source and binary forms, with or |
||||||
without modification, are permitted provided that the following |
without modification, are permitted provided that the following |
||||||
conditions are met: |
conditions are met: |
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright |
- Redistributions of source code must retain the above copyright |
||||||
notice, this list of conditions and the following disclaimer. |
notice, this list of conditions and the following disclaimer. |
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above |
- Redistributions in binary form must reproduce the above |
||||||
copyright notice, this list of conditions and the following |
copyright notice, this list of conditions and the following |
||||||
disclaimer in the documentation and/or other materials provided |
disclaimer in the documentation and/or other materials provided |
||||||
with the distribution. |
with the distribution. |
||||||
|
|
||||||
- Neither the name of the Eclipse Foundation, Inc. nor the |
- Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
names of its contributors may be used to endorse or promote |
names of its contributors may be used to endorse or promote |
||||||
products derived from this software without specific prior |
products derived from this software without specific prior |
||||||
written permission. |
written permission. |
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
--> |
--> |
||||||
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
<project xmlns="http://maven.apache.org/POM/4.0.0" |
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
||||||
<modelVersion>4.0.0</modelVersion> |
<modelVersion>4.0.0</modelVersion> |
||||||
|
|
||||||
<parent> |
<parent> |
||||||
<groupId>org.eclipse.jgit</groupId> |
<groupId>org.eclipse.jgit</groupId> |
||||||
<artifactId>org.eclipse.jgit-parent</artifactId> |
<artifactId>org.eclipse.jgit-parent</artifactId> |
||||||
<version>3.0.0-SNAPSHOT</version> |
<version>3.0.0-SNAPSHOT</version> |
||||||
</parent> |
</parent> |
||||||
|
|
||||||
<artifactId>org.eclipse.jgit.junit.http</artifactId> |
<artifactId>org.eclipse.jgit.junit.http</artifactId> |
||||||
<name>JGit - JUnit Http Utility Classes</name> |
<name>JGit - JUnit Http Utility Classes</name> |
||||||
|
|
||||||
<description> |
<description> |
||||||
Utility classes to support Http based JUnit testing of JGit applications. |
Utility classes to support Http based JUnit testing of JGit applications. |
||||||
</description> |
</description> |
||||||
|
|
||||||
<properties> |
<properties> |
||||||
<translate-qualifier/> |
<translate-qualifier/> |
||||||
</properties> |
</properties> |
||||||
|
|
||||||
<dependencies> |
<dependencies> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.eclipse.jgit</groupId> |
<groupId>org.eclipse.jgit</groupId> |
||||||
<artifactId>org.eclipse.jgit</artifactId> |
<artifactId>org.eclipse.jgit</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
</dependency> |
</dependency> |
||||||
|
|
||||||
<dependency> |
<dependency> |
||||||
<groupId>junit</groupId> |
<groupId>junit</groupId> |
||||||
<artifactId>junit</artifactId> |
<artifactId>junit</artifactId> |
||||||
<scope>provided</scope> |
<scope>provided</scope> |
||||||
</dependency> |
</dependency> |
||||||
|
|
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.eclipse.jgit</groupId> |
<groupId>org.eclipse.jgit</groupId> |
||||||
<artifactId>org.eclipse.jgit.http.server</artifactId> |
<artifactId>org.eclipse.jgit.http.server</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
</dependency> |
</dependency> |
||||||
|
|
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.eclipse.jgit</groupId> |
<groupId>org.eclipse.jgit</groupId> |
||||||
<artifactId>org.eclipse.jgit.junit</artifactId> |
<artifactId>org.eclipse.jgit.junit</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
</dependency> |
</dependency> |
||||||
|
|
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.eclipse.jetty</groupId> |
<groupId>org.eclipse.jetty</groupId> |
||||||
<artifactId>jetty-servlet</artifactId> |
<artifactId>jetty-servlet</artifactId> |
||||||
</dependency> |
</dependency> |
||||||
</dependencies> |
</dependencies> |
||||||
|
|
||||||
<build> |
<build> |
||||||
<sourceDirectory>src/</sourceDirectory> |
<sourceDirectory>src/</sourceDirectory> |
||||||
|
|
||||||
<resources> |
<resources> |
||||||
<resource> |
<resource> |
||||||
<directory>.</directory> |
<directory>.</directory> |
||||||
<includes> |
<includes> |
||||||
<include>plugin.properties</include> |
<include>plugin.properties</include> |
||||||
</includes> |
</includes> |
||||||
</resource> |
</resource> |
||||||
</resources> |
</resources> |
||||||
|
|
||||||
<plugins> |
<plugins> |
||||||
<plugin> |
<plugin> |
||||||
<artifactId>maven-jar-plugin</artifactId> |
<artifactId>maven-jar-plugin</artifactId> |
||||||
<configuration> |
<configuration> |
||||||
<archive> |
<archive> |
||||||
<manifestFile>${bundle-manifest}</manifestFile> |
<manifestFile>${bundle-manifest}</manifestFile> |
||||||
</archive> |
</archive> |
||||||
</configuration> |
</configuration> |
||||||
</plugin> |
</plugin> |
||||||
</plugins> |
</plugins> |
||||||
</build> |
</build> |
||||||
</project> |
</project> |
||||||
|
@ -1,48 +1,48 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<feature |
<feature |
||||||
id="org.eclipse.jgit.junit" |
id="org.eclipse.jgit.junit" |
||||||
label="%featureName" |
label="%featureName" |
||||||
version="3.0.0.qualifier" |
version="3.0.0.qualifier" |
||||||
provider-name="%providerName"> |
provider-name="%providerName"> |
||||||
|
|
||||||
<description url="http://www.eclipse.org/jgit/"> |
<description url="http://www.eclipse.org/jgit/"> |
||||||
%description |
%description |
||||||
</description> |
</description> |
||||||
|
|
||||||
<copyright> |
<copyright> |
||||||
%copyright |
%copyright |
||||||
</copyright> |
</copyright> |
||||||
|
|
||||||
<license url="%licenseURL"> |
<license url="%licenseURL"> |
||||||
%license |
%license |
||||||
</license> |
</license> |
||||||
|
|
||||||
<url> |
<url> |
||||||
<update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> |
<update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> |
||||||
<discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> |
<discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/> |
||||||
</url> |
</url> |
||||||
|
|
||||||
<requires> |
<requires> |
||||||
<import plugin="com.jcraft.jsch"/> |
<import plugin="com.jcraft.jsch"/> |
||||||
</requires> |
</requires> |
||||||
|
|
||||||
<plugin |
<plugin |
||||||
id="org.eclipse.jgit.junit" |
id="org.eclipse.jgit.junit" |
||||||
download-size="0" |
download-size="0" |
||||||
install-size="0" |
install-size="0" |
||||||
version="0.0.0" |
version="0.0.0" |
||||||
unpack="false"/> |
unpack="false"/> |
||||||
|
|
||||||
<plugin |
<plugin |
||||||
id="org.eclipse.jgit.junit.http" |
id="org.eclipse.jgit.junit.http" |
||||||
download-size="0" |
download-size="0" |
||||||
install-size="0" |
install-size="0" |
||||||
version="0.0.0"/> |
version="0.0.0"/> |
||||||
|
|
||||||
<plugin |
<plugin |
||||||
id="org.eclipse.jgit.http.server" |
id="org.eclipse.jgit.http.server" |
||||||
download-size="0" |
download-size="0" |
||||||
install-size="0" |
install-size="0" |
||||||
version="0.0.0"/> |
version="0.0.0"/> |
||||||
|
|
||||||
</feature> |
</feature> |
||||||
|
@ -1,80 +1,80 @@ |
|||||||
/* |
/* |
||||||
* Copyright (C) 2012, Tomasz Zarna <tomasz.zarna@tasktop.com> |
* Copyright (C) 2012, Tomasz Zarna <tomasz.zarna@tasktop.com> |
||||||
* and other copyright owners as documented in the project's IP log. |
* and other copyright owners as documented in the project's IP log. |
||||||
* |
* |
||||||
* This program and the accompanying materials are made available |
* This program and the accompanying materials are made available |
||||||
* under the terms of the Eclipse Distribution License v1.0 which |
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
* accompanies this distribution, is reproduced below, and is |
* accompanies this distribution, is reproduced below, and is |
||||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
* |
* |
||||||
* All rights reserved. |
* All rights reserved. |
||||||
* |
* |
||||||
* Redistribution and use in source and binary forms, with or |
* Redistribution and use in source and binary forms, with or |
||||||
* without modification, are permitted provided that the following |
* without modification, are permitted provided that the following |
||||||
* conditions are met: |
* conditions are met: |
||||||
* |
* |
||||||
* - Redistributions of source code must retain the above copyright |
* - Redistributions of source code must retain the above copyright |
||||||
* notice, this list of conditions and the following disclaimer. |
* notice, this list of conditions and the following disclaimer. |
||||||
* |
* |
||||||
* - Redistributions in binary form must reproduce the above |
* - Redistributions in binary form must reproduce the above |
||||||
* copyright notice, this list of conditions and the following |
* copyright notice, this list of conditions and the following |
||||||
* disclaimer in the documentation and/or other materials provided |
* disclaimer in the documentation and/or other materials provided |
||||||
* with the distribution. |
* with the distribution. |
||||||
* |
* |
||||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
* names of its contributors may be used to endorse or promote |
* names of its contributors may be used to endorse or promote |
||||||
* products derived from this software without specific prior |
* products derived from this software without specific prior |
||||||
* written permission. |
* written permission. |
||||||
* |
* |
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
*/ |
*/ |
||||||
package org.eclipse.jgit.pgm; |
package org.eclipse.jgit.pgm; |
||||||
|
|
||||||
import static org.junit.Assert.assertArrayEquals; |
import static org.junit.Assert.assertArrayEquals; |
||||||
import static org.junit.Assert.assertEquals; |
import static org.junit.Assert.assertEquals; |
||||||
|
|
||||||
import org.eclipse.jgit.api.Git; |
import org.eclipse.jgit.api.Git; |
||||||
import org.eclipse.jgit.lib.CLIRepositoryTestCase; |
import org.eclipse.jgit.lib.CLIRepositoryTestCase; |
||||||
import org.junit.Test; |
import org.junit.Test; |
||||||
|
|
||||||
public class ReflogTest extends CLIRepositoryTestCase { |
public class ReflogTest extends CLIRepositoryTestCase { |
||||||
@Test |
@Test |
||||||
public void testClean() throws Exception { |
public void testClean() throws Exception { |
||||||
assertArrayEquals(new String[] { "" }, execute("git reflog")); |
assertArrayEquals(new String[] { "" }, execute("git reflog")); |
||||||
} |
} |
||||||
|
|
||||||
@Test |
@Test |
||||||
public void testSingleCommit() throws Exception { |
public void testSingleCommit() throws Exception { |
||||||
new Git(db).commit().setMessage("initial commit").call(); |
new Git(db).commit().setMessage("initial commit").call(); |
||||||
|
|
||||||
assertEquals("6fd41be HEAD@{0}: commit (initial): initial commit", |
assertEquals("6fd41be HEAD@{0}: commit (initial): initial commit", |
||||||
execute("git reflog")[0]); |
execute("git reflog")[0]); |
||||||
} |
} |
||||||
|
|
||||||
@Test |
@Test |
||||||
public void testBranch() throws Exception { |
public void testBranch() throws Exception { |
||||||
Git git = new Git(db); |
Git git = new Git(db); |
||||||
git.commit().setMessage("first commit").call(); |
git.commit().setMessage("first commit").call(); |
||||||
git.checkout().setCreateBranch(true).setName("side").call(); |
git.checkout().setCreateBranch(true).setName("side").call(); |
||||||
writeTrashFile("file", "side content"); |
writeTrashFile("file", "side content"); |
||||||
git.add().addFilepattern("file").call(); |
git.add().addFilepattern("file").call(); |
||||||
git.commit().setMessage("side commit").call(); |
git.commit().setMessage("side commit").call(); |
||||||
|
|
||||||
assertArrayEquals(new String[] { |
assertArrayEquals(new String[] { |
||||||
"38890c7 side@{0}: commit: side commit", |
"38890c7 side@{0}: commit: side commit", |
||||||
"d216986 side@{1}: branch: Created from commit first commit", |
"d216986 side@{1}: branch: Created from commit first commit", |
||||||
"" }, execute("git reflog refs/heads/side")); |
"" }, execute("git reflog refs/heads/side")); |
||||||
} |
} |
||||||
} |
} |
@ -1,82 +1,82 @@ |
|||||||
/* |
/* |
||||||
* Copyright (C) 2012, Tomasz Zarna <tomasz.zarna@tasktop.com> |
* Copyright (C) 2012, Tomasz Zarna <tomasz.zarna@tasktop.com> |
||||||
* and other copyright owners as documented in the project's IP log. |
* and other copyright owners as documented in the project's IP log. |
||||||
* |
* |
||||||
* This program and the accompanying materials are made available |
* This program and the accompanying materials are made available |
||||||
* under the terms of the Eclipse Distribution License v1.0 which |
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
* accompanies this distribution, is reproduced below, and is |
* accompanies this distribution, is reproduced below, and is |
||||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
* |
* |
||||||
* All rights reserved. |
* All rights reserved. |
||||||
* |
* |
||||||
* Redistribution and use in source and binary forms, with or |
* Redistribution and use in source and binary forms, with or |
||||||
* without modification, are permitted provided that the following |
* without modification, are permitted provided that the following |
||||||
* conditions are met: |
* conditions are met: |
||||||
* |
* |
||||||
* - Redistributions of source code must retain the above copyright |
* - Redistributions of source code must retain the above copyright |
||||||
* notice, this list of conditions and the following disclaimer. |
* notice, this list of conditions and the following disclaimer. |
||||||
* |
* |
||||||
* - Redistributions in binary form must reproduce the above |
* - Redistributions in binary form must reproduce the above |
||||||
* copyright notice, this list of conditions and the following |
* copyright notice, this list of conditions and the following |
||||||
* disclaimer in the documentation and/or other materials provided |
* disclaimer in the documentation and/or other materials provided |
||||||
* with the distribution. |
* with the distribution. |
||||||
* |
* |
||||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
* names of its contributors may be used to endorse or promote |
* names of its contributors may be used to endorse or promote |
||||||
* products derived from this software without specific prior |
* products derived from this software without specific prior |
||||||
* written permission. |
* written permission. |
||||||
* |
* |
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
*/ |
*/ |
||||||
package org.eclipse.jgit.pgm; |
package org.eclipse.jgit.pgm; |
||||||
|
|
||||||
import java.util.Collection; |
import java.util.Collection; |
||||||
|
|
||||||
import org.eclipse.jgit.api.Git; |
import org.eclipse.jgit.api.Git; |
||||||
import org.eclipse.jgit.api.ReflogCommand; |
import org.eclipse.jgit.api.ReflogCommand; |
||||||
import org.eclipse.jgit.lib.Constants; |
import org.eclipse.jgit.lib.Constants; |
||||||
import org.eclipse.jgit.lib.ReflogEntry; |
import org.eclipse.jgit.lib.ReflogEntry; |
||||||
import org.eclipse.jgit.lib.Repository; |
import org.eclipse.jgit.lib.Repository; |
||||||
import org.kohsuke.args4j.Argument; |
import org.kohsuke.args4j.Argument; |
||||||
|
|
||||||
@Command(common = true, usage = "usage_manageReflogInformation") |
@Command(common = true, usage = "usage_manageReflogInformation") |
||||||
class Reflog extends TextBuiltin { |
class Reflog extends TextBuiltin { |
||||||
|
|
||||||
@Argument(metaVar = "metaVar_ref") |
@Argument(metaVar = "metaVar_ref") |
||||||
private String ref; |
private String ref; |
||||||
|
|
||||||
@Override |
@Override |
||||||
protected void run() throws Exception { |
protected void run() throws Exception { |
||||||
ReflogCommand cmd = new Git(db).reflog(); |
ReflogCommand cmd = new Git(db).reflog(); |
||||||
if (ref != null) |
if (ref != null) |
||||||
cmd.setRef(ref); |
cmd.setRef(ref); |
||||||
Collection<ReflogEntry> entries = cmd.call(); |
Collection<ReflogEntry> entries = cmd.call(); |
||||||
int i = 0; |
int i = 0; |
||||||
for (ReflogEntry entry : entries) { |
for (ReflogEntry entry : entries) { |
||||||
outw.println(toString(entry, i++)); |
outw.println(toString(entry, i++)); |
||||||
} |
} |
||||||
} |
} |
||||||
|
|
||||||
private String toString(ReflogEntry entry, int i) { |
private String toString(ReflogEntry entry, int i) { |
||||||
final StringBuilder s = new StringBuilder(); |
final StringBuilder s = new StringBuilder(); |
||||||
s.append(entry.getNewId().abbreviate(7).name()); |
s.append(entry.getNewId().abbreviate(7).name()); |
||||||
s.append(" "); //$NON-NLS-1$
|
s.append(" "); //$NON-NLS-1$
|
||||||
s.append(ref == null ? Constants.HEAD : Repository.shortenRefName(ref)); |
s.append(ref == null ? Constants.HEAD : Repository.shortenRefName(ref)); |
||||||
s.append("@{" + i + "}:"); //$NON-NLS-1$ //$NON-NLS-2$
|
s.append("@{" + i + "}:"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||||
s.append(" "); //$NON-NLS-1$
|
s.append(" "); //$NON-NLS-1$
|
||||||
s.append(entry.getComment()); |
s.append(entry.getComment()); |
||||||
return s.toString(); |
return s.toString(); |
||||||
} |
} |
||||||
} |
} |
||||||
|
Loading…
Reference in new issue