+<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'index', :page => @page.title, :version => @diff.content_from.version %> +(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>) +→ +<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'index', :page => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %> +(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>) +
+ +| # | ++ | <%= l(:field_updated_on) %> | <%= l(:field_author) %> | <%= l(:field_comments) %> | |
|---|---|---|---|---|---|
| <%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %> | +<%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %> | +<%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true || $('version_from').value > #{ver.version}) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %> | <%= format_time(ver.updated_on) %> | <%= ver.author ? ver.author.name : "anonyme" %> | <%=h ver.comments %> |
<%= pagination_links_full @version_pages, :page_param => :p %> -[ <%= @version_pages.current.first_item %> - <%= @version_pages.current.last_item %> / <%= @version_count %> ]
- -<%= link_to l(:button_back), :action => 'index', :page => @page.title %>
+<%= submit_tag l(:label_view_diff), :class => 'small' %> +<%= pagination_links_full @version_pages, :page_param => :p %> +[ <%= @version_pages.current.first_item %> - <%= @version_pages.current.last_item %> / <%= @version_count %> ] +<% end %> diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index 3a830a47d..c7a2985be 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -9,7 +9,8 @@ <% if @content.version != @page.content.version %>
<%= link_to(('« ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
- <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %> -
+ <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
+ <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :page => @page.title, :version => @content.version) + ')' if @content.version > 1 %> -
<%= link_to((l(:label_next) + ' »'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
<%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>
diff --git a/lib/diff.rb b/lib/diff.rb
new file mode 100644
index 000000000..646f91bae
--- /dev/null
+++ b/lib/diff.rb
@@ -0,0 +1,280 @@
+class Diff
+
+ VERSION = 0.3
+
+ def Diff.lcs(a, b)
+ astart = 0
+ bstart = 0
+ 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
+ afinish -= 1
+ bfinish -= 1
+ end
+
+ bmatches = b.reverse_hash(bstart..bfinish)
+ thresh = []
+ links = []
+
+ (astart..afinish).each { |aindex|
+ aelem = a[aindex]
+ next unless bmatches.has_key? aelem
+ k = nil
+ bmatches[aelem].reverse.each { |bindex|
+ if k && (thresh[k] > bindex) && (thresh[k-1] < bindex)
+ thresh[k] = bindex
+ else
+ k = thresh.replacenextlarger(bindex, k)
+ end
+ links[k] = [ (k==0) ? nil : links[k-1], aindex, bindex ] if k
+ }
+ }
+
+ if !thresh.empty?
+ link = links[thresh.length-1]
+ while link
+ mvector[link[1]] = link[2]
+ link = link[0]
+ end
+ end
+
+ return mvector
+ end
+
+ def makediff(a, b)
+ mvector = Diff.lcs(a, b)
+ ai = bi = 0
+ while ai < mvector.length
+ bline = mvector[ai]
+ if bline
+ while bi < bline
+ discardb(bi, b[bi])
+ bi += 1
+ end
+ match(ai, bi)
+ bi += 1
+ else
+ discarda(ai, a[ai])
+ end
+ ai += 1
+ end
+ while ai < a.length
+ discarda(ai, a[ai])
+ ai += 1
+ end
+ while bi < b.length
+ discardb(bi, b[bi])
+ bi += 1
+ end
+ match(ai, bi)
+ 1
+ end
+
+ def compactdiffs
+ diffs = []
+ @diffs.each { |df|
+ i = 0
+ curdiff = []
+ while i < df.length
+ whot = df[i][0]
+ s = @isstring ? df[i][2].chr : [df[i][2]]
+ p = df[i][1]
+ last = df[i][1]
+ i += 1
+ while df[i] && df[i][0] == whot && df[i][1] == last+1
+ s << df[i][2]
+ last = df[i][1]
+ i += 1
+ end
+ curdiff.push [whot, p, s]
+ end
+ diffs.push curdiff
+ }
+ return diffs
+ end
+
+ attr_reader :diffs, :difftype
+
+ def initialize(diffs_or_a, b = nil, isstring = nil)
+ if b.nil?
+ @diffs = diffs_or_a
+ @isstring = isstring
+ else
+ @diffs = []
+ @curdiffs = []
+ makediff(diffs_or_a, b)
+ @difftype = diffs_or_a.class
+ end
+ end
+
+ def match(ai, bi)
+ @diffs.push @curdiffs unless @curdiffs.empty?
+ @curdiffs = []
+ end
+
+ def discarda(i, elem)
+ @curdiffs.push ['-', i, elem]
+ end
+
+ def discardb(i, elem)
+ @curdiffs.push ['+', i, elem]
+ end
+
+ def compact
+ return Diff.new(compactdiffs)
+ end
+
+ def compact!
+ @diffs = compactdiffs
+ end
+
+ def inspect
+ @diffs.inspect
+ end
+
+end
+
+module Diffable
+ def diff(b)
+ Diff.new(self, b)
+ end
+
+ # Create a hash that maps elements of the array to arrays of indices
+ # where the elements are found.
+
+ def reverse_hash(range = (0...self.length))
+ revmap = {}
+ range.each { |i|
+ elem = self[i]
+ if revmap.has_key? elem
+ revmap[elem].push i
+ else
+ revmap[elem] = [i]
+ end
+ }
+ return revmap
+ end
+
+ def replacenextlarger(value, high = nil)
+ high ||= self.length
+ if self.empty? || value > self[-1]
+ push value
+ return high
+ end
+ # binary search for replacement point
+ low = 0
+ while low < high
+ index = (high+low)/2
+ found = self[index]
+ return nil if value == found
+ if value > found
+ low = index + 1
+ else
+ high = index
+ end
+ end
+
+ self[low] = value
+ # $stderr << "replace #{value} : 0/#{low}/#{init_high} (#{steps} steps) (#{init_high-low} off )\n"
+ # $stderr.puts self.inspect
+ #gets
+ #p length - low
+ return low
+ end
+
+ def patch(diff)
+ newary = nil
+ if diff.difftype == String
+ newary = diff.difftype.new('')
+ else
+ newary = diff.difftype.new
+ end
+ ai = 0
+ bi = 0
+ diff.diffs.each { |d|
+ d.each { |mod|
+ case mod[0]
+ when '-'
+ while ai < mod[1]
+ newary << self[ai]
+ ai += 1
+ bi += 1
+ end
+ ai += 1
+ when '+'
+ while bi < mod[1]
+ newary << self[ai]
+ ai += 1
+ bi += 1
+ end
+ newary << mod[2]
+ bi += 1
+ else
+ raise "Unknown diff action"
+ end
+ }
+ }
+ while ai < self.length
+ newary << self[ai]
+ ai += 1
+ bi += 1
+ end
+ return newary
+ end
+end
+
+class Array
+ include Diffable
+end
+
+class String
+ include Diffable
+end
+
+=begin
+= Diff
+(({diff.rb})) - computes the differences between two arrays or
+strings. Copyright (C) 2001 Lars Christensen
+
+== Synopsis
+
+ diff = Diff.new(a, b)
+ b = a.patch(diff)
+
+== Class Diff
+=== Class Methods
+--- Diff.new(a, b)
+--- a.diff(b)
+ Creates a Diff object which represent the differences between
+ ((|a|)) and ((|b|)). ((|a|)) and ((|b|)) can be either be arrays
+ of any objects, strings, or object of any class that include
+ module ((|Diffable|))
+
+== Module Diffable
+The module ((|Diffable|)) is intended to be included in any class for
+which differences are to be computed. Diffable is included into String
+and Array when (({diff.rb})) is (({require}))'d.
+
+Classes including Diffable should implement (({[]})) to get element at
+integer indices, (({<<})) to append elements to the object and
+(({ClassName#new})) should accept 0 arguments to create a new empty
+object.
+
+=== Instance Methods
+--- Diffable#patch(diff)
+ Applies the differences from ((|diff|)) to the object ((|obj|))
+ and return the result. ((|obj|)) is not changed. ((|obj|)) and
+ can be either an array or a string, but must match the object
+ from which the ((|diff|)) was created.
+=end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 79fe2799a..809bdd024 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -647,6 +647,14 @@ div.wiki img {
margin: 6px;
}
+.diff_out{
+ background: #fcc;
+}
+
+.diff_in{
+ background: #cfc;
+}
+
#preview .preview { background: #fafbfc url(../images/draft.png); }
#ajax-indicator {
diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index 4a9655a52..377575342 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -26,11 +26,3 @@ table.list thead th.list-filename {
font-weight: bolder;
text-align: left;
}
-
-.diff_out{
- background: #fdd;
-}
-
-.diff_in{
- background: #dfd;
-}