HTML formatting a file diff?

evan_k

I'm wondering if anyone knows of existing PHP code that can take an existing file diff (specifically a unified diff), and add html formatting to it, similar to Perl's SVN::Web or Python's Trac.

I actually already have the text of the diff:

===================================================================
--- /Users/jdoe/alpha/a1.txt        (revision 4)
+++ /Users/jdoe/alpha/a1.txt        (working copy)
@@ -1,7 +1,6 @@
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis. Nullam sit amet enim. Suspendisse id velit vitae ligula volutpat condimentum.

-Aliquam erat volutpat. Sed quis velit. Nulla facilisi. Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer.
-
 Sed aliquam, nunc eget euismod ullamcorper, lectus nunc ullamcorper orci, fermentum bibendum enim nibh eget ipsum.

-Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.
\ No newline at end of file
+Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.
+

So I need something I can provide that to, and at least get back some spans I can style with css...Is this something I'm going to need to roll my own?

I was scanning Text_Diff, but from what I could tell from the mess of documentation:

it needs to do the diff itself
it doesnt have html formatting options

NogDog

Guess I was bored...here's something to work with:

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html lang='en'>
<head>
<meta http-equiv='Content-Type' content='text/html; charset=ISO-8859-1'>
<meta name="description" content="">
<meta name="keywords" content="">
<title>Untitled</title>
<!-- link rel='stylesheet' href='/include/style.css' type='text/css' -->
<style type="text/css">
<!--
.diff {
   font: medium 'courier new', courier, monospace;
   border: solid 1px green;
   padding: 0.5em;
}
.diff_head{
   border: solid 1px black;
   padding: 0;
}
.minus3 {
   background-color: #fcc;
   color: #900;
   font-weight: bold;
}
.plus3 {
   background-color: #cfc;
   color: #090;
   font-weight: bold;
}
.ampersand {
   background-color: #ff9;
   color: #009;
   font-weight: bold;
}
.minus {
   background-color: #fcc;
   color: black;
}
.plus {
   background-color: #cfc;
   color: black;
}
-->
</style>
</head>
<body>
<div class="diff">
<?php
$text = <<<EOD
===================================================================
--- /Users/jdoe/alpha/a1.txt        (revision 4)
+++ /Users/jdoe/alpha/a1.txt        (working copy)
@@ -1,7 +1,6 @@
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis. Nullam sit amet enim. Suspendisse id velit vitae ligula volutpat condimentum.

-Aliquam erat volutpat. Sed quis velit. Nulla facilisi. Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer.
-
 Sed aliquam, nunc eget euismod ullamcorper, lectus nunc ullamcorper orci, fermentum bibendum enim nibh eget ipsum.

-Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.
\ No newline at end of file
+Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.
+
EOD;

$search = array(
   '/^---(.*)$/m'    => '<div class="diff_head"><span class="minus3">\\1</span>',
   '/^\+\+\+(.*)$/m' => '<span class="plus3">\\1</span>',
   '/^@@(.*)@@$/m'   => '<span class="ampersand">\\1</span></div>',
   '/^-(.*)$/m'      => '<span class="minus">\\1</span>',
   '/^\+(.*)$/m'     => '<span class="plus">\\1</span>'
);
echo nl2br(preg_replace(array_keys($search), $search, htmlspecialchars($text)));
?>
</div>
</body>
</html>

evan_k

Hmm, so I guess I will have to roll my own...Thanks, Nog, for giving me a robust jumping off point! I appreciate it 🙂

NogDog

evan_k wrote:
Hmm, so I guess I will have to roll my own...Thanks, Nog, for giving me a robust jumping off point! I appreciate it 🙂

There may be something out there, but my rather quick search did not turn up anything promising.