Permalink
Browse files

Add filters that include commits that add/remove empty blobs

  • Loading branch information...
1 parent dae0ce6 commit 9702bb6bb38d0f054b7e3b9876384323c9bc72bd @kevinsawicki committed May 7, 2012
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2011 Kevin Sawicki <kevinsawicki@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+package org.gitective.core.filter.commit;
+
+import static org.eclipse.jgit.lib.Constants.EMPTY_BLOB_ID;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.lib.AbbreviatedObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.filter.RevFilter;
+
+/**
+ * Filter that includes commits that add an empty blob.
+ * <p>
+ * The commits included will either add a new file that is empty or edit an
+ * existing file that was previously not empty but edited to be empty in the
+ * given commit.
+ */
+public class EmptyBlobAddFilter extends CommitDiffFilter {
+
+ /**
+ * Create empty blob add filter
+ */
+ public EmptyBlobAddFilter() {
+ super();
+ }
+
+ /**
+ * Create empty blob add filter
+ *
+ * @param detectRenames
+ */
+ public EmptyBlobAddFilter(final boolean detectRenames) {
+ super(detectRenames);
+ }
+
+ @Override
+ public boolean include(final RevCommit commit,
+ final Collection<DiffEntry> diffs) throws IOException {
+ for (DiffEntry diff : diffs) {
+ final AbbreviatedObjectId oldId = diff.getOldId();
+ if (oldId == null)
+ continue;
+ if (!EMPTY_BLOB_ID.equals(oldId.toObjectId())
+ && EMPTY_BLOB_ID.equals(diff.getNewId().toObjectId()))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public RevFilter clone() {
+ return new EmptyBlobAddFilter(detectRenames);
+ }
+}
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2012 Kevin Sawicki <kevinsawicki@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+package org.gitective.core.filter.commit;
+
+import static org.eclipse.jgit.lib.Constants.EMPTY_BLOB_ID;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.lib.AbbreviatedObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.filter.RevFilter;
+
+/**
+ * Filter that includes commits that remove an empty blob
+ * <p>
+ * The commits included will either delete an existing empty file or edit an
+ * existing file that was empty but edited to be no longer empty in the given
+ * commit.
+ */
+public class EmptyBlobRemoveFilter extends CommitDiffFilter {
+
+ /**
+ * Create empty blob add filter
+ */
+ public EmptyBlobRemoveFilter() {
+ super();
+ }
+
+ /**
+ * Create empty blob add filter
+ *
+ * @param detectRenames
+ */
+ public EmptyBlobRemoveFilter(final boolean detectRenames) {
+ super(detectRenames);
+ }
+
+ @Override
+ public boolean include(final RevCommit commit,
+ final Collection<DiffEntry> diffs) throws IOException {
+ for (DiffEntry diff : diffs) {
+ final AbbreviatedObjectId oldId = diff.getOldId();
+ if (oldId == null)
+ continue;
+ if (EMPTY_BLOB_ID.equals(oldId.toObjectId())
+ && !EMPTY_BLOB_ID.equals(diff.getNewId().toObjectId()))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public RevFilter clone() {
+ return new EmptyBlobRemoveFilter(detectRenames);
+ }
+}
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2011 Kevin Sawicki <kevinsawicki@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+package org.gitective.tests;
+
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.gitective.core.CommitFinder;
+import org.gitective.core.filter.commit.AllCommitFilter;
+import org.gitective.core.filter.commit.AndCommitFilter;
+import org.gitective.core.filter.commit.CommitListFilter;
+import org.gitective.core.filter.commit.EmptyBlobAddFilter;
+import org.gitective.core.filter.commit.EmptyBlobRemoveFilter;
+import org.junit.Test;
+
+/**
+ * Unit tests of {@link EmptyBlobAddFilter} and {@link EmptyBlobRemoveFilter}
+ */
+public class EmptyBlobTest extends GitTestCase {
+
+ /**
+ * Test commits with no empty blobs
+ *
+ * @throws Exception
+ */
+ @Test
+ public void noEmpties() throws Exception {
+ add("file1.txt", "a");
+ add("file2.txt", "b");
+ delete("file2.txt");
+
+ CommitListFilter commits = new CommitListFilter();
+ new CommitFinder(testRepo).setMatcher(
+ new AllCommitFilter(new AndCommitFilter(
+ new EmptyBlobAddFilter(), commits),
+ new AndCommitFilter(new EmptyBlobRemoveFilter(),
+ commits))).find();
+
+ assertTrue(commits.getCommits().isEmpty());
+ }
+
+ /**
+ * Test adding an empty blob
+ *
+ * @throws Exception
+ */
+ @Test
+ public void add() throws Exception {
+ add("file1.txt", "content");
+ RevCommit commit = add("file2.txt", "");
+ CommitListFilter commits = new CommitListFilter();
+ new CommitFinder(testRepo).setMatcher(
+ new AllCommitFilter(new AndCommitFilter(
+ new EmptyBlobAddFilter(), commits))).find();
+
+ assertEquals(1, commits.getCommits().size());
+ assertTrue(commits.getCommits().contains(commit));
+ }
+
+ /**
+ * Test removing an empty blob
+ *
+ * @throws Exception
+ */
+ @Test
+ public void remove() throws Exception {
+ add("file1.txt", "content");
+ add("file2.txt", "");
+ RevCommit commit = delete("file2.txt");
+ CommitListFilter commits = new CommitListFilter();
+ new CommitFinder(testRepo).setMatcher(
+ new AllCommitFilter(new AndCommitFilter(
+ new EmptyBlobRemoveFilter(), commits))).find();
+
+ assertEquals(1, commits.getCommits().size());
+ assertTrue(commits.getCommits().contains(commit));
+ }
+}

0 comments on commit 9702bb6

Please sign in to comment.