summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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-074-9/+28
|
* Merge pull request #23 from joshbronson/masterAustin Ziegler2013-11-051-1/+1
|\ | | | | fixing for Diff::LCS::Change.from_a
| * 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'
* Merge pull request #20 from gravis/patch-1Austin Ziegler2013-05-031-1/+1
|\ | | | | Fix inconsistent changelog
| * Fix inconsistent changelogPhilippe Lafoucrière2013-05-031-1/+1
|/ | | The last version is different from the others.
* Merge pull request #19 from ginriki/fix_redundancyAustin Ziegler2013-04-291-1/+1
|\ | | | | Fix redundancy of value check
| * Fix redundancy of value checkginriki2013-04-291-1/+1
|/
* Removing the signing key for git-based bundles.Austin Ziegler2013-04-201-2/+0
|
* Finalizing the 1.2.4 update release.v1.2.4Austin Ziegler2013-04-204-15/+24
|
* Merge branch 'master' of github-halostatue:halostatue/diff-lcsAustin Ziegler2013-04-202-0/+7
|\ | | | | | | | | * 'master' of github-halostatue:halostatue/diff-lcs: Fix pruning of common sequences at start.
| * Merge pull request #18 from pck/fix_prune_common_startAustin Ziegler2013-04-202-0/+7
| |\ | | | | | | Fix pruning of common sequences at start.
| | * Fix pruning of common sequences at start.Paul Kunysch2013-04-202-0/+7
| |/
* | Switching to hoe-gemspec2.Austin Ziegler2013-04-205-25/+27
|/
* Creating release 1.2.3 with encoding fixes.v1.2.3Austin Ziegler2013-04-113-5/+30
|
* Merge pull request #17 from JonRowe/guard_against_emptyAustin Ziegler2013-04-112-29/+38
|\ | | | | Fix an issue caused by detecting the encoding when first data is empty
| * fix indentation of examplesJon Rowe2013-04-111-32/+27
| |
| * protect against no dataJon Rowe2013-04-112-1/+15
|/
* Updating the manifest for the new test.v1.2.2Austin Ziegler2013-03-301-0/+1
|
* Finalizing encoding-aware diff fixes.Austin Ziegler2013-03-307-45/+57
| | | | | | | | | | | | | | * 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.
* wrap tests in 187 protection tooJon Rowe2013-03-151-20/+22
|
* 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-152-20/+96
|
* Helping the manifest checks on Travis.v1.2.1Austin Ziegler2013-02-091-0/+1
|
* Helping the manifest checks on Travis.Austin Ziegler2013-02-091-0/+2
|
* Updating the in-repo gemspec.Austin Ziegler2013-02-091-3/+3
|
* History update for release; version bump.Austin Ziegler2013-02-093-4/+18
|
* 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.
* A bit of cleanup for the next release.Austin Ziegler2013-02-038-66/+49
| | | | - Clarifying a few terms based on updates to mime-types.
* Release 1.2 in 2013, not 2012 or 2102.v1.2.0Austin Ziegler2013-01-213-8/+9
|
* Final preparation for the 1.2 release.Austin Ziegler2013-01-2111-328/+296
| | | | | | | | - Added a Contributing.rdoc for contribution guidelines. - Cleaned up the README.rdoc. - Fixed the presentation of the GPL and Artistic licenses. - Made all of the development dependencies explicit. - Other minor items cleaned up.
* 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 a hopefully final travis build issue.Austin Ziegler2013-01-201-1/+0
|
* Fixing travis test failures.Austin Ziegler2013-01-202-0/+6
|
* Fixing issues with ldiff output.Austin Ziegler2013-01-201-12/+10
| | | | The output is now indistinguishable from diff (at least for -u).
* Adding http://travis-ci.org supportAustin Ziegler2013-01-203-5/+41
|
* Extracting duplicated code to a private method.Austin Ziegler2013-01-203-42/+37
|
* Simplifying some code for release.Austin Ziegler2013-01-201-67/+31
|
* Cleaning up for release of 1.2.0.Austin Ziegler2013-01-204-35/+53
|
* Fixing a left-in debugging statement.Austin Ziegler2013-01-201-1/+0
|
* Fixed Issue #1 patch direction detection.Austin Ziegler2013-01-203-54/+62
| | | | | 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-1911-1385/+1352
| | | | | - Bringing indents in a little. - Simplifying a little logic so that boolean shortcuts are taken faster.
* Cleaning up unnecessary comments.Austin Ziegler2013-01-199-20/+0
|
* Fixing an issue with the refactoring done earlier.Austin Ziegler2013-01-192-26/+26
|
* Merge pull request #13 from kachick/improve-remove_warningsAustin Ziegler2013-01-191-8/+8
|\ | | | | Fixing warnings in Ruby code. (lib/diff/lcs/internals.rb)