@Option(name = "-U", aliases = { "--unified" }, metaVar = "metaVar_linesOfContext") void unified(int lines) { diffFmt.setContext(lines); }
@Option(name = "-U", aliases = { "--unified" }, metaVar = "metaVar_linesOfContext") void unified(int lines) { diffFmt.setContext(lines); }
@Option(name = "-U", aliases = { "--unified" }, metaVar = "metaVar_linesOfContext") void unified(int lines) { diffFmt.setContext(lines); }
private void setContext(DiffFormatter df) { try { int context = getSystemProperty("git.diffcontext"); /* TODO: make it into a configuration */ df.setContext(context); } catch (Exception e) { return; } }
else { if (contextLines >= 0) diffFmt.setContext(contextLines); if (destinationPrefix != null) diffFmt.setNewPrefix(destinationPrefix);
// Create two commits to be compared File file = new File( git.getRepository().getWorkTree(), "file.txt" ); writeFile( file, "line1\n" ); RevCommit oldCommit = commitChanges(); writeFile( file, "line1\nline2\n" ); RevCommit newCommit = commitChanges(); // Obtain tree iterators to traverse the tree of the old/new commit ObjectReader reader = git.getRepository().newObjectReader(); CanonicalTreeParser oldTreeIter = new CanonicalTreeParser(); oldTreeIter.reset( reader, oldCommit.getTree() ); CanonicalTreeParser newTreeIter = new CanonicalTreeParser(); newTreeIter.reset( reader, newCommit.getTree() ); // Use a DiffFormatter to compare new and old tree and return a list of changes DiffFormatter diffFormatter = new DiffFormatter( DisabledOutputStream.INSTANCE ); diffFormatter.setRepository( git.getRepository() ); diffFormatter.setContext( 0 ); List<DiffEntry> entries = diffFormatter.scan( newTreeIter, oldTreeIter ); // Print the contents of the DiffEntries for( DiffEntry entry : entries ) { System.out.println( entry ); FileHeader fileHeader = diffFormatter.toFileHeader( entry ); List<? extends HunkHeader> hunks = fileHeader.getHunks(); for( HunkHeader hunk : hunks ) { System.out.println( hunk ); } }
ByteArrayOutputStream baos = new ByteArrayOutputStream(); DiffFormatter formatter = new DiffFormatter(baos); formatter.setContext(4); formatter.setRepository(repo.getRepository()); for (DiffEntry de : diff) {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); DiffFormatter formatter = new DiffFormatter(baos); formatter.setContext(4); formatter.setRepository(repo.getRepository()); for (DiffEntry de : diff) {
diffFormatter.setContext(0); //we only want to index the changes diffFormatter.setDetectRenames(true);
diffFormatter.setContext(0); List<DiffEntry> entries = diffFormatter.scan(newTreeIter, oldTreeIter);
else { if (contextLines >= 0) diffFmt.setContext(contextLines); if (destinationPrefix != null) diffFmt.setNewPrefix(destinationPrefix);
} else { if (contextLines >= 0) { diffFmt.setContext(contextLines);
else { if (contextLines >= 0) diffFmt.setContext(contextLines); if (destinationPrefix != null) diffFmt.setNewPrefix(destinationPrefix);
DiffFormatter diffFormatter = new DiffFormatter(DisabledOutputStream.INSTANCE); diffFormatter.setRepository(repository); diffFormatter.setContext(0);