Bug: 394497 Change-Id: Ib8bc1d9fd789d22fe5f10e03068a11cfdd3e46eb Signed-off-by: Chris Aniszczyk <zx@twitter.com>tags/v2.2.0.201212191850-r
/* | |||||
* Copyright (C) 2012, Tomasz Zarna <tomasz.zarna@tasktop.com> | |||||
* 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")); | |||||
} | |||||
} |
org.eclipse.jgit.pgm.MergeBase | org.eclipse.jgit.pgm.MergeBase | ||||
org.eclipse.jgit.pgm.Push | org.eclipse.jgit.pgm.Push | ||||
org.eclipse.jgit.pgm.ReceivePack | org.eclipse.jgit.pgm.ReceivePack | ||||
org.eclipse.jgit.pgm.Reflog | |||||
org.eclipse.jgit.pgm.RevList | org.eclipse.jgit.pgm.RevList | ||||
org.eclipse.jgit.pgm.RevParse | org.eclipse.jgit.pgm.RevParse | ||||
org.eclipse.jgit.pgm.Rm | org.eclipse.jgit.pgm.Rm |
usage_listBothRemoteTrackingAndLocalBranches=list both remote-tracking and local branches | usage_listBothRemoteTrackingAndLocalBranches=list both remote-tracking and local branches | ||||
usage_listCreateOrDeleteBranches=List, create, or delete branches | usage_listCreateOrDeleteBranches=List, create, or delete branches | ||||
usage_logAllPretty=format:%H %ct %P' output=log --all '--pretty=format:%H %ct %P' output | usage_logAllPretty=format:%H %ct %P' output=log --all '--pretty=format:%H %ct %P' output | ||||
usage_manageReflogInformation=Manage reflog information | |||||
usage_mergeStrategy=Use the given merge strategy. Can be supplied more than once to specify them in the order they should be tried. If there is no -s option, the resolve strategy is used. Currently the following strategies are supported: ours, theirs, simple-two-way-in-core, resolve | usage_mergeStrategy=Use the given merge strategy. Can be supplied more than once to specify them in the order they should be tried. If there is no -s option, the resolve strategy is used. Currently the following strategies are supported: ours, theirs, simple-two-way-in-core, resolve | ||||
usage_moveRenameABranch=move/rename a branch | usage_moveRenameABranch=move/rename a branch | ||||
usage_nameStatus=show only name and status of files | usage_nameStatus=show only name and status of files |
/* | |||||
* Copyright (C) 2012, Tomasz Zarna <tomasz.zarna@tasktop.com> | |||||
* 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.ObjectId; | |||||
import org.eclipse.jgit.lib.Repository; | |||||
import org.eclipse.jgit.storage.file.ReflogEntry; | |||||
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<ReflogEntry> 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(" "); | |||||
s.append(ref == null ? Constants.HEAD : Repository.shortenRefName(ref)); | |||||
s.append("@{" + i + "}:"); | |||||
s.append(" "); | |||||
// temporary workaround for bug 393463 | |||||
if (entry.getOldId().equals(ObjectId.zeroId())) | |||||
s.append(entry.getComment().replaceFirst("^commit:", | |||||
"commit (initial):")); | |||||
else | |||||
s.append(entry.getComment()); | |||||
return s.toString(); | |||||
} | |||||
} |