Browse Source
Added support for converting DiffEntrys to FileHeaders. FileHeaders are DiffEntrys with a buffer containing the diff output as well as a list of HunkHeaders. The HunkHeaders contain EditLists. The createFileHeader(DiffEntry) method in DiffFormatter performs a Myers Diff on the files refered to by the DiffEntry, then puts the returned EditList into a single HunkHeader, which is then put into the FileHeader to be returned. It also generates the appropriate diff header an puts it into the FileHeader's buffer. The rest of the diff output, which would normally be parsed to generate the HunkHeaders, is not generated. In fact, the purpose of this method is to avoid the costly diff output generation and parsing normally required to create a FileHeader. Change-Id: I7d8b18c0f6c85e3d02ad58995d3d231e69af5887stable-0.9
Jeff Schumacher
15 years ago
6 changed files with 396 additions and 97 deletions
@ -0,0 +1,186 @@
|
||||
/* |
||||
* Copyright (C) 2010, Google Inc. |
||||
* 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.diff; |
||||
|
||||
import org.eclipse.jgit.diff.DiffEntry.ChangeType; |
||||
import org.eclipse.jgit.junit.TestRepository; |
||||
import org.eclipse.jgit.lib.FileMode; |
||||
import org.eclipse.jgit.lib.ObjectId; |
||||
import org.eclipse.jgit.lib.RepositoryTestCase; |
||||
import org.eclipse.jgit.patch.FileHeader; |
||||
import org.eclipse.jgit.patch.HunkHeader; |
||||
import org.eclipse.jgit.util.RawParseUtils; |
||||
import org.eclipse.jgit.util.io.DisabledOutputStream; |
||||
|
||||
public class DiffFormatterTest extends RepositoryTestCase { |
||||
private static final String DIFF = "diff --git "; |
||||
|
||||
private static final String REGULAR_FILE = "100644"; |
||||
|
||||
private static final String GITLINK = "160000"; |
||||
|
||||
private static final String PATH_A = "src/a"; |
||||
|
||||
private static final String PATH_B = "src/b"; |
||||
|
||||
private DiffFormatter df; |
||||
|
||||
private TestRepository testDb; |
||||
|
||||
@Override |
||||
public void setUp() throws Exception { |
||||
super.setUp(); |
||||
testDb = new TestRepository(db); |
||||
df = new DiffFormatter(DisabledOutputStream.INSTANCE); |
||||
df.setRepository(db); |
||||
} |
||||
|
||||
public void testCreateFileHeader_Modify() throws Exception { |
||||
ObjectId adId = blob("a\nd\n"); |
||||
ObjectId abcdId = blob("a\nb\nc\nd\n"); |
||||
|
||||
String diffHeader = makeDiffHeader(PATH_A, PATH_A, adId, abcdId); |
||||
|
||||
DiffEntry ad = DiffEntry.delete(PATH_A, adId); |
||||
DiffEntry abcd = DiffEntry.add(PATH_A, abcdId); |
||||
|
||||
DiffEntry mod = DiffEntry.pair(ChangeType.MODIFY, ad, abcd, 0); |
||||
|
||||
FileHeader fh = df.createFileHeader(mod); |
||||
|
||||
assertEquals(diffHeader, RawParseUtils.decode(fh.getBuffer())); |
||||
assertEquals(0, fh.getStartOffset()); |
||||
assertEquals(fh.getBuffer().length, fh.getEndOffset()); |
||||
assertEquals(FileHeader.PatchType.UNIFIED, fh.getPatchType()); |
||||
|
||||
assertEquals(1, fh.getHunks().size()); |
||||
|
||||
HunkHeader hh = fh.getHunks().get(0); |
||||
assertEquals(1, hh.toEditList().size()); |
||||
|
||||
EditList el = hh.toEditList(); |
||||
assertEquals(1, el.size()); |
||||
|
||||
Edit e = el.get(0); |
||||
assertEquals(1, e.getBeginA()); |
||||
assertEquals(1, e.getEndA()); |
||||
assertEquals(1, e.getBeginB()); |
||||
assertEquals(3, e.getEndB()); |
||||
assertEquals(Edit.Type.INSERT, e.getType()); |
||||
} |
||||
|
||||
public void testCreateFileHeader_Binary() throws Exception { |
||||
ObjectId adId = blob("a\nd\n"); |
||||
ObjectId binId = blob("a\nb\nc\n\0\0\0\0d\n"); |
||||
|
||||
String diffHeader = makeDiffHeader(PATH_A, PATH_B, adId, binId) |
||||
+ "Binary files differ\n"; |
||||
|
||||
DiffEntry ad = DiffEntry.delete(PATH_A, adId); |
||||
DiffEntry abcd = DiffEntry.add(PATH_B, binId); |
||||
|
||||
DiffEntry mod = DiffEntry.pair(ChangeType.MODIFY, ad, abcd, 0); |
||||
|
||||
FileHeader fh = df.createFileHeader(mod); |
||||
|
||||
assertEquals(diffHeader, RawParseUtils.decode(fh.getBuffer())); |
||||
assertEquals(FileHeader.PatchType.BINARY, fh.getPatchType()); |
||||
|
||||
assertEquals(1, fh.getHunks().size()); |
||||
|
||||
HunkHeader hh = fh.getHunks().get(0); |
||||
assertEquals(0, hh.toEditList().size()); |
||||
} |
||||
|
||||
public void testCreateFileHeader_GitLink() throws Exception { |
||||
ObjectId aId = blob("a\n"); |
||||
ObjectId bId = blob("b\n"); |
||||
|
||||
String diffHeader = makeDiffHeaderModeChange(PATH_A, PATH_A, aId, bId, |
||||
GITLINK, REGULAR_FILE) |
||||
+ "-Subproject commit " + aId.name() + "\n"; |
||||
|
||||
DiffEntry ad = DiffEntry.delete(PATH_A, aId); |
||||
ad.oldMode = FileMode.GITLINK; |
||||
DiffEntry abcd = DiffEntry.add(PATH_A, bId); |
||||
|
||||
DiffEntry mod = DiffEntry.pair(ChangeType.MODIFY, ad, abcd, 0); |
||||
|
||||
FileHeader fh = df.createFileHeader(mod); |
||||
|
||||
assertEquals(diffHeader, RawParseUtils.decode(fh.getBuffer())); |
||||
|
||||
assertEquals(1, fh.getHunks().size()); |
||||
|
||||
HunkHeader hh = fh.getHunks().get(0); |
||||
assertEquals(0, hh.toEditList().size()); |
||||
} |
||||
|
||||
private String makeDiffHeader(String pathA, String pathB, ObjectId aId, |
||||
ObjectId bId) { |
||||
String a = aId.abbreviate(db).name(); |
||||
String b = bId.abbreviate(db).name(); |
||||
return DIFF + "a/" + pathA + " " + "b/" + pathB + "\n" + //
|
||||
"index " + a + ".." + b + " " + REGULAR_FILE + "\n" + //
|
||||
"--- a/" + pathA + "\n" + //
|
||||
"+++ b/" + pathB + "\n"; |
||||
} |
||||
|
||||
private String makeDiffHeaderModeChange(String pathA, String pathB, |
||||
ObjectId aId, ObjectId bId, String modeA, String modeB) { |
||||
String a = aId.abbreviate(db).name(); |
||||
String b = bId.abbreviate(db).name(); |
||||
return DIFF + "a/" + pathA + " " + "b/" + pathB + "\n" + //
|
||||
"old mode " + modeA + "\n" + //
|
||||
"new mode " + modeB + "\n" + //
|
||||
"index " + a + ".." + b + "\n" + //
|
||||
"--- a/" + pathA + "\n" + //
|
||||
"+++ b/" + pathB + "\n"; |
||||
} |
||||
|
||||
private ObjectId blob(String content) throws Exception { |
||||
return testDb.blob(content).copy(); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue