Mercurial > hg > soundsoftware-site
diff lib/diff.rb @ 909:cbb26bc654de redmine-1.3
Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
author | Chris Cannam |
---|---|
date | Fri, 24 Feb 2012 19:09:32 +0000 |
parents | 513646585e45 |
children | 433d4f72a19b |
line wrap: on
line diff
--- a/lib/diff.rb Fri Feb 24 18:36:29 2012 +0000 +++ b/lib/diff.rb Fri Feb 24 19:09:32 2012 +0000 @@ -9,14 +9,14 @@ afinish = a.length-1 bfinish = b.length-1 mvector = [] - + # First we prune off any common elements at the beginning while (astart <= afinish && bstart <= afinish && a[astart] == b[bstart]) mvector[astart] = bstart astart += 1 bstart += 1 end - + # now the end while (astart <= afinish && bstart <= bfinish && a[afinish] == b[bfinish]) mvector[afinish] = bfinish @@ -27,7 +27,7 @@ bmatches = b.reverse_hash(bstart..bfinish) thresh = [] links = [] - + (astart..afinish).each { |aindex| aelem = a[aindex] next unless bmatches.has_key? aelem @@ -118,7 +118,7 @@ @difftype = diffs_or_a.class end end - + def match(ai, bi) @diffs.push @curdiffs unless @curdiffs.empty? @curdiffs = []