Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Update htmldiff.rb | Mark Friedgan | 2013-12-22 | 1 | -2/+2 | |
|/ | | | expand tabs is broken otherwise and the code is inconsistent anyway | |||||
* | Release 1.25: Bugfix for pull request #23. | Austin Ziegler | 2013-11-07 | 4 | -9/+28 | |
| | ||||||
* | Merge pull request #23 from joshbronson/master | Austin Ziegler | 2013-11-05 | 1 | -1/+1 | |
|\ | | | | | fixing for Diff::LCS::Change.from_a | |||||
| * | fixing for Diff::LCS::Change.from_a | joshbronson | 2013-11-05 | 1 | -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-1 | Austin Ziegler | 2013-05-03 | 1 | -1/+1 | |
|\ | | | | | Fix inconsistent changelog | |||||
| * | Fix inconsistent changelog | Philippe Lafoucrière | 2013-05-03 | 1 | -1/+1 | |
|/ | | | The last version is different from the others. | |||||
* | Merge pull request #19 from ginriki/fix_redundancy | Austin Ziegler | 2013-04-29 | 1 | -1/+1 | |
|\ | | | | | Fix redundancy of value check | |||||
| * | Fix redundancy of value check | ginriki | 2013-04-29 | 1 | -1/+1 | |
|/ | ||||||
* | Removing the signing key for git-based bundles. | Austin Ziegler | 2013-04-20 | 1 | -2/+0 | |
| | ||||||
* | Finalizing the 1.2.4 update release.v1.2.4 | Austin Ziegler | 2013-04-20 | 4 | -15/+24 | |
| | ||||||
* | Merge branch 'master' of github-halostatue:halostatue/diff-lcs | Austin Ziegler | 2013-04-20 | 2 | -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_start | Austin Ziegler | 2013-04-20 | 2 | -0/+7 | |
| |\ | | | | | | | Fix pruning of common sequences at start. | |||||
| | * | Fix pruning of common sequences at start. | Paul Kunysch | 2013-04-20 | 2 | -0/+7 | |
| |/ | ||||||
* | | Switching to hoe-gemspec2. | Austin Ziegler | 2013-04-20 | 5 | -25/+27 | |
|/ | ||||||
* | Creating release 1.2.3 with encoding fixes.v1.2.3 | Austin Ziegler | 2013-04-11 | 3 | -5/+30 | |
| | ||||||
* | Merge pull request #17 from JonRowe/guard_against_empty | Austin Ziegler | 2013-04-11 | 2 | -29/+38 | |
|\ | | | | | Fix an issue caused by detecting the encoding when first data is empty | |||||
| * | fix indentation of examples | Jon Rowe | 2013-04-11 | 1 | -32/+27 | |
| | | ||||||
| * | protect against no data | Jon Rowe | 2013-04-11 | 2 | -1/+15 | |
|/ | ||||||
* | Updating the manifest for the new test.v1.2.2 | Austin Ziegler | 2013-03-30 | 1 | -0/+1 | |
| | ||||||
* | Finalizing encoding-aware diff fixes. | Austin Ziegler | 2013-03-30 | 7 | -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 too | Jon Rowe | 2013-03-15 | 1 | -20/+22 | |
| | ||||||
* | refactor out encoding method | Jon Rowe | 2013-03-15 | 1 | -1/+2 | |
| | ||||||
* | ruby 187... support... | Jon Rowe | 2013-03-15 | 1 | -6/+16 | |
| | ||||||
* | matching preferred styling | Jon Rowe | 2013-03-15 | 1 | -6/+8 | |
| | ||||||
* | fix issues with encoding caused by using literals | Jon Rowe | 2013-03-15 | 2 | -20/+96 | |
| | ||||||
* | Helping the manifest checks on Travis.v1.2.1 | Austin Ziegler | 2013-02-09 | 1 | -0/+1 | |
| | ||||||
* | Helping the manifest checks on Travis. | Austin Ziegler | 2013-02-09 | 1 | -0/+2 | |
| | ||||||
* | Updating the in-repo gemspec. | Austin Ziegler | 2013-02-09 | 1 | -3/+3 | |
| | ||||||
* | History update for release; version bump. | Austin Ziegler | 2013-02-09 | 3 | -4/+18 | |
| | ||||||
* | Restoring an older public API method. | Austin Ziegler | 2013-02-09 | 1 | -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 Ziegler | 2013-02-03 | 8 | -66/+49 | |
| | | | | - Clarifying a few terms based on updates to mime-types. | |||||
* | Release 1.2 in 2013, not 2012 or 2102.v1.2.0 | Austin Ziegler | 2013-01-21 | 3 | -8/+9 | |
| | ||||||
* | Final preparation for the 1.2 release. | Austin Ziegler | 2013-01-21 | 11 | -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 Ziegler | 2013-01-20 | 1 | -1/+1 | |
| | ||||||
* | Fixing an issue with Diff::LCS.lcs. | Austin Ziegler | 2013-01-20 | 1 | -5/+4 | |
| | | | | - Only on 1.8.7. Found by travis-ci.org. | |||||
* | Fixing a hopefully final travis build issue. | Austin Ziegler | 2013-01-20 | 1 | -1/+0 | |
| | ||||||
* | Fixing travis test failures. | Austin Ziegler | 2013-01-20 | 2 | -0/+6 | |
| | ||||||
* | Fixing issues with ldiff output. | Austin Ziegler | 2013-01-20 | 1 | -12/+10 | |
| | | | | The output is now indistinguishable from diff (at least for -u). | |||||
* | Adding http://travis-ci.org support | Austin Ziegler | 2013-01-20 | 3 | -5/+41 | |
| | ||||||
* | Extracting duplicated code to a private method. | Austin Ziegler | 2013-01-20 | 3 | -42/+37 | |
| | ||||||
* | Simplifying some code for release. | Austin Ziegler | 2013-01-20 | 1 | -67/+31 | |
| | ||||||
* | Cleaning up for release of 1.2.0. | Austin Ziegler | 2013-01-20 | 4 | -35/+53 | |
| | ||||||
* | Fixing a left-in debugging statement. | Austin Ziegler | 2013-01-20 | 1 | -1/+0 | |
| | ||||||
* | Fixed Issue #1 patch direction detection. | Austin Ziegler | 2013-01-20 | 3 | -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 Ziegler | 2013-01-19 | 1 | -14/+36 | |
| | ||||||
* | Getting rid of a silly coding convention. | Austin Ziegler | 2013-01-19 | 2 | -52/+52 | |
| | ||||||
* | Reformatting. | Austin Ziegler | 2013-01-19 | 11 | -1385/+1352 | |
| | | | | | - Bringing indents in a little. - Simplifying a little logic so that boolean shortcuts are taken faster. | |||||
* | Cleaning up unnecessary comments. | Austin Ziegler | 2013-01-19 | 9 | -20/+0 | |
| | ||||||
* | Fixing an issue with the refactoring done earlier. | Austin Ziegler | 2013-01-19 | 2 | -26/+26 | |
| | ||||||
* | Merge pull request #13 from kachick/improve-remove_warnings | Austin Ziegler | 2013-01-19 | 1 | -8/+8 | |
|\ | | | | | Fixing warnings in Ruby code. (lib/diff/lcs/internals.rb) |