http://pear.php.net/bugs/search.php?cmd=display&package_name%5B0%5D=Text_Diff Search Results en-us pear-webmaster@lists.php.net pear-webmaster@lists.php.net hourly 1 2000-01-01T12:00+00:00 http://pear.php.net/gifs/pearsmall.gif http://pear.php.net/bugs http://pear.php.net/bugs/17620 Text_Diff Feature/Change Request Reported by dirkthomas_tigrisorg 2010-07-22T12:52:29+00:00 PHP: 5.3.2 OS: Windows 7 Package Version: 1.1.1 Description: ------------ If you want to use the package to diff two different files it should be possible to detect differences in line endings too. This is currently not possible since every engine processes the passed line with "trimNewlines". Therefore this should be moved out of the engines are at least be made configurable. Since i am a developer of WebSVN (http://www.websvn.info) i currently have to patch the package to remove the trimming, since it is perfectly valid to have lines which only differ in line endings, but which needs to be detected as a difference.]]> Text_Diff Feature/Change Request Reported by dirkthomas_tigrisorg 2010-07-22T12:52:29+00:00 PHP: 5.3.2 OS: Windows 7 Package Version: 1.1.1 Description: ------------ If you want to use the package to diff two different files it should be possible to detect differences in line endings too. This is currently not possible since every engine processes the passed line with "trimNewlines". Therefore this should be moved out of the engines are at least be made configurable. Since i am a developer of WebSVN (http://www.websvn.info) i currently have to patch the package to remove the trimming, since it is perfectly valid to have lines which only differ in line endings, but which needs to be detected as a difference.]]> 2011-06-06T14:33:17+00:00 dirkthomas &#x61;&#116; tigris &#x64;&#111;&#x74; org Text_Diff Feature/Change Request http://pear.php.net/bugs/17502 Text_Diff Bug Reported by stoefln 2010-06-18T14:49:56+00:00 PHP: 5.2.12 OS: MacOs X, Windows XP Package Version: 1.1.1 Description: ------------ try to merge the files underneith, you will get an merge conflict. diff3 on my mac system merges this without problems. ====BASE FILE==== // some merge test aaa bbb ccc ccc ddd eee fff ggg hhh ====CHANGED FILE1==== // some merge test aaa bbb-this line is changed ccc ddd eee fff ggg hhh ====CHANGED FILE2==== // some merge test aaa bbb ccc ccc ddd eee fff this line added ggg hhh Test script: --------------- <?php $PATH_typo3conf = '/Applications/MAMP/htdocs/typo3_svn/typo3conf/'; require_once $PATH_typo3conf . 'ext/extbase_kickstarter/lib/pear/' . "Text/Diff/Engine/native.php"; require_once $PATH_typo3conf . 'ext/extbase_kickstarter/lib/pear/' . "Text/Diff3.php"; $base = $PATH_typo3conf .'ext/extbase_kickstarter/testmerge/Box_base.php'; $file2 = $PATH_typo3conf .'ext/extbase_kickstarter/testmerge/Box_generated.php'; $file3 = $PATH_typo3conf .'ext/extbase_kickstarter/testmerge/Box.php'; $merger = new Text_Diff3(file($base), file($file2),file($file3)); echo "<h1>merged</h1><pre>"; print_r($merger); echo "<hr>"; print_r($merger->mergedOutput()); echo "</pre>"; ?> Expected result: ---------------- ====SUCCESSFULLY MERGED FILE==== // some merge test aaa bbb-this line is changed ccc ddd eee fff this line added ggg hhh Actual result: -------------- Array ( [0] => // some merge test [1] => aaa [2] => bbb-this line is changed [3] => ccc [4] => ddd [5] => eee [6] => fff [7] => <<<<<<< [8] => this line added [9] => ======= [10] => ggg [11] => hhh [12] => >>>>>>> [13] => ggg [14] => hhh )]]> Text_Diff Bug Reported by stoefln 2010-06-18T14:49:56+00:00 PHP: 5.2.12 OS: MacOs X, Windows XP Package Version: 1.1.1 Description: ------------ try to merge the files underneith, you will get an merge conflict. diff3 on my mac system merges this without problems. ====BASE FILE==== // some merge test aaa bbb ccc ccc ddd eee fff ggg hhh ====CHANGED FILE1==== // some merge test aaa bbb-this line is changed ccc ddd eee fff ggg hhh ====CHANGED FILE2==== // some merge test aaa bbb ccc ccc ddd eee fff this line added ggg hhh Test script: --------------- <?php $PATH_typo3conf = '/Applications/MAMP/htdocs/typo3_svn/typo3conf/'; require_once $PATH_typo3conf . 'ext/extbase_kickstarter/lib/pear/' . "Text/Diff/Engine/native.php"; require_once $PATH_typo3conf . 'ext/extbase_kickstarter/lib/pear/' . "Text/Diff3.php"; $base = $PATH_typo3conf .'ext/extbase_kickstarter/testmerge/Box_base.php'; $file2 = $PATH_typo3conf .'ext/extbase_kickstarter/testmerge/Box_generated.php'; $file3 = $PATH_typo3conf .'ext/extbase_kickstarter/testmerge/Box.php'; $merger = new Text_Diff3(file($base), file($file2),file($file3)); echo "<h1>merged</h1><pre>"; print_r($merger); echo "<hr>"; print_r($merger->mergedOutput()); echo "</pre>"; ?> Expected result: ---------------- ====SUCCESSFULLY MERGED FILE==== // some merge test aaa bbb-this line is changed ccc ddd eee fff this line added ggg hhh Actual result: -------------- Array ( [0] => // some merge test [1] => aaa [2] => bbb-this line is changed [3] => ccc [4] => ddd [5] => eee [6] => fff [7] => <<<<<<< [8] => this line added [9] => ======= [10] => ggg [11] => hhh [12] => >>>>>>> [13] => ggg [14] => hhh )]]> 2010-06-18T15:56:00+00:00 spetzl &#x61;&#116; gmx &#x64;&#111;&#x74; at Text_Diff Bug http://pear.php.net/bugs/16965 Text_Diff Feature/Change Request Reported by markush 2010-01-03T20:49:27+00:00 PHP: 5.2.5 OS: Ubuntu Package Version: 1.1.1 Description: ------------ This is a patchset for formatting the output of context- and unified-diff (cf. to the inline-output). Test script: --------------- At this link you can download the patches: http://markusholtermann.eu/?cat=downloads&subcat=websoftware&id=6]]> Text_Diff Feature/Change Request Reported by markush 2010-01-03T20:49:27+00:00 PHP: 5.2.5 OS: Ubuntu Package Version: 1.1.1 Description: ------------ This is a patchset for formatting the output of context- and unified-diff (cf. to the inline-output). Test script: --------------- At this link you can download the patches: http://markusholtermann.eu/?cat=downloads&subcat=websoftware&id=6]]> 2010-01-03T20:49:27+00:00 info &#x61;&#116; markusholtermann &#x64;&#111;&#x74; eu Text_Diff Feature/Change Request http://pear.php.net/bugs/16774 Text_Diff Feature/Change Request Reported by arencambre 2009-11-10T10:04:15+00:00 PHP: 5.2.5 OS: Debian Package Version: 1.1.1 Description: ------------ The online diff utility has a terribly insufficient word boundary definition. Currently it only defines space and \n as word boundaries. This means any punctuation will be part of a word boundary. This can cause serious usability problems. I recommend altering lines 158 and 159 of PEAR/Text/Diff/Renderer/inline.php and dramatically expanding the characters that define word boundaries to include all common punctuation. Test script: --------------- Diff these lines: The quick cat jumped over the lazy fox, who was totally lazy and should be shot. The quick cat jumped over the lazy fox. Expected result: ---------------- The quick cat jumped over the lazy fox<del>, who was totally lazy and should be shot.</del>. This is a much more accurate and legible deletion since the result does not reconstruct the sentence structure. Actual result: -------------- The quick cat jumped over the lazy <del>fox, who was totally lazy and should be shot.</del><ins>fox.</ins> This renders terribly because the first half of the sentence is split by the part that was deleted.]]> Text_Diff Feature/Change Request Reported by arencambre 2009-11-10T10:04:15+00:00 PHP: 5.2.5 OS: Debian Package Version: 1.1.1 Description: ------------ The online diff utility has a terribly insufficient word boundary definition. Currently it only defines space and \n as word boundaries. This means any punctuation will be part of a word boundary. This can cause serious usability problems. I recommend altering lines 158 and 159 of PEAR/Text/Diff/Renderer/inline.php and dramatically expanding the characters that define word boundaries to include all common punctuation. Test script: --------------- Diff these lines: The quick cat jumped over the lazy fox, who was totally lazy and should be shot. The quick cat jumped over the lazy fox. Expected result: ---------------- The quick cat jumped over the lazy fox<del>, who was totally lazy and should be shot.</del>. This is a much more accurate and legible deletion since the result does not reconstruct the sentence structure. Actual result: -------------- The quick cat jumped over the lazy <del>fox, who was totally lazy and should be shot.</del><ins>fox.</ins> This renders terribly because the first half of the sentence is split by the part that was deleted.]]> 2009-11-10T16:19:27+00:00 aren &#x61;&#116; arencambre &#x64;&#111;&#x74; com Text_Diff Feature/Change Request http://pear.php.net/bugs/6359 Text_Diff Feature/Change Request Reported by nlopess 2005-12-28T18:39:55+00:00 PHP: Irrelevant OS: n/a Package Version: Description: ------------ It would be good to have a "ignore all white space" option, just like the diff command. a simple triming of the input would do the trick (but copy it, so that the generated diff appear with the trimed spaces).]]> Text_Diff Feature/Change Request Reported by nlopess 2005-12-28T18:39:55+00:00 PHP: Irrelevant OS: n/a Package Version: Description: ------------ It would be good to have a "ignore all white space" option, just like the diff command. a simple triming of the input would do the trick (but copy it, so that the generated diff appear with the trimed spaces).]]> 2005-12-29T13:03:20+00:00 nlopess &#x61;&#116; php &#x64;&#111;&#x74; net Text_Diff Feature/Change Request http://pear.php.net/bugs/4982 Text_Diff Feature/Change Request Reported by thomas@... 2005-08-03T10:35:40+00:00 PHP: 5.0.4 OS: windows 2000 Package Version: Description: ------------ The following script shows the new line not at the exact position. The two files are : /* 1.txt : This line is the same. This line is different in 1.txt This line is the same. This is gone away !! */ /* 2.txt This line is the same. This is new !! This line is different in 2.txt This line is the same. */ Test script: --------------- <?php include_once 'Text/Diff.php'; include_once 'Text/Diff/Renderer.php'; include_once 'Text/Diff/Renderer/inline.php'; $lines1 = file('1.txt'); $lines2 = file('2.txt'); $diff = &new Text_Diff($lines1, $lines2); $renderer = &new Text_Diff_Renderer_inline(); $regexold = "(<del>.*</del>)"; $regexnew = "(<ins>.*</ins>)"; $text = $renderer->render($diff); $textold = preg_replace($regexold,'',$text); $textnew = preg_replace($regexnew,'',$text); ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 transitional//EN"> <html><head><title>DIFF TEST</title> <style> ins {background-color: Lime;} del {background-color: Red;} div {border: medium;border-color: blue; border-style: solid; width: 300px;background-color: #EEEEEE;} </style> </head><body> <div><?php echo nl2br($text); ?></div> <div><?php echo nl2br($textold); ?></div> <div><?php echo nl2br($textnew); ?></div><html> Expected result: ---------------- The new line should appear as a single line, actualy it is shown on two lines (see html below). Actual result: -------------- <div>This line is the same.<br /> This<ins> is new !!<br /> This</ins> line is different in <del>1.txt</del><ins>2.txt</ins><br /> This line is the same.<br /> <del>This is gone away !!</del><br /> </div> <div>This line is the same.<br /> This<ins> is new !!<br /> This</ins> line is different in <ins>2.txt</ins><br /> This line is the same.<br /> <br /> </div> <div>This line is the same.<br /> This<ins> is new !!<br /> This</ins> line is different in <del>1.txt</del><br /> This line is the same.<br /> <del>This is gone away !!</del><br /> </div>]]> Text_Diff Feature/Change Request Reported by thomas@... 2005-08-03T10:35:40+00:00 PHP: 5.0.4 OS: windows 2000 Package Version: Description: ------------ The following script shows the new line not at the exact position. The two files are : /* 1.txt : This line is the same. This line is different in 1.txt This line is the same. This is gone away !! */ /* 2.txt This line is the same. This is new !! This line is different in 2.txt This line is the same. */ Test script: --------------- <?php include_once 'Text/Diff.php'; include_once 'Text/Diff/Renderer.php'; include_once 'Text/Diff/Renderer/inline.php'; $lines1 = file('1.txt'); $lines2 = file('2.txt'); $diff = &new Text_Diff($lines1, $lines2); $renderer = &new Text_Diff_Renderer_inline(); $regexold = "(<del>.*</del>)"; $regexnew = "(<ins>.*</ins>)"; $text = $renderer->render($diff); $textold = preg_replace($regexold,'',$text); $textnew = preg_replace($regexnew,'',$text); ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 transitional//EN"> <html><head><title>DIFF TEST</title> <style> ins {background-color: Lime;} del {background-color: Red;} div {border: medium;border-color: blue; border-style: solid; width: 300px;background-color: #EEEEEE;} </style> </head><body> <div><?php echo nl2br($text); ?></div> <div><?php echo nl2br($textold); ?></div> <div><?php echo nl2br($textnew); ?></div><html> Expected result: ---------------- The new line should appear as a single line, actualy it is shown on two lines (see html below). Actual result: -------------- <div>This line is the same.<br /> This<ins> is new !!<br /> This</ins> line is different in <del>1.txt</del><ins>2.txt</ins><br /> This line is the same.<br /> <del>This is gone away !!</del><br /> </div> <div>This line is the same.<br /> This<ins> is new !!<br /> This</ins> line is different in <ins>2.txt</ins><br /> This line is the same.<br /> <br /> </div> <div>This line is the same.<br /> This<ins> is new !!<br /> This</ins> line is different in <del>1.txt</del><br /> This line is the same.<br /> <del>This is gone away !!</del><br /> </div>]]> 2007-09-26T15:31:02+00:00 thomas &#x61;&#116; luz-webwide &#x64;&#111;&#x74; de Text_Diff Feature/Change Request