Browse Source
Change-Id: I05d5392789b5b64e6ee44f678556cf25dc30d7ba Signed-off-by: Ned Twigg <ned.twigg@diffplug.com>stable-4.5
Ned Twigg
9 years ago
committed by
Matthias Sohn
5 changed files with 230 additions and 0 deletions
@ -0,0 +1,136 @@
|
||||
/* |
||||
* Copyright (C) 2016, Ned Twigg <ned.twigg@diffplug.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 org.eclipse.jgit.api.Git; |
||||
import org.eclipse.jgit.lib.CLIRepositoryTestCase; |
||||
import org.junit.Test; |
||||
import static org.eclipse.jgit.junit.JGitTestUtil.check; |
||||
import static org.junit.Assert.assertEquals; |
||||
import static org.junit.Assert.assertTrue; |
||||
import static org.junit.Assert.assertFalse; |
||||
|
||||
public class CleanTest extends CLIRepositoryTestCase { |
||||
@Test |
||||
public void testCleanRequiresForce() throws Exception { |
||||
try (Git git = new Git(db)) { |
||||
assertArrayOfLinesEquals( |
||||
new String[] { "Removing a", "Removing b" }, |
||||
execute("git clean")); |
||||
} catch (Die e) { |
||||
// TODO: should be "fatal: clean.requireForce defaults to true and
|
||||
// neither -i, -n, nor -f given; refusing to clean" but we don't
|
||||
// support -i yet. Fix this when/if we add support for -i.
|
||||
assertEquals( |
||||
"fatal: clean.requireForce defaults to true and neither -n nor -f given; refusing to clean", |
||||
e.getMessage()); |
||||
} |
||||
} |
||||
|
||||
@Test |
||||
public void testCleanRequiresForceConfig() throws Exception { |
||||
try (Git git = new Git(db)) { |
||||
git.getRepository().getConfig().setBoolean("clean", null, |
||||
"requireForce", false); |
||||
assertArrayOfLinesEquals( |
||||
new String[] { "" }, |
||||
execute("git clean")); |
||||
} |
||||
} |
||||
|
||||
@Test |
||||
public void testCleanLeaveDirs() throws Exception { |
||||
try (Git git = new Git(db)) { |
||||
git.commit().setMessage("initial commit").call(); |
||||
|
||||
writeTrashFile("dir/file", "someData"); |
||||
writeTrashFile("a", "someData"); |
||||
writeTrashFile("b", "someData"); |
||||
|
||||
// all these files should be there
|
||||
assertTrue(check(db, "a")); |
||||
assertTrue(check(db, "b")); |
||||
assertTrue(check(db, "dir/file")); |
||||
|
||||
// dry run should make no change
|
||||
assertArrayOfLinesEquals( |
||||
new String[] { "Removing a", "Removing b" }, |
||||
execute("git clean -n")); |
||||
assertTrue(check(db, "a")); |
||||
assertTrue(check(db, "b")); |
||||
assertTrue(check(db, "dir/file")); |
||||
|
||||
// force should make a change
|
||||
assertArrayOfLinesEquals( |
||||
new String[] { "Removing a", "Removing b" }, |
||||
execute("git clean -f")); |
||||
assertFalse(check(db, "a")); |
||||
assertFalse(check(db, "b")); |
||||
assertTrue(check(db, "dir/file")); |
||||
} |
||||
} |
||||
|
||||
@Test |
||||
public void testCleanDeleteDirs() throws Exception { |
||||
try (Git git = new Git(db)) { |
||||
git.commit().setMessage("initial commit").call(); |
||||
|
||||
writeTrashFile("dir/file", "someData"); |
||||
writeTrashFile("a", "someData"); |
||||
writeTrashFile("b", "someData"); |
||||
|
||||
// all these files should be there
|
||||
assertTrue(check(db, "a")); |
||||
assertTrue(check(db, "b")); |
||||
assertTrue(check(db, "dir/file")); |
||||
|
||||
assertArrayOfLinesEquals( |
||||
new String[] { "Removing a", "Removing b", |
||||
"Removing dir/" }, |
||||
execute("git clean -d -f")); |
||||
assertFalse(check(db, "a")); |
||||
assertFalse(check(db, "b")); |
||||
assertFalse(check(db, "dir/file")); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,86 @@
|
||||
/* |
||||
* Copyright (C) 2016, Ned Twigg <ned.twigg@diffplug.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.text.MessageFormat; |
||||
import java.util.Set; |
||||
|
||||
import org.eclipse.jgit.api.Git; |
||||
import org.eclipse.jgit.pgm.internal.CLIText; |
||||
import org.kohsuke.args4j.Option; |
||||
|
||||
@Command(common = true, usage = "usage_clean") |
||||
class Clean extends TextBuiltin { |
||||
@Option(name = "-d", usage = "usage_removeUntrackedDirectories") |
||||
private boolean dirs = false; |
||||
|
||||
@Option(name = "--force", aliases = { |
||||
"-f" }, usage = "usage_forceClean") |
||||
private boolean force = false; |
||||
|
||||
@Option(name = "--dryRun", aliases = { "-n" }) |
||||
private boolean dryRun = false; |
||||
|
||||
@Override |
||||
protected void run() throws Exception { |
||||
try (Git git = new Git(db)) { |
||||
boolean requireForce = git.getRepository().getConfig() |
||||
.getBoolean("clean", "requireForce", true); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
if (requireForce && !(force || dryRun)) { |
||||
throw die(CLIText.fatalError(CLIText.get().cleanRequireForce)); |
||||
} |
||||
// Note that CleanCommand's setForce(true) will delete
|
||||
// .git folders. In the cgit cli, this behavior
|
||||
// requires setting "-f" twice, not sure how to do
|
||||
// this with args4j, so this feature is unimplemented
|
||||
// for now.
|
||||
Set<String> removedFiles = git.clean().setCleanDirectories(dirs) |
||||
.setDryRun(dryRun).call(); |
||||
for (String removedFile : removedFiles) { |
||||
outw.println(MessageFormat.format(CLIText.get().removing, |
||||
removedFile)); |
||||
} |
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue