summaryrefslogtreecommitdiff
path: root/lib/diff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #29 from GoBoundless/fix_compareAustin Ziegler2014-04-261-0/+2
|\ | | | | update Change and ContextChange's '==' methods to compare against the other object's class
| * update Diff::LCS::Change and Diff::LCS::ContextChange's '==' methods to ↵Kevin Mook2014-04-231-0/+2
| | | | | | | | compare against the other object's class
* | Fixing a banner bug with bin/ldiffAustin Ziegler2014-04-261-1/+1
|/ | | | Fixes #21.
* Update htmldiff.rbMark Friedgan2013-12-221-2/+2
| | | expand tabs is broken otherwise and the code is inconsistent anyway
* Release 1.25: Bugfix for pull request #23.Austin Ziegler2013-11-071-2/+2
|
* fixing for Diff::LCS::Change.from_ajoshbronson2013-11-051-1/+1
| | | | | | | | | | | | | flatten should only go one level deep to avoid problems when diffing arrays of arrays, e.g.: Diff::LCS.sdiff([[1,2]], []) RuntimeError: Invalid change array format provided. from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/change.rb:50:in `from_a' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/change.rb:137:in `from_a' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/change.rb:158:in `simplify' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/callbacks.rb:312:in `discard_a' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs.rb:633:in `traverse_balanced' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/internals.rb:10:in `diff_traversal' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs.rb:266:in `sdiff'
* Fix redundancy of value checkginriki2013-04-291-1/+1
|
* Finalizing the 1.2.4 update release.v1.2.4Austin Ziegler2013-04-201-2/+2
|
* Fix pruning of common sequences at start.Paul Kunysch2013-04-201-0/+1
|
* Creating release 1.2.3 with encoding fixes.v1.2.3Austin Ziegler2013-04-111-2/+2
|
* protect against no dataJon Rowe2013-04-111-1/+1
|
* Finalizing encoding-aware diff fixes.Austin Ziegler2013-03-302-31/+23
| | | | | | | | | | | | | | * Diff::LCS::Hunk could not properly generate a difference for comparison sets that are not US-ASCII-compatible because of the use of literal regular expressions and strings. Jon Rowe (JonRowe) found this in rspec/rspec-expectations#219 and provided a first pass implementation in diff-lcs#15. I've reworked it because of test failures in Rubinius when running in Ruby 1.9 mode. This coerces the added values to the encoding of the old dataset (as determined by the first piece of the old dataset). https://github.com/rspec/rspec-expectations/issues/219 https://github.com/halostatue/diff-lcs/pull/15 * Adding Travis CI testing for Ruby 2.0.
* refactor out encoding methodJon Rowe2013-03-151-1/+2
|
* ruby 187... support...Jon Rowe2013-03-151-6/+16
|
* matching preferred stylingJon Rowe2013-03-151-6/+8
|
* fix issues with encoding caused by using literalsJon Rowe2013-03-151-20/+39
|
* History update for release; version bump.Austin Ziegler2013-02-091-2/+2
|
* Restoring an older public API method.Austin Ziegler2013-02-091-0/+1
| | | | | | | | | - I changed what I thought was a private API, but it turns out that people used Hunk#unshift. Because the Hunk#merge functionality is safer and more correct, I have provided Hunk#unshift as an alias to Hunk#merge. - Note that Hunk#unshift should be considered deprecated and the alias will be removed in a future major version of Diff::LCS.
* Release 1.2 in 2013, not 2012 or 2102.v1.2.0Austin Ziegler2013-01-212-2/+2
|
* Fixing a typo.Austin Ziegler2013-01-201-1/+1
|
* Fixing an issue with Diff::LCS.lcs.Austin Ziegler2013-01-201-5/+4
| | | | - Only on 1.8.7. Found by travis-ci.org.
* Fixing issues with ldiff output.Austin Ziegler2013-01-201-12/+10
| | | | The output is now indistinguishable from diff (at least for -u).
* Extracting duplicated code to a private method.Austin Ziegler2013-01-203-42/+37
|
* Simplifying some code for release.Austin Ziegler2013-01-201-67/+31
|
* Fixed Issue #1 patch direction detection.Austin Ziegler2013-01-201-41/+45
| | | | | This bug has been filed for five and a half years and I have finally fixed it. By ghu it feels good.
* Resolving #12: #(un)patch_me for destructive patch.Austin Ziegler2013-01-191-14/+36
|
* Getting rid of a silly coding convention.Austin Ziegler2013-01-192-52/+52
|
* Reformatting.Austin Ziegler2013-01-1910-1383/+1352
| | | | | - Bringing indents in a little. - Simplifying a little logic so that boolean shortcuts are taken faster.
* Fixing an issue with the refactoring done earlier.Austin Ziegler2013-01-192-26/+26
|
* Fixing warnings in Ruby code.Kenichi Kamiya2013-01-171-8/+8
| | | | - "assigned but unused variable"
* Get rid of useless shebangs.Vít Ondruch2012-08-175-6/+0
|
* Starting on a substantial refactoring to fix bugs.Austin Ziegler2012-03-243-438/+440
| | | | | | | | | | | | | | | 1. All Diff::LCS::__* methods are now moved to Diff::LCS::Internals and named without the underscores. 2. Fixed the documentation for Diff::LCS::patch. (Some formatting may have been broken.) 3. Eliminated normalize_patchset in favour of the (substantially similar) analyze_patchset. This allows for a single-pass over a patchset to determine whether the patchset contains changes and transform it to the object-based format. 4. Made Diff::LCS::ContextChange descend from Diff::LCS::Change. This will probably change so that both descend from something like a Diff::LCS::AbstractChange because of some issues that may arise with case statement order.
* Major investigation to Diff::LCS bugs.Austin Ziegler2012-03-211-28/+39
| | | | | | | | | | | | | | | - Fixed some formatting and style issues. - Trailing spaces - Calling class methods using '.' instead of '::'. - Resolved Issue #2 by handling string[string.size, 1] properly (it returns "" not nil). - Added special case handling for Diff::LCS.patch so that it handles patches that are empty or contain no changes. - Adding temporary code to help determined the reason for the misidentification of patch direction. - Added a number of different specs to check for comparing the same value. - Added broken spec filtering.
* Fix+specs for Diff::LCS::ChangeTypeTests predicatesMichael Granger2012-01-241-3/+3
|
* Fixing warnings in Ruby code.Austin Ziegler2011-07-312-68/+37
| | | | https://github.com/halostatue/diff-lcs/issues/3
* Fixing https://github.com/halostatue/diff-lcs/issues/4Austin Ziegler2011-07-311-0/+151
|
* Convert to RSpecAustin Ziegler2011-07-311-471/+471
|
* Converting diff-lcs from svn to git format.Austin Ziegler2011-07-308-0/+2170
View Lorry Controller Status