jro_apps/redmine Commit - r1499:ec0525d4975b

Move unified diff parser out of the scm abstract adapter so it can be reused for viewing attached diffs (#1403)....

Jean-Philippe Lang -

r1499:ec0525d4975b

parent child

Context file:

r1499:ec0525d4975b

Collapse all files

lib/redmine/unified_diff.rb created 644 +178 0

@@ -0,0 +1,178
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	# Class used to parse unified diffs
	20	class UnifiedDiff < Array
	21	def initialize(diff, type="inline")
	22	diff_table = DiffTable.new type
	23	diff.each do \|line\|
	24	if line =~ /^(---\|\+\+\+) (.*)$/
	25	self << diff_table if diff_table.length > 1
	26	diff_table = DiffTable.new type
	27	end
	28	a = diff_table.add_line line
	29	end
	30	self << diff_table unless diff_table.empty?
	31	self
	32	end
	33	end
	34
	35	# Class that represents a file diff
	36	class DiffTable < Hash
	37	attr_reader :file_name, :line_num_l, :line_num_r
	38
	39	# Initialize with a Diff file and the type of Diff View
	40	# The type view must be inline or sbs (side_by_side)
	41	def initialize(type="inline")
	42	@parsing = false
	43	@nb_line = 1
	44	@start = false
	45	@before = 'same'
	46	@second = true
	47	@type = type
	48	end
	49
	50	# Function for add a line of this Diff
	51	def add_line(line)
	52	unless @parsing
	53	if line =~ /^(---\|\+\+\+) (.*)$/
	54	@file_name = $2
	55	return false
	56	elsif line =~ /^@@ (\+\|\-)(\d+)(,\d+)? (\+\|\-)(\d+)(,\d+)? @@/
	57	@line_num_l = $5.to_i
	58	@line_num_r = $2.to_i
	59	@parsing = true
	60	end
	61	else
	62	if line =~ /^[^\+\-\s@\\]/
	63	@parsing = false
	64	return false
	65	elsif line =~ /^@@ (\+\|\-)(\d+)(,\d+)? (\+\|\-)(\d+)(,\d+)? @@/
	66	@line_num_l = $5.to_i
	67	@line_num_r = $2.to_i
	68	else
	69	@nb_line += 1 if parse_line(line, @type)
	70	end
	71	end
	72	return true
	73	end
	74
	75	def inspect
	76	puts '### DIFF TABLE ###'
	77	puts "file : #{file_name}"
	78	self.each do \|d\|
	79	d.inspect
	80	end
	81	end
	82
	83	private
	84	# Test if is a Side By Side type
	85	def sbs?(type, func)
	86	if @start and type == "sbs"
	87	if @before == func and @second
	88	tmp_nb_line = @nb_line
	89	self[tmp_nb_line] = Diff.new
	90	else
	91	@second = false
	92	tmp_nb_line = @start
	93	@start += 1
	94	@nb_line -= 1
	95	end
	96	else
	97	tmp_nb_line = @nb_line
	98	@start = @nb_line
	99	self[tmp_nb_line] = Diff.new
	100	@second = true
	101	end
	102	unless self[tmp_nb_line]
	103	@nb_line += 1
	104	self[tmp_nb_line] = Diff.new
	105	else
	106	self[tmp_nb_line]
	107	end
	108	end
	109
	110	# Escape the HTML for the diff
	111	def escapeHTML(line)
	112	CGI.escapeHTML(line)
	113	end
	114
	115	def parse_line(line, type="inline")
	116	if line[0, 1] == "+"
	117	diff = sbs? type, 'add'
	118	@before = 'add'
	119	diff.line_left = escapeHTML line[1..-1]
	120	diff.nb_line_left = @line_num_l
	121	diff.type_diff_left = 'diff_in'
	122	@line_num_l += 1
	123	true
	124	elsif line[0, 1] == "-"
	125	diff = sbs? type, 'remove'
	126	@before = 'remove'
	127	diff.line_right = escapeHTML line[1..-1]
	128	diff.nb_line_right = @line_num_r
	129	diff.type_diff_right = 'diff_out'
	130	@line_num_r += 1
	131	true
	132	elsif line[0, 1] =~ /\s/
	133	@before = 'same'
	134	@start = false
	135	diff = Diff.new
	136	diff.line_right = escapeHTML line[1..-1]
	137	diff.nb_line_right = @line_num_r
	138	diff.line_left = escapeHTML line[1..-1]
	139	diff.nb_line_left = @line_num_l
	140	self[@nb_line] = diff
	141	@line_num_l += 1
	142	@line_num_r += 1
	143	true
	144	elsif line[0, 1] = "\\"
	145	true
	146	else
	147	false
	148	end
	149	end
	150	end
	151
	152	# A line of diff
	153	class Diff
	154	attr_accessor :nb_line_left
	155	attr_accessor :line_left
	156	attr_accessor :nb_line_right
	157	attr_accessor :line_right
	158	attr_accessor :type_diff_right
	159	attr_accessor :type_diff_left
	160
	161	def initialize()
	162	self.nb_line_left = ''
	163	self.nb_line_right = ''
	164	self.line_left = ''
	165	self.line_right = ''
	166	self.type_diff_right = ''
	167	self.type_diff_left = ''
	168	end
	169
	170	def inspect
	171	puts '### Start Line Diff ###'
	172	puts self.nb_line_left
	173	puts self.line_left
	174	puts self.nb_line_right
	175	puts self.line_right
	176	end
	177	end
	178	end

app/controllers/repositories_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             require 'digest/sha1'
             class ChangesetNotFound < Exception; end
             class InvalidRevisionParam < Exception; end
             class RepositoriesController < ApplicationController
               layout 'base'
               menu_item :repository
               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize
               accept_key_auth :revisions
               def edit
                 @repository = @project.repository
                 if !@repository
                   @repository = Repository.factory(params[:repository_scm])
                   @repository.project = @project if @repository
                 end
                 if request.post? && @repository
                   @repository.attributes = params[:repository]
                   @repository.save
                 end
                 render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
               end
               def destroy
                 @repository.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
               end
               def show
                 # check if new revisions have been committed in the repository
                 @repository.fetch_changesets if Setting.autofetch_changesets?
                 # root entries
                 @entries = @repository.entries('', @rev)
                 # latest changesets
                 @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
                 show_error_not_found unless @entries || @changesets.any?
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def browse
                 @entries = @repository.entries(@path, @rev)
                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
                   show_error_not_found and return unless @entries
                   render :action => 'browse'
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def changes
                 @entry = @repository.scm.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 @changesets = @repository.changesets_for_path(@path)
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
             								      per_page_option,
             								      params['page']
                 @changesets = @repository.changesets.find(:all,
             						:limit  =>  @changeset_pages.items_per_page,
             						:offset =>  @changeset_pages.current.offset)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                 end
               end
               def entry
                 @entry = @repository.scm.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 # If the entry is a dir, show the browser
                 browse and return if @entry.is_dir?
                 @content = @repository.scm.cat(@path, @rev)
                 show_error_not_found and return unless @content
                 if 'raw' == params[:format] || @content.is_binary_data?
                   # Force the download if it's a binary file
                   send_data @content, :filename => @path.split('/').last
                 else
                   # Prevent empty lines when displaying a file with Windows style eol
                   @content.gsub!("\r\n", "\n")
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def annotate
                 @annotate = @repository.scm.annotate(@path, @rev)
                 render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 raise ChangesetNotFound unless @changeset
                 @changes_count = @changeset.changes.size
                 @changes_pages = Paginator.new self, @changes_count, 150, params['page']
                 @changes = @changeset.changes.find(:all,
               						:limit  =>  @changes_pages.items_per_page,
               						:offset =>  @changes_pages.current.offset)
                 respond_to do |format|
                   format.html
                   format.js {render :layout => false}
                 end
               rescue ChangesetNotFound
                 show_error_not_found
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def diff
                 @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                 @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                 # Save diff type as user preference
                 if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                   User.current.pref[:diff_type] = @diff_type
                   User.current.preference.save
                 end
                 @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                 unless read_fragment(@cache_key)
-                  @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
+                  @diff = @repository.diff(@path, @rev, @rev_to)
                   show_error_not_found unless @diff
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               REV_PARAM_RE = %r{^[a-f0-9]*$}
               def find_repository
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 render_404 and return false unless @repository
                 @path = params[:path].join('/') unless params[:path].nil?
                 @path ||= ''
                 @rev = params[:rev]
                 @rev_to = params[:rev_to]
                 raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
               rescue ActiveRecord::RecordNotFound
                 render_404
               rescue InvalidRevisionParam
                 show_error_not_found
               end
               def show_error_not_found
                 render_error l(:error_scm_not_found)
               end
               def show_error_command_failed(msg)
                 render_error l(:error_scm_command_failed, msg)
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 11
                 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
                 month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
 .times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 # Remove email adress in usernames
                 fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
             end
             class String
               def with_leading_slash
                 starts_with?('/') ? self : "/#{self}"
               end
             end

app/models/repository.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Repository < ActiveRecord::Base
               belongs_to :project
               has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
               has_many :changes, :through => :changesets
               # Checks if the SCM is enabled when creating a repository
               validate_on_create { |r| r.errors.add(:type, :activerecord_error_invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
               # Removes leading and trailing whitespace
               def url=(arg)
                 write_attribute(:url, arg ? arg.to_s.strip : nil)
               end
               # Removes leading and trailing whitespace
               def root_url=(arg)
                 write_attribute(:root_url, arg ? arg.to_s.strip : nil)
               end
               def scm
                 @scm ||= self.scm_adapter.new url, root_url, login, password
                 update_attribute(:root_url, @scm.root_url) if root_url.blank?
                 @scm
               end
               def scm_name
                 self.class.scm_name
               end
               def supports_cat?
                 scm.supports_cat?
               end
               def supports_annotate?
                 scm.supports_annotate?
               end
               def entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)
               end
-              def diff(path, rev, rev_to, type)
+              def diff(path, rev, rev_to)
-                scm.diff(path, rev, rev_to, type)
+                scm.diff(path, rev, rev_to)
               end
               # Default behaviour: we search in cached changesets
               def changesets_for_path(path)
                 path = "/#{path}" unless path.starts_with?('/')
                 Change.find(:all, :include => :changeset,
                   :conditions => ["repository_id = ? AND path = ?", id, path],
                   :order => "committed_on DESC, #{Changeset.table_name}.id DESC").collect(&:changeset)
               end
               # Returns a path relative to the url of the repository
               def relative_path(path)
                 path
               end
               def latest_changeset
                 @latest_changeset ||= changesets.find(:first)
               end
               def scan_changesets_for_issue_ids
                 self.changesets.each(&:scan_comment_for_issue_ids)
               end
               # fetch new changesets for all repositories
               # can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
                 find(:all).each(&:fetch_changesets)
               end
               # scan changeset comments to find related and fixed issues for all repositories
               def self.scan_changesets_for_issue_ids
                 find(:all).each(&:scan_changesets_for_issue_ids)
               end
               def self.scm_name
                 'Abstract'
               end
               def self.available_scm
                 subclasses.collect {|klass| [klass.scm_name, klass.name]}
               end
               def self.factory(klass_name, *args)
                 klass = "Repository::#{klass_name}".constantize
                 klass.new(*args)
               rescue
                 nil
               end
               private
               def before_save
                 # Strips url and root_url
                 url.strip!
                 root_url.strip!
                 true
               end
             end

app/models/repository/cvs.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/cvs_adapter'
             require 'digest/sha1'
             class Repository::Cvs < Repository
               validates_presence_of :url, :root_url
               def scm_adapter
                 Redmine::Scm::Adapters::CvsAdapter
               end
               def self.scm_name
                 'CVS'
               end
               def entry(path, identifier)
                 e = entries(path, identifier)
                 e ? e.first : nil
               end
               def entries(path=nil, identifier=nil)
                 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
                 entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
                 if entries
                   entries.each() do |entry|
                     unless entry.lastrev.nil? || entry.lastrev.identifier
                       change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) )
                       if change
                         entry.lastrev.identifier=change.changeset.revision
                         entry.lastrev.author=change.changeset.committer
                         entry.lastrev.revision=change.revision
                         entry.lastrev.branch=change.branch
                       end
                     end
                   end
                 end
                 entries
               end
-              def diff(path, rev, rev_to, type)
+              def diff(path, rev, rev_to)
                 #convert rev to revision. CVS can't handle changesets here
                 diff=[]
                 changeset_from=changesets.find_by_revision(rev)
                 if rev_to.to_i > 0
                   changeset_to=changesets.find_by_revision(rev_to)
                 end
                 changeset_from.changes.each() do |change_from|
                   revision_from=nil
                   revision_to=nil
                   revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
                   if revision_from
                     if changeset_to
                       changeset_to.changes.each() do |change_to|
                         revision_to=change_to.revision if change_to.path==change_from.path
                       end
                     end
                     unless revision_to
                       revision_to=scm.get_previous_revision(revision_from)
                     end
-                    diff=diff+scm.diff(change_from.path, revision_from, revision_to, type)
+                    diff=diff+scm.diff(change_from.path, revision_from, revision_to)
                   end
                 end
                 return diff
               end
               def fetch_changesets
                 # some nifty bits to introduce a commit-id with cvs
                 # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
                 # we now take a guess using the author, the commitlog and the commit-date.
                 # last one is the next step to take. the commit-date is not equal for all
                 # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
                 # we use a small delta here, to merge all changes belonging to _one_ changeset
                 time_delta=10.seconds
                 fetch_since = latest_changeset ? latest_changeset.committed_on : nil
                 transaction do
                   tmp_rev_num = 1
                   scm.revisions('', fetch_since, nil, :with_paths => true) do |revision|
                     # only add the change to the database, if it doen't exists. the cvs log
                     # is not exclusive at all.
                     unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
                       revision
                       cs = changesets.find(:first, :conditions=>{
                         :committed_on=>revision.time-time_delta..revision.time+time_delta,
                         :committer=>revision.author,
                         :comments=>revision.message
                       })
                       # create a new changeset....
                       unless cs
                         # we use a temporaray revision number here (just for inserting)
                         # later on, we calculate a continous positive number
                         latest = changesets.find(:first, :order => 'id DESC')
                         cs = Changeset.create(:repository => self,
                                               :revision => "_#{tmp_rev_num}",
                                               :committer => revision.author,
                                               :committed_on => revision.time,
                                               :comments => revision.message)
                         tmp_rev_num += 1
                       end
                       #convert CVS-File-States to internal Action-abbrevations
                       #default action is (M)odified
                       action="M"
                       if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1"
                         action="A" #add-action always at first revision (= 1.1)
                       elsif revision.paths[0][:action]=="dead"
                         action="D" #dead-state is similar to Delete
                       end
                       Change.create(:changeset => cs,
                       :action => action,
                       :path => scm.with_leading_slash(revision.paths[0][:path]),
                       :revision => revision.paths[0][:revision],
                       :branch => revision.paths[0][:branch]
                       )
                     end
                   end
                   # Renumber new changesets in chronological order
                   changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset|
                     changeset.update_attribute :revision, next_revision_number
                   end
                 end # transaction
               end
               private
               # Returns the next revision number to assign to a CVS changeset
               def next_revision_number
                 # Need to retrieve existing revision numbers to sort them as integers
                 @current_revision_number ||= (connection.select_values("SELECT revision FROM #{Changeset.table_name} WHERE repository_id = #{id} AND revision NOT LIKE '_%'").collect(&:to_i).max || 0)
                 @current_revision_number += 1
               end
             end

app/models/repository/darcs.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/darcs_adapter'
             class Repository::Darcs < Repository
               validates_presence_of :url
               def scm_adapter
                 Redmine::Scm::Adapters::DarcsAdapter
               end
               def self.scm_name
                 'Darcs'
               end
               def entries(path=nil, identifier=nil)
                 patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
                 entries = scm.entries(path, patch.nil? ? nil : patch.scmid)
                 if entries
                   entries.each do |entry|
                     # Search the DB for the entry's last change
                     changeset = changesets.find_by_scmid(entry.lastrev.scmid) if entry.lastrev && !entry.lastrev.scmid.blank?
                     if changeset
                       entry.lastrev.identifier = changeset.revision
                       entry.lastrev.name = changeset.revision
                       entry.lastrev.time = changeset.committed_on
                       entry.lastrev.author = changeset.committer
                     end
                   end
                 end
                 entries
               end
-              def diff(path, rev, rev_to, type)
+              def diff(path, rev, rev_to)
                 patch_from = changesets.find_by_revision(rev)
                 return nil if patch_from.nil?
                 patch_to = changesets.find_by_revision(rev_to) if rev_to
                 if path.blank?
                   path = patch_from.changes.collect{|change| change.path}.join(' ')
                 end
-                patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil, type) : nil
+                patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil) : nil
               end
               def fetch_changesets
                 scm_info = scm.info
                 if scm_info
                   db_last_id = latest_changeset ? latest_changeset.scmid : nil
                   next_rev = latest_changeset ? latest_changeset.revision.to_i + 1 : 1
                   # latest revision in the repository
                   scm_revision = scm_info.lastrev.scmid
                   unless changesets.find_by_scmid(scm_revision)
                     revisions = scm.revisions('', db_last_id, nil, :with_path => true)
                     transaction do
                       revisions.reverse_each do |revision|
                         changeset = Changeset.create(:repository => self,
                                                      :revision => next_rev,
                                                      :scmid => revision.scmid,
                                                      :committer => revision.author,
                                                      :committed_on => revision.time,
                                                      :comments => revision.message)
                         revision.paths.each do |change|
                           Change.create(:changeset => changeset,
                                         :action => change[:action],
                                         :path => change[:path],
                                         :from_path => change[:from_path],
                                         :from_revision => change[:from_revision])
                         end
                         next_rev += 1
                       end if revisions
                     end
                   end
                 end
               end
             end

app/views/repositories/diff.rhtml +1 -1

             <h2><%= l(:label_revision) %> <%= format_revision(@rev) %> <%= @path.gsub(/^.*\//, '') %></h2>
             <!-- Choose view type -->
             <% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
               <% params.each do |k, p| %>
                 <% if k != "type" %>
                   <%= hidden_field_tag(k,p) %>
                 <% end %>
                 <% end %>
               <p><label><%= l(:label_view_diff) %></label>
               <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
             <% end %>
             <% cache(@cache_key) do -%>
-            <% @diff.each do |table_file| -%>
+            <% Redmine::UnifiedDiff.new(@diff, @diff_type).each do |table_file| -%>
             <div class="autoscroll">
             <% if @diff_type == 'sbs' -%>
             <table class="filecontent CodeRay">
             <thead>
             <tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr>
             <tr>
               <th colspan="2">@<%= format_revision @rev %></th>
               <th colspan="2">@<%= format_revision @rev_to %></th>
             </tr>
             </thead>
             <tbody>
             <% prev_line_left, prev_line_right = nil, nil -%>
             <% table_file.keys.sort.each do |key| -%>
             <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
             <tr class="spacing"><td colspan="4"></td></tr>
             <% end -%>
             <tr>
               <th class="line-num"><%= table_file[key].nb_line_left %></th>
               <td class="line-code <%= table_file[key].type_diff_left %>">
                 <pre><%=to_utf8 table_file[key].line_left %></pre>
               </td>
               <th class="line-num"><%= table_file[key].nb_line_right %></th>
               <td class="line-code <%= table_file[key].type_diff_right %>">
                 <pre><%=to_utf8 table_file[key].line_right %></pre>
               </td>
             </tr>
             <% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%>
             <% end -%>
             </tbody>
             </table>
             <% else -%>
             <table class="filecontent CodeRay">
             <thead>
             <tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr>
             <tr>
               <th>@<%= format_revision @rev %></th>
               <th>@<%= format_revision @rev_to %></th>
               <th></th>
             </tr>
             </thead>
             <tbody>
             <% prev_line_left, prev_line_right = nil, nil -%>
             <% table_file.keys.sort.each do |key, line| %>
             <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
             <tr class="spacing"><td colspan="3"></td></tr>
             <% end -%>
             <tr>
               <th class="line-num"><%= table_file[key].nb_line_left %></th>
               <th class="line-num"><%= table_file[key].nb_line_right %></th>
               <% if table_file[key].line_left.empty? -%>
               <td class="line-code <%= table_file[key].type_diff_right %>">
                 <pre><%=to_utf8 table_file[key].line_right %></pre>
               </td>
               <% else -%>
               <td class="line-code <%= table_file[key].type_diff_left %>">
                 <pre><%=to_utf8 table_file[key].line_left %></pre>
               </td>
               <% end -%>
             </tr>
             <% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%>
             <% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%>
             <% end -%>
             </tbody>
             </table>
             <% end -%>
             </div>
             <% end -%>
             <% end -%>
             <% html_title(with_leading_slash(@path), 'Diff') -%>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>

lib/redmine/scm/adapters/abstract_adapter.rb +1 -160

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'cgi'
             module Redmine
               module Scm
                 module Adapters
                   class CommandFailed < StandardError #:nodoc:
                   end
                   class AbstractAdapter #:nodoc:
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @login = login if login && !login.empty?
                       @password = (password || "") if @login
                       @root_url = root_url.blank? ? retrieve_root_url : root_url
                     end
                     def adapter_name
                       'Abstract'
                     end
                     def supports_cat?
                       true
                     end
                     def supports_annotate?
                       respond_to?('annotate')
                     end
                     def root_url
                       @root_url
                     end
                     def url
                       @url
                     end
                     # get info about the svn repository
                     def info
                       return nil
                     end
                     # Returns the entry identified by path and revision identifier
                     # or nil if entry doesn't exist in the repository
                     def entry(path=nil, identifier=nil)
                       parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
                       search_path = parts[0..-2].join('/')
                       search_name = parts[-1]
                       if search_path.blank? && search_name.blank?
                         # Root entry
                         Entry.new(:path => '', :kind => 'dir')
                       else
                         # Search for the entry in the parent directory
                         es = entries(search_path, identifier)
                         es ? es.detect {|e| e.name == search_name} : nil
                       end
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       return nil
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       return nil
                     end
-                    def diff(path, identifier_from, identifier_to=nil, type="inline")
+                    def diff(path, identifier_from, identifier_to=nil)
                       return nil
                     end
                     def cat(path, identifier=nil)
                       return nil
                     end
                     def with_leading_slash(path)
                       path ||= ''
                       (path[0,1]!="/") ? "/#{path}" : path
                     end
                     def with_trailling_slash(path)
                       path ||= ''
                       (path[-1,1] == "/") ? path : "#{path}/"
                     end
                     def without_leading_slash(path)
                       path ||= ''
                       path.gsub(%r{^/+}, '')
                     end
                     def without_trailling_slash(path)
                       path ||= ''
                       (path[-1,1] == "/") ? path[0..-2] : path
                      end
                     def shell_quote(str)
                       if RUBY_PLATFORM =~ /mswin/
                         '"' + str.gsub(/"/, '\\"') + '"'
                       else
                         "'" + str.gsub(/'/, "'\"'\"'") + "'"
                       end
                     end
                   private
                     def retrieve_root_url
                       info = self.info
                       info ? info.root_url : nil
                     end
                     def target(path)
                       path ||= ''
                       base = path.match(/^\//) ? root_url : url
                       shell_quote("#{base}/#{path}".gsub(/[?<>\*]/, ''))
                     end
                     def logger
                       RAILS_DEFAULT_LOGGER
                     end
                     def shellout(cmd, &block)
                       logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
                       begin
                         IO.popen(cmd, "r+") do |io|
                           io.close_write
                           block.call(io) if block_given?
                         end
                       rescue Errno::ENOENT => e
                         msg = strip_credential(e.message)
                         # The command failed, log it and re-raise
                         logger.error("SCM command failed: #{strip_credential(cmd)}\n  with: #{msg}")
                         raise CommandFailed.new(msg)
                       end
                     end
                     # Hides username/password in a given command
                     def self.hide_credential(cmd)
                       q = (RUBY_PLATFORM =~ /mswin/ ? '"' : "'")
                       cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
                     end
                     def strip_credential(cmd)
                       self.class.hide_credential(cmd)
                     end
                   end
                   class Entries < Array
                     def sort_by_name
                       sort {|x,y|
                         if x.kind == y.kind
                           x.name <=> y.name
                         else
                           x.kind <=> y.kind
                         end
                       }
                     end
                     def revisions
                       revisions ||= Revisions.new(collect{|entry| entry.lastrev}.compact)
                     end
                   end
                   class Info
                     attr_accessor :root_url, :lastrev
                     def initialize(attributes={})
                       self.root_url = attributes[:root_url] if attributes[:root_url]
                       self.lastrev = attributes[:lastrev]
                     end
                   end
                   class Entry
                     attr_accessor :name, :path, :kind, :size, :lastrev
                     def initialize(attributes={})
                       self.name = attributes[:name] if attributes[:name]
                       self.path = attributes[:path] if attributes[:path]
                       self.kind = attributes[:kind] if attributes[:kind]
                       self.size = attributes[:size].to_i if attributes[:size]
                       self.lastrev = attributes[:lastrev]
                     end
                     def is_file?
                       'file' == self.kind
                     end
                     def is_dir?
                       'dir' == self.kind
                     end
                     def is_text?
                       Redmine::MimeType.is_type?('text', name)
                     end
                   end
                   class Revisions < Array
                     def latest
                       sort {|x,y|
                         unless x.time.nil? or y.time.nil?
                           x.time <=> y.time
                         else
                         end
                       }.last
                     end
                   end
                   class Revision
                     attr_accessor :identifier, :scmid, :name, :author, :time, :message, :paths, :revision, :branch
                     def initialize(attributes={})
                       self.identifier = attributes[:identifier]
                       self.scmid = attributes[:scmid]
                       self.name = attributes[:name] || self.identifier
                       self.author = attributes[:author]
                       self.time = attributes[:time]
                       self.message = attributes[:message] || ""
                       self.paths = attributes[:paths]
                       self.revision = attributes[:revision]
                       self.branch = attributes[:branch]
                     end
                   end
-                  # A line of Diff
-                  class Diff
-                    attr_accessor :nb_line_left
-                    attr_accessor :line_left
-                    attr_accessor :nb_line_right
-                    attr_accessor :line_right
-                    attr_accessor :type_diff_right
-                    attr_accessor :type_diff_left
-                    def initialize ()
-                      self.nb_line_left = ''
-                      self.nb_line_right = ''
-                      self.line_left = ''
-                      self.line_right = ''
-                      self.type_diff_right = ''
-                      self.type_diff_left = ''
-                    end
-                    def inspect
-                      puts '### Start Line Diff ###'
-                      puts self.nb_line_left
-                      puts self.line_left
-                      puts self.nb_line_right
-                      puts self.line_right
-                    end
-                  end
-                  class DiffTableList < Array
-                    def initialize (diff, type="inline")
-                        diff_table = DiffTable.new type
-                        diff.each do |line|
-                            if line =~ /^(---|\+\+\+) (.*)$/
-                                self << diff_table if diff_table.length > 1
-                                diff_table = DiffTable.new type
-                            end
-                            a = diff_table.add_line line
-                        end
-                        self << diff_table unless diff_table.empty?
-                        self
-                    end
-                  end
-                  # Class for create a Diff
-                  class DiffTable < Hash
-                    attr_reader :file_name, :line_num_l, :line_num_r
-                    # Initialize with a Diff file and the type of Diff View
-                    # The type view must be inline or sbs (side_by_side)
-                    def initialize(type="inline")
-                      @parsing = false
-                      @nb_line = 1
-                      @start = false
-                      @before = 'same'
-                      @second = true
-                      @type = type
-                    end
-                    # Function for add a line of this Diff
-                    def add_line(line)
-                      unless @parsing
-                        if line =~ /^(---|\+\+\+) (.*)$/
-                          @file_name = $2
-                          return false
-                        elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
-                          @line_num_l = $5.to_i
-                          @line_num_r = $2.to_i
-                          @parsing = true
-                        end
-                      else
-                        if line =~ /^[^\+\-\s@\\]/
-                          @parsing = false
-                          return false
-                        elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
-                          @line_num_l = $5.to_i
-                          @line_num_r = $2.to_i
-                        else
-                          @nb_line += 1 if parse_line(line, @type)
-                        end
-                      end
-                      return true
-                    end
-                    def inspect
-                      puts '### DIFF TABLE ###'
-                      puts "file : #{file_name}"
-                      self.each do |d|
-                        d.inspect
-                      end
-                    end
-                  private
-                    # Test if is a Side By Side type
-                    def sbs?(type, func)
-                      if @start and type == "sbs"
-                        if @before == func and @second
-                          tmp_nb_line = @nb_line
-                          self[tmp_nb_line] = Diff.new
-                        else
-                            @second = false
-                            tmp_nb_line = @start
-                            @start += 1
-                            @nb_line -= 1
-                        end
-                      else
-                        tmp_nb_line = @nb_line
-                        @start = @nb_line
-                        self[tmp_nb_line] = Diff.new
-                        @second = true
-                      end
-                      unless self[tmp_nb_line]
-                        @nb_line += 1
-                        self[tmp_nb_line] = Diff.new
-                      else
-                        self[tmp_nb_line]
-                      end
-                    end
-                    # Escape the HTML for the diff
-                    def escapeHTML(line)
-                        CGI.escapeHTML(line)
-                    end
-                    def parse_line(line, type="inline")
-                      if line[0, 1] == "+"
-                        diff = sbs? type, 'add'
-                        @before = 'add'
-                        diff.line_left = escapeHTML line[1..-1]
-                        diff.nb_line_left = @line_num_l
-                        diff.type_diff_left = 'diff_in'
-                        @line_num_l += 1
-                        true
-                      elsif line[0, 1] == "-"
-                        diff = sbs? type, 'remove'
-                        @before = 'remove'
-                        diff.line_right = escapeHTML line[1..-1]
-                        diff.nb_line_right = @line_num_r
-                        diff.type_diff_right = 'diff_out'
-                        @line_num_r += 1
-                        true
-                      elsif line[0, 1] =~ /\s/
-                        @before = 'same'
-                        @start = false
-                        diff = Diff.new
-                        diff.line_right = escapeHTML line[1..-1]
-                        diff.nb_line_right = @line_num_r
-                        diff.line_left = escapeHTML line[1..-1]
-                        diff.nb_line_left = @line_num_l
-                        self[@nb_line] = diff
-                        @line_num_l += 1
-                        @line_num_r += 1
-                        true
-                      elsif line[0, 1] = "\\"
-                        true
-                      else
-                        false
-                      end
-                    end
-                  end
                   class Annotate
                     attr_reader :lines, :revisions
                     def initialize
                       @lines = []
                       @revisions = []
                     end
                     def add_line(line, revision)
                       @lines << line
                       @revisions << revision
                     end
                     def content
                       content = lines.join("\n")
                     end
                     def empty?
                       lines.empty?
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/bazaar_adapter.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class BazaarAdapter < AbstractAdapter
                     # Bazaar executable name
                     BZR_BIN = "bzr"
                     # Get info about the repository
                     def info
                       cmd = "#{BZR_BIN} revno #{target('')}"
                       info = nil
                       shellout(cmd) do |io|
                         if io.read =~ %r{^(\d+)$}
                           info = Info.new({:root_url => url,
                                            :lastrev => Revision.new({
                                              :identifier => $1
                                            })
                                          })
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       info
                     rescue CommandFailed
                       return nil
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{BZR_BIN} ls -v --show-ids"
                       cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
                       cmd << " #{target(path)}"
                       shellout(cmd) do |io|
                         prefix = "#{url}/#{path}".gsub('\\', '/')
                         logger.debug "PREFIX: #{prefix}"
                         re = %r{^V\s+#{Regexp.escape(prefix)}(\/?)([^\/]+)(\/?)\s+(\S+)$}
                         io.each_line do |line|
                           next unless line =~ re
                           entries << Entry.new({:name => $2.strip,
                                                 :path => ((path.empty? ? "" : "#{path}/") + $2.strip),
                                                 :kind => ($3.blank? ? 'file' : 'dir'),
                                                 :size => nil,
                                                 :lastrev => Revision.new(:revision => $4.strip)
                                               })
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
                       entries.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path ||= ''
                       identifier_from = 'last:1' unless identifier_from and identifier_from.to_i > 0
                       identifier_to = 1 unless identifier_to and identifier_to.to_i > 0
                       revisions = Revisions.new
                       cmd = "#{BZR_BIN} log -v --show-ids -r#{identifier_to.to_i}..#{identifier_from} #{target(path)}"
                       shellout(cmd) do |io|
                         revision = nil
                         parsing = nil
                         io.each_line do |line|
                           if line =~ /^----/
                             revisions << revision if revision
                             revision = Revision.new(:paths => [], :message => '')
                             parsing = nil
                           else
                             next unless revision
                             if line =~ /^revno: (\d+)$/
                               revision.identifier = $1.to_i
                             elsif line =~ /^committer: (.+)$/
                               revision.author = $1.strip
                             elsif line =~ /^revision-id:(.+)$/
                               revision.scmid = $1.strip
                             elsif line =~ /^timestamp: (.+)$/
                               revision.time = Time.parse($1).localtime
                             elsif line =~ /^    -----/
                               # partial revisions
                               parsing = nil unless parsing == 'message'
                             elsif line =~ /^(message|added|modified|removed|renamed):/
                               parsing = $1
                             elsif line =~ /^  (.*)$/
                               if parsing == 'message'
                                 revision.message << "#{$1}\n"
                               else
                                 if $1 =~ /^(.*)\s+(\S+)$/
                                   path = $1.strip
                                   revid = $2
                                   case parsing
                                   when 'added'
                                     revision.paths << {:action => 'A', :path => "/#{path}", :revision => revid}
                                   when 'modified'
                                     revision.paths << {:action => 'M', :path => "/#{path}", :revision => revid}
                                   when 'removed'
                                     revision.paths << {:action => 'D', :path => "/#{path}", :revision => revid}
                                   when 'renamed'
                                     new_path = path.split('=>').last
                                     revision.paths << {:action => 'M', :path => "/#{new_path.strip}", :revision => revid} if new_path
                                   end
                                 end
                               end
                             else
                               parsing = nil
                             end
                           end
                         end
                         revisions << revision if revision
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
-                    def diff(path, identifier_from, identifier_to=nil, type="inline")
+                    def diff(path, identifier_from, identifier_to=nil)
                       path ||= ''
                       if identifier_to
                         identifier_to = identifier_to.to_i
                       else
                         identifier_to = identifier_from.to_i - 1
                       end
                       cmd = "#{BZR_BIN} diff -r#{identifier_to}..#{identifier_from} #{target(path)}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       #return nil if $? && $?.exitstatus != 0
-                      DiffTableList.new diff, type
+                      diff
                     end
                     def cat(path, identifier=nil)
                       cmd = "#{BZR_BIN} cat"
                       cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
                       cmd << " #{target(path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       cmd = "#{BZR_BIN} annotate --all"
                       cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
                       cmd << " #{target(path)}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         author = nil
                         identifier = nil
                         io.each_line do |line|
                           next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
                           blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/cvs_adapter.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class CvsAdapter < AbstractAdapter
                     # CVS executable name
                     CVS_BIN = "cvs"
                     # Guidelines for the input:
                     #  url -> the project-path, relative to the cvsroot (eg. module name)
                     #  root_url -> the good old, sometimes damned, CVSROOT
                     #  login -> unnecessary
                     #  password -> unnecessary too
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @login = login if login && !login.empty?
                       @password = (password || "") if @login
                       #TODO: better Exception here (IllegalArgumentException)
                       raise CommandFailed if root_url.blank?
                       @root_url = root_url
                     end
                     def root_url
                       @root_url
                     end
                     def url
                       @url
                     end
                     def info
                       logger.debug "<cvs> info"
                       Info.new({:root_url => @root_url, :lastrev => nil})
                     end
                     def get_previous_revision(revision)
                       CvsRevisionHelper.new(revision).prevRev
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     # this method is used by the repository-browser (aka LIST)
                     def entries(path=nil, identifier=nil)
                       logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       entries = Entries.new
                       cmd = "#{CVS_BIN} -d #{root_url} rls -ed"
                       cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
                       cmd << " #{path_with_project}"
                       shellout(cmd) do |io|
                         io.each_line(){|line|
                           fields=line.chop.split('/',-1)
                           logger.debug(">>InspectLine #{fields.inspect}")
                           if fields[0]!="D"
                             entries << Entry.new({:name => fields[-5],
                               #:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]),
                               :path => "#{path}/#{fields[-5]}",
                               :kind => 'file',
                               :size => nil,
                               :lastrev => Revision.new({
                                 :revision => fields[-4],
                                 :name => fields[-4],
                                 :time => Time.parse(fields[-3]),
                                 :author => ''
                               })
                             })
                           else
                             entries << Entry.new({:name => fields[1],
                               :path => "#{path}/#{fields[1]}",
                               :kind => 'dir',
                               :size => nil,
                               :lastrev => nil
                             })
                           end
                         }
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     STARTLOG="----------------------------"
                     ENDLOG  ="============================================================================="
                     # Returns all revisions found between identifier_from and identifier_to
                     # in the repository. both identifier have to be dates or nil.
                     # these method returns nothing but yield every result in block
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block)
                       logger.debug "<cvs> revisions path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{root_url} rlog"
                       cmd << " -d\">#{time_to_cvstime(identifier_from)}\"" if identifier_from
                       cmd << " #{path_with_project}"
                       shellout(cmd) do |io|
                         state="entry_start"
                         commit_log=String.new
                         revision=nil
                         date=nil
                         author=nil
                         entry_path=nil
                         entry_name=nil
                         file_state=nil
                         branch_map=nil
                         io.each_line() do |line|
                           if state!="revision" && /^#{ENDLOG}/ =~ line
                             commit_log=String.new
                             revision=nil
                             state="entry_start"
                           end
                           if state=="entry_start"
                             branch_map=Hash.new
                             # gsub(/^:.*@[^:]+:\d*/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url
                             if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:\d*/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
                               entry_path = normalize_cvs_path($1)
                               entry_name = normalize_path(File.basename($1))
                               logger.debug("Path #{entry_path} <=> Name #{entry_name}")
                             elsif /^head: (.+)$/ =~ line
                               entry_headRev = $1 #unless entry.nil?
                             elsif /^symbolic names:/ =~ line
                               state="symbolic" #unless entry.nil?
                             elsif /^#{STARTLOG}/ =~ line
                               commit_log=String.new
                               state="revision"
                             end
                             next
                           elsif state=="symbolic"
                             if /^(.*):\s(.*)/ =~ (line.strip)
                               branch_map[$1]=$2
                             else
                               state="tags"
                               next
                             end
                           elsif state=="tags"
                             if /^#{STARTLOG}/ =~ line
                               commit_log = ""
                               state="revision"
                             elsif /^#{ENDLOG}/ =~ line
                               state="head"
                             end
                             next
                           elsif state=="revision"
                             if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line
                               if revision
                                 revHelper=CvsRevisionHelper.new(revision)
                                 revBranch="HEAD"
                                 branch_map.each() do |branch_name,branch_point|
                                   if revHelper.is_in_branch_with_symbol(branch_point)
                                     revBranch=branch_name
                                   end
                                 end
                                 logger.debug("********** YIELD Revision #{revision}::#{revBranch}")
                                 yield Revision.new({
                                   :time => date,
                                   :author => author,
                                   :message=>commit_log.chomp,
                                   :paths => [{
                                     :revision => revision,
                                     :branch=> revBranch,
                                     :path=>entry_path,
                                     :name=>entry_name,
                                     :kind=>'file',
                                     :action=>file_state
                                   }]
                                 })
                               end
                               commit_log=String.new
                               revision=nil
                               if /^#{ENDLOG}/ =~ line
                                 state="entry_start"
                               end
                               next
                             end
                             if /^branches: (.+)$/ =~ line
                               #TODO: version.branch = $1
                             elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
                               revision = $1
                             elsif /^date:\s+(\d+.\d+.\d+\s+\d+:\d+:\d+)/ =~ line
                               date      = Time.parse($1)
                               author    = /author: ([^;]+)/.match(line)[1]
                               file_state     = /state: ([^;]+)/.match(line)[1]
                               #TODO: linechanges only available in CVS.... maybe a feature our SVN implementation. i'm sure, they are
                               #    useful for stats or something else
                               #                linechanges =/lines: \+(\d+) -(\d+)/.match(line)
                               #                unless linechanges.nil?
                               #                  version.line_plus  = linechanges[1]
                               #                  version.line_minus = linechanges[2]
                               #                else
                               #                  version.line_plus  = 0
                               #                  version.line_minus = 0
                               #                end
                             else
                               commit_log << line unless line =~ /^\*\*\* empty log message \*\*\*/
                             end
                           end
                         end
                       end
                     end
-                    def diff(path, identifier_from, identifier_to=nil, type="inline")
+                    def diff(path, identifier_from, identifier_to=nil)
                       logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{path_with_project}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
-                      DiffTableList.new diff, type
+                      diff
                     end
                     def cat(path, identifier=nil)
                       identifier = (identifier) ? identifier : "HEAD"
                       logger.debug "<cvs> cat path:'#{path}',identifier #{identifier}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{root_url} co -r#{identifier} -p #{path_with_project}"
                       cat = nil
                       shellout(cmd) do |io|
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       identifier = (identifier) ? identifier : "HEAD"
                       logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{root_url} rannotate -r#{identifier} #{path_with_project}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
                           blame.add_line($3.rstrip, Revision.new(:revision => $1, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     private
                     # convert a date/time into the CVS-format
                     def time_to_cvstime(time)
                       return nil if time.nil?
                       unless time.kind_of? Time
                         time = Time.parse(time)
                       end
                       return time.strftime("%Y-%m-%d %H:%M:%S")
                     end
                     def normalize_cvs_path(path)
                       normalize_path(path.gsub(/Attic\//,''))
                     end
                     def normalize_path(path)
                       path.sub(/^(\/)*(.*)/,'\2').sub(/(.*)(,v)+/,'\1')
                     end
                   end
                   class CvsRevisionHelper
                     attr_accessor :complete_rev, :revision, :base, :branchid
                     def initialize(complete_rev)
                       @complete_rev = complete_rev
                       parseRevision()
                     end
                     def branchPoint
                       return @base
                     end
                     def branchVersion
                       if isBranchRevision
                         return @base+"."+@branchid
                       end
                       return @base
                     end
                     def isBranchRevision
                       !@branchid.nil?
                     end
                     def prevRev
                       unless @revision==0
                         return buildRevision(@revision-1)
                       end
                       return buildRevision(@revision)
                     end
                     def is_in_branch_with_symbol(branch_symbol)
                       bpieces=branch_symbol.split(".")
                       branch_start="#{bpieces[0..-3].join(".")}.#{bpieces[-1]}"
                       return (branchVersion==branch_start)
                     end
                     private
                     def buildRevision(rev)
                       if rev== 0
                         @base
                       elsif @branchid.nil?
                         @base+"."+rev.to_s
                       else
                         @base+"."+@branchid+"."+rev.to_s
                       end
                     end
                     # Interpretiert die cvs revisionsnummern wie z.b. 1.14 oder 1.3.0.15
                     def parseRevision()
                       pieces=@complete_rev.split(".")
                       @revision=pieces.last.to_i
                       baseSize=1
                       baseSize+=(pieces.size/2)
                       @base=pieces[0..-baseSize].join(".")
                       if baseSize > 2
                         @branchid=pieces[-2]
                       end
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/darcs_adapter.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/abstract_adapter'
             require 'rexml/document'
             module Redmine
               module Scm
                 module Adapters
                   class DarcsAdapter < AbstractAdapter
                     # Darcs executable name
                     DARCS_BIN = "darcs"
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @root_url = url
                     end
                     def supports_cat?
                       false
                     end
                     # Get info about the svn repository
                     def info
                       rev = revisions(nil,nil,nil,{:limit => 1})
                       rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : nil
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path_prefix = (path.blank? ? '' : "#{path}/")
                       path = '.' if path.blank?
                       entries = Entries.new
                       cmd = "#{DARCS_BIN} annotate --repodir #{@url} --xml-output"
                       cmd << " --match \"hash #{identifier}\"" if identifier
                       cmd << " #{path}"
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           if doc.root.name == 'directory'
                             doc.elements.each('directory/*') do |element|
                               next unless ['file', 'directory'].include? element.name
                               entries << entry_from_xml(element, path_prefix)
                             end
                           elsif doc.root.name == 'file'
                             entries << entry_from_xml(doc.root, path_prefix)
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path = '.' if path.blank?
                       revisions = Revisions.new
                       cmd = "#{DARCS_BIN} changes --repodir #{@url} --xml-output"
                       cmd << " --from-match \"hash #{identifier_from}\"" if identifier_from
                       cmd << " --last #{options[:limit].to_i}" if options[:limit]
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           doc.elements.each("changelog/patch") do |patch|
                             message = patch.elements['name'].text
                             message << "\n" + patch.elements['comment'].text.gsub(/\*\*\*END OF DESCRIPTION\*\*\*.*\z/m, '') if patch.elements['comment']
                             revisions << Revision.new({:identifier => nil,
                                           :author => patch.attributes['author'],
                                           :scmid => patch.attributes['hash'],
                                           :time => Time.parse(patch.attributes['local_date']),
                                           :message => message,
                                           :paths => (options[:with_path] ? get_paths_for_patch(patch.attributes['hash']) : nil)
                                         })
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
-                    def diff(path, identifier_from, identifier_to=nil, type="inline")
+                    def diff(path, identifier_from, identifier_to=nil)
                       path = '*' if path.blank?
                       cmd = "#{DARCS_BIN} diff --repodir #{@url}"
                       if identifier_to.nil?
                         cmd << " --match \"hash #{identifier_from}\""
                       else
                         cmd << " --to-match \"hash #{identifier_from}\""
                         cmd << " --from-match \"hash #{identifier_to}\""
                       end
                       cmd << " -u #{path}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
-                      DiffTableList.new diff, type
+                      diff
                     end
                     private
                     def entry_from_xml(element, path_prefix)
                       Entry.new({:name => element.attributes['name'],
                                  :path => path_prefix + element.attributes['name'],
                                  :kind => element.name == 'file' ? 'file' : 'dir',
                                  :size => nil,
                                  :lastrev => Revision.new({
                                    :identifier => nil,
                                    :scmid => element.elements['modified'].elements['patch'].attributes['hash']
                                    })
                                  })
                     end
                     # Retrieve changed paths for a single patch
                     def get_paths_for_patch(hash)
                       cmd = "#{DARCS_BIN} annotate --repodir #{@url} --summary --xml-output"
                       cmd << " --match \"hash #{hash}\" "
                       paths = []
                       shellout(cmd) do |io|
                         begin
                           # Darcs xml output has multiple root elements in this case (tested with darcs 1.0.7)
                           # A root element is added so that REXML doesn't raise an error
                           doc = REXML::Document.new("<fake_root>" + io.read + "</fake_root>")
                           doc.elements.each('fake_root/summary/*') do |modif|
                             paths << {:action => modif.name[0,1].upcase,
                                       :path => "/" + modif.text.chomp.gsub(/^\s*/, '')
                                      }
                           end
                         rescue
                         end
                       end
                       paths
                     rescue CommandFailed
                       paths
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/git_adapter.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class GitAdapter < AbstractAdapter
                     # Git executable name
                     GIT_BIN = "git"
                     # Get the revision of a particuliar file
                     def get_rev (rev,path)
                       if rev != 'latest' && !rev.nil?
                         cmd="#{GIT_BIN} --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}"
                       else
                         branch = shellout("#{GIT_BIN} --git-dir #{target('')} branch") { |io| io.grep(/\*/)[0].strip.match(/\* (.*)/)[1] }
                         cmd="#{GIT_BIN} --git-dir #{target('')} log -1 #{branch} -- #{shell_quote path}"
                       end
                       rev=[]
                       i=0
                       shellout(cmd) do |io|
                         files=[]
                         changeset = {}
                         parsing_descr = 0  #0: not parsing desc or files, 1: parsing desc, 2: parsing files
                         io.each_line do |line|
                           if line =~ /^commit ([0-9a-f]{40})$/
                             key = "commit"
                             value = $1
                             if (parsing_descr == 1 || parsing_descr == 2)
                               parsing_descr = 0
                               rev = Revision.new({:identifier => changeset[:commit],
                                                   :scmid => changeset[:commit],
                                                   :author => changeset[:author],
                                                   :time => Time.parse(changeset[:date]),
                                                   :message => changeset[:description],
                                                   :paths => files
                                                  })
                               changeset = {}
                               files = []
                             end
                             changeset[:commit] = $1
                           elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
                             key = $1
                             value = $2
                             if key == "Author"
                               changeset[:author] = value
                             elsif key == "Date"
                               changeset[:date] = value
                             end
                           elsif (parsing_descr == 0) && line.chomp.to_s == ""
                             parsing_descr = 1
                             changeset[:description] = ""
                           elsif (parsing_descr == 1 || parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
                             parsing_descr = 2
                             fileaction = $1
                             filepath = $2
                             files << {:action => fileaction, :path => filepath}
                           elsif (parsing_descr == 1) && line.chomp.to_s == ""
                             parsing_descr = 2
                           elsif (parsing_descr == 1)
                             changeset[:description] << line
                           end
                         end
                         rev = Revision.new({:identifier => changeset[:commit],
                                             :scmid => changeset[:commit],
                                             :author => changeset[:author],
                                             :time => (changeset[:date] ? Time.parse(changeset[:date]) : nil),
                                             :message => changeset[:description],
                                             :paths => files
                                            })
                       end
                       get_rev('latest',path) if rev == []
                       return nil if $? && $?.exitstatus != 0
                       return rev
                     end
                     def info
                       revs = revisions(url,nil,nil,{:limit => 1})
                       if revs && revs.any?
                         Info.new(:root_url => url, :lastrev => revs.first)
                       else
                         nil
                       end
                     rescue Errno::ENOENT => e
                       return nil
                     end
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{GIT_BIN} --git-dir #{target('')} ls-tree -l "
                       cmd << shell_quote("HEAD:" + path) if identifier.nil?
                       cmd << shell_quote(identifier + ":" + path) if identifier
                       shellout(cmd)  do |io|
                         io.each_line do |line|
                           e = line.chomp.to_s
                           if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\s+(.+)$/
                             type = $1
                             sha = $2
                             size = $3
                             name = $4
                             entries << Entry.new({:name => name,
                                                    :path => (path.empty? ? name : "#{path}/#{name}"),
                                                    :kind => ((type == "tree") ? 'dir' : 'file'),
                                                    :size => ((type == "tree") ? nil : size),
                                                    :lastrev => get_rev(identifier,(path.empty? ? name : "#{path}/#{name}"))
                                                  }) unless entries.detect{|entry| entry.name == name}
                           end
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     def revisions(path, identifier_from, identifier_to, options={})
                       revisions = Revisions.new
                       cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw "
                       cmd << " -n #{options[:limit].to_i} " if (!options.nil?) && options[:limit]
                       cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from
                       cmd << " #{shell_quote identifier_to} " if identifier_to
                       #cmd << " HEAD " if !identifier_to
                       shellout(cmd) do |io|
                         files=[]
                         changeset = {}
                         parsing_descr = 0  #0: not parsing desc or files, 1: parsing desc, 2: parsing files
                         revno = 1
                         io.each_line do |line|
                           if line =~ /^commit ([0-9a-f]{40})$/
                             key = "commit"
                             value = $1
                             if (parsing_descr == 1 || parsing_descr == 2)
                               parsing_descr = 0
                               revisions << Revision.new({:identifier => changeset[:commit],
                                                          :scmid => changeset[:commit],
                                                          :author => changeset[:author],
                                                          :time => Time.parse(changeset[:date]),
                                                          :message => changeset[:description],
                                                          :paths => files
                                                         })
                               changeset = {}
                               files = []
                               revno = revno + 1
                             end
                             changeset[:commit] = $1
                           elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
                             key = $1
                             value = $2
                             if key == "Author"
                               changeset[:author] = value
                             elsif key == "Date"
                               changeset[:date] = value
                             end
                           elsif (parsing_descr == 0) && line.chomp.to_s == ""
                             parsing_descr = 1
                             changeset[:description] = ""
                           elsif (parsing_descr == 1 || parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
                             parsing_descr = 2
                             fileaction = $1
                             filepath = $2
                             files << {:action => fileaction, :path => filepath}
                           elsif (parsing_descr == 1) && line.chomp.to_s == ""
                             parsing_descr = 2
                           elsif (parsing_descr == 1)
                             changeset[:description] << line[4..-1]
                           end
                         end
                         revisions << Revision.new({:identifier => changeset[:commit],
                                                    :scmid => changeset[:commit],
                                                    :author => changeset[:author],
                                                    :time => Time.parse(changeset[:date]),
                                                    :message => changeset[:description],
                                                    :paths => files
                                                   }) if changeset[:commit]
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
-                    def diff(path, identifier_from, identifier_to=nil, type="inline")
+                    def diff(path, identifier_from, identifier_to=nil)
                       path ||= ''
                       if !identifier_to
                         identifier_to = nil
                       end
                       cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}" if identifier_to.nil?
                       cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" if !identifier_to.nil?
                       cmd << " -- #{shell_quote path}" unless path.empty?
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
-                      DiffTableList.new diff, type
+                      diff
                     end
                     def annotate(path, identifier=nil)
                       identifier = 'HEAD' if identifier.blank?
                       cmd = "#{GIT_BIN} --git-dir #{target('')} blame -l #{shell_quote identifier} -- #{shell_quote path}"
                       blame = Annotate.new
                       content = nil
                       shellout(cmd) { |io| io.binmode; content = io.read }
                       return nil if $? && $?.exitstatus != 0
                       # git annotates binary files
                       return nil if content.is_binary_data?
                       content.split("\n").each do |line|
                         next unless line =~ /([0-9a-f]{39,40})\s\((\w*)[^\)]*\)(.*)/
                         blame.add_line($3.rstrip, Revision.new(:identifier => $1, :author => $2.strip))
                       end
                       blame
                     end
                     def cat(path, identifier=nil)
                       if identifier.nil?
                         identifier = 'HEAD'
                       end
                       cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote(identifier + ':' + path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/mercurial_adapter.rb +2 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class MercurialAdapter < AbstractAdapter
                     # Mercurial executable name
                     HG_BIN = "hg"
                     TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial"
                     TEMPLATE_NAME = "hg-template"
                     TEMPLATE_EXTENSION = "tmpl"
                     def info
                       cmd = "#{HG_BIN} -R #{target('')} root"
                       root_url = nil
                       shellout(cmd) do |io|
                         root_url = io.gets
                       end
                       return nil if $? && $?.exitstatus != 0
                       info = Info.new({:root_url => root_url.chomp,
                                         :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
                                       })
                       info
                     rescue CommandFailed
                       return nil
                     end
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate"
                       cmd << " -r " + (identifier ? identifier.to_s : "tip")
                       cmd << " " + shell_quote("path:#{path}") unless path.empty?
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           # HG uses antislashs as separator on Windows
                           line = line.gsub(/\\/, "/")
                           if path.empty? or e = line.gsub!(%r{^#{with_trailling_slash(path)}},'')
                             e ||= line
                             e = e.chomp.split(%r{[\/\\]})
                             entries << Entry.new({:name => e.first,
                                                    :path => (path.nil? or path.empty? ? e.first : "#{with_trailling_slash(path)}#{e.first}"),
                                                    :kind => (e.size > 1 ? 'dir' : 'file'),
                                                    :lastrev => Revision.new
                                                  }) unless entries.detect{|entry| entry.name == e.first}
                           end
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     # Fetch the revisions by using a template file that
                     # makes Mercurial produce a xml output.
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       revisions = Revisions.new
                       cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{self.template_path}"
                       if identifier_from && identifier_to
                         cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
                       elsif identifier_from
                         cmd << " -r #{identifier_from.to_i}:"
                       end
                       cmd << " --limit #{options[:limit].to_i}" if options[:limit]
                       cmd << " #{path}" if path
                       shellout(cmd) do |io|
                         begin
                           # HG doesn't close the XML Document...
                           doc = REXML::Document.new(io.read << "</log>")
                           doc.elements.each("log/logentry") do |logentry|
                             paths = []
                             copies = logentry.get_elements('paths/path-copied')
                             logentry.elements.each("paths/path") do |path|
                               # Detect if the added file is a copy
                               if path.attributes['action'] == 'A' and c = copies.find{ |e| e.text == path.text }
                                 from_path = c.attributes['copyfrom-path']
                                 from_rev = logentry.attributes['revision']
                               end
                               paths << {:action => path.attributes['action'],
                                 :path => "/#{path.text}",
                                 :from_path => from_path ? "/#{from_path}" : nil,
                                 :from_revision => from_rev ? from_rev : nil
                               }
                             end
                             paths.sort! { |x,y| x[:path] <=> y[:path] }
                             revisions << Revision.new({:identifier => logentry.attributes['revision'],
                                                         :scmid => logentry.attributes['node'],
                                                         :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
                                                         :time => Time.parse(logentry.elements['date'].text).localtime,
                                                         :message => logentry.elements['msg'].text,
                                                         :paths => paths
                                                       })
                           end
                         rescue
                           logger.debug($!)
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
-                    def diff(path, identifier_from, identifier_to=nil, type="inline")
+                    def diff(path, identifier_from, identifier_to=nil)
                       path ||= ''
                       if identifier_to
                         identifier_to = identifier_to.to_i
                       else
                         identifier_to = identifier_from.to_i - 1
                       end
                       cmd = "#{HG_BIN} -R #{target('')} diff -r #{identifier_to} -r #{identifier_from} --nodates"
                       cmd << " -I #{target(path)}" unless path.empty?
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
-                      DiffTableList.new diff, type
+                      diff
                     end
                     def cat(path, identifier=nil)
                       cmd = "#{HG_BIN} -R #{target('')} cat"
                       cmd << " -r " + (identifier ? identifier.to_s : "tip")
                       cmd << " #{target(path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       path ||= ''
                       cmd = "#{HG_BIN} -R #{target('')}"
                       cmd << " annotate -n -u"
                       cmd << " -r " + (identifier ? identifier.to_s : "tip")
                       cmd << " -r #{identifier.to_i}" if identifier
                       cmd << " #{target(path)}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^([^:]+)\s(\d+):(.*)$}
                           blame.add_line($3.rstrip, Revision.new(:identifier => $2.to_i, :author => $1.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     # The hg version version is expressed either as a
                     # release number (eg 0.9.5 or 1.0) or as a revision
                     # id composed of 12 hexa characters.
                     def hgversion
                       theversion = hgversion_from_command_line
                       if theversion.match(/^\d+(\.\d+)+/)
                         theversion.split(".").collect(&:to_i)
                         #            elsif match = theversion.match(/[[:xdigit:]]{12}/)
                         #               match[0]
                       else
                         "Unknown version"
                       end
                     end
                     def template_path
                       @template ||= begin
                                       if hgversion.is_a?(String) or ((hgversion <=> [0,9,5]) > 0)
                                         ver = "1.0"
                                       else
                                         ver = "0.9.5"
                                       end
                                       "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
                                     end
                     end
                     private
                     def hgversion_from_command_line
                       @hgversion ||= %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/subversion_adapter.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/abstract_adapter'
             require 'rexml/document'
             module Redmine
               module Scm
                 module Adapters
                   class SubversionAdapter < AbstractAdapter
                     # SVN executable name
                     SVN_BIN = "svn"
                     # Get info about the svn repository
                     def info
                       cmd = "#{SVN_BIN} info --xml #{target('')}"
                       cmd << credentials_string
                       info = nil
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           #root_url = doc.elements["info/entry/repository/root"].text
                           info = Info.new({:root_url => doc.elements["info/entry/repository/root"].text,
                                            :lastrev => Revision.new({
                                              :identifier => doc.elements["info/entry/commit"].attributes['revision'],
                                              :time => Time.parse(doc.elements["info/entry/commit/date"].text).localtime,
                                              :author => (doc.elements["info/entry/commit/author"] ? doc.elements["info/entry/commit/author"].text : "")
                                            })
                                          })
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       info
                     rescue CommandFailed
                       return nil
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       entries = Entries.new
                       cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       shellout(cmd) do |io|
                         output = io.read
                         begin
                           doc = REXML::Document.new(output)
                           doc.elements.each("lists/list/entry") do |entry|
                             # Skip directory if there is no commit date (usually that
                             # means that we don't have read access to it)
                             next if entry.attributes['kind'] == 'dir' && entry.elements['commit'].elements['date'].nil?
                             entries << Entry.new({:name => entry.elements['name'].text,
                                         :path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
                                         :kind => entry.attributes['kind'],
                                         :size => (entry.elements['size'] and entry.elements['size'].text).to_i,
                                         :lastrev => Revision.new({
                                           :identifier => entry.elements['commit'].attributes['revision'],
                                           :time => Time.parse(entry.elements['commit'].elements['date'].text).localtime,
                                           :author => (entry.elements['commit'].elements['author'] ? entry.elements['commit'].elements['author'].text : "")
                                           })
                                         })
                           end
                         rescue Exception => e
                           logger.error("Error parsing svn output: #{e.message}")
                           logger.error("Output was:\n #{output}")
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
                       entries.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path ||= ''
                       identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
                       identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
                       revisions = Revisions.new
                       cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
                       cmd << credentials_string
                       cmd << " --verbose " if  options[:with_paths]
                       cmd << ' ' + target(path)
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           doc.elements.each("log/logentry") do |logentry|
                             paths = []
                             logentry.elements.each("paths/path") do |path|
                               paths << {:action => path.attributes['action'],
                                         :path => path.text,
                                         :from_path => path.attributes['copyfrom-path'],
                                         :from_revision => path.attributes['copyfrom-rev']
                                         }
                             end
                             paths.sort! { |x,y| x[:path] <=> y[:path] }
                             revisions << Revision.new({:identifier => logentry.attributes['revision'],
                                           :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
                                           :time => Time.parse(logentry.elements['date'].text).localtime,
                                           :message => logentry.elements['msg'].text,
                                           :paths => paths
                                         })
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       path ||= ''
                       identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
                       identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
                       cmd = "#{SVN_BIN} diff -r "
                       cmd << "#{identifier_to}:"
                       cmd << "#{identifier_from}"
                       cmd << " #{target(path)}@#{identifier_from}"
                       cmd << credentials_string
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
-                      DiffTableList.new diff, type
+                      diff
                     end
                     def cat(path, identifier=nil)
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{SVN_BIN} cat #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{SVN_BIN} blame #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
                           blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     private
                     def credentials_string
                       str = ''
                       str << " --username #{shell_quote(@login)}" unless @login.blank?
                       str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
                       str
                     end
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages