jro_apps/redmine Commit - r100:efe31d49f041

misc scm browser improvements...

Jean-Philippe Lang -

r100:efe31d49f041

parent child

Context file:

r100:efe31d49f041

Collapse all files

scm/app/controllers/repositories_controller.rb +16 -13

               end
               def browse
-                @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
+                @entries = @repository.scm.entries(@path, @rev)
+                redirect_to :action => 'show', :id => @project and return unless @entries
+              end
+              def entry_revisions
                 @entry = @repository.scm.entry(@path, @rev)
-                redirect_to :action => 'show', :id => @project and return unless @entry
+                @revisions = @repository.scm.revisions(@path, @rev)
-                if @entry.is_dir?
+                redirect_to :action => 'show', :id => @project and return unless @entry && @revisions
-                  # if entry is a dir, shows directory listing
+              end
-                  @entries = @repository.scm.entries(@path, @rev)
-                  redirect_to :action => 'show', :id => @project and return unless @entries
+              def entry
-                else
+                if 'raw' == params[:format]
-                  # else, shows file's revisions
+                  content = @repository.scm.cat(@path, @rev)
-                  @revisions = @repository.scm.revisions(@path, @rev)
+                  redirect_to :action => 'show', :id => @project and return unless content
-                  redirect_to :action => 'show', :id => @project and return unless @revisions
+                  send_data content, :filename => @path.split('/').last
-                  render :action => 'entry_revisions'
                 end
               end
               def revision
-                @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
                 @revisions = @repository.scm.revisions '', @rev, @rev, :with_paths => true
                 redirect_to :action => 'show', :id => @project and return unless @revisions
                 @revision = @revisions.first
               end
               def diff
-                @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
                 @rev_to = params[:rev_to] || (@rev-1)
                 @diff = @repository.scm.diff(params[:path], @rev, @rev_to)
                 redirect_to :action => 'show', :id => @project and return unless @diff
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 @path = params[:path].squeeze('/').gsub(/^\//, '') if params[:path]
+                @path ||= ''
+                @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
               end
             end

scm/app/models/svn_repos.rb +34 -31

                 @url = nil
                 @login = nil
                 @password = nil
                 def initialize(url, login=nil, password=nil)
                   @url = url
                   @login = login if login && !login.empty?
                 # 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)
-                  path ||= ''
+                  e = entries(path, identifier)
-                  identifier = 'HEAD' unless identifier and identifier > 0
+                  e ? e.first : nil
-                  entry = nil
-                  cmd = "svn info --xml -r #{identifier} #{target(path)}"
-                  IO.popen(cmd) do |io|
-                    begin
-                      doc = REXML::Document.new(io)
-                      doc.elements.each("info/entry") do |info|
-                        entry = Entry.new({:name => info.attributes['path'],
-                                       :path => path,
-                                       :kind => info.attributes['kind'],
-                                       :lastrev => Revision.new({
-                                         :identifier => info.elements['commit'].attributes['revision'],
-                                         :author => info.elements['commit'].elements['author'].text,
-                                         :time => Time.parse(info.elements['commit'].elements['date'].text)
-                                         })
-                                       })
-                      end
-                    rescue
-                    end
-                  end
-                  return nil if $? && $?.exitstatus != 0
-                  entry
-                rescue Errno::ENOENT
-                  raise RepositoryCmdFailed
                 end
                 # Returns an Entries collection
                   path ||= ''
                   identifier = 'HEAD' unless identifier and identifier > 0
                   entries = Entries.new
-                  cmd = "svn list --xml -r #{identifier} #{target(path)}"
+                  cmd = "svn list --xml #{target(path)}@#{identifier}"
-                  IO.popen(cmd) do |io|
+                  shellout(cmd) do |io|
                     begin
                       doc = REXML::Document.new(io)
                       doc.elements.each("lists/list/entry") do |entry|
                   cmd = "svn log --xml -r #{identifier_from}:#{identifier_to} "
                   cmd << "--verbose " if  options[:with_paths]
                   cmd << target(path)
-                  IO.popen(cmd) do |io|
+                  shellout(cmd) do |io|
                     begin
                       doc = REXML::Document.new(io)
                       doc.elements.each("log/logentry") do |logentry|
                                     :path => path.text
                                     }
                         end
+                        paths.sort! { |x,y| x[:path] <=> y[:path] }
                         revisions << Revision.new({:identifier => logentry.attributes['revision'],
                                       :author => logentry.elements['author'].text,
                                       :time => Time.parse(logentry.elements['date'].text),
                   cmd = "svn diff -r "
                   cmd << "#{identifier_to}:"
                   cmd << "#{identifier_from}"
-                  cmd << target(path)
+                  cmd << "#{target(path)}@#{identifier_from}"
                   diff = []
-                  IO.popen(cmd) do |io|
+                  shellout(cmd) do |io|
                     io.each_line do |line|
                       diff << line
                     end
                 rescue Errno::ENOENT => e
                   raise CommandFailed
                 end
+                def cat(path, identifier=nil)
+                  identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+                  cmd = "svn cat #{target(path)}@#{identifier}"
+                  cat = nil
+                  shellout(cmd) do |io|
+                    cat = io.read
+                  end
+                  return nil if $? && $?.exitstatus != 0
+                  cat
+                rescue Errno::ENOENT => e
+                  raise CommandFailed
+                end
               private
                 def target(path)
                   " \"" << "#{@url}/#{path}".gsub(/["'<>]/, '') << "\""
                 end
+                def logger
+                  RAILS_DEFAULT_LOGGER
+                end
+                def shellout(cmd, &block)
+                  logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
+                  IO.popen(cmd) do |io|
+                    block.call(io) if block_given?
+                  end
+                end
               end
               class Entries < Array

scm/app/views/repositories/_navigation.rhtml +11 -2

@@ -1,9 +1,18
1	<%= link_to 'root', :action => 'browse', :id => @project, :path => '', :rev => @rev %>	1	<%= link_to 'root', :action => 'browse', :id => @project, :path => '', :rev => @rev %>
2	<% link_path = ''	2	<%
3	path.split('/').each do \|dir\|	3	dirs = path.split('/')
		4	if 'file' == kind
		5	filename = dirs.pop
		6	end
		7	link_path = ''
		8	dirs.each do \|dir\|
4	link_path << '/' unless link_path.empty?	9	link_path << '/' unless link_path.empty?
5	link_path << "#{dir}"	10	link_path << "#{dir}"
6	%>	11	%>
7	/ <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %>	12	/ <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %>
8	<% end %>	13	<% end %>
		14	<% if filename %>
		15	/ <%= link_to h(filename), :action => 'entry_revisions', :id => @project, :path => "#{link_path}/#{filename}", :rev => @rev %>
		16	<% end %>
		17
9	<%= "@ #{revision}" if revision %> No newline at end of file	18	<%= "@ #{revision}" if revision %>

scm/app/views/repositories/browse.rhtml +2 -2

             <%= submit_tag 'OK' %>
             </div>
-            <h2><%= render :partial => 'navigation', :locals => { :path => @entry.path, :revision => @rev } %></h2>
+            <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
             <table class="list">
             <thead><tr>
             <% total_size = 0
             @entries.each do |entry| %>
             <tr class="<%= cycle 'odd', 'even' %>">
-            <td><%= link_to h(entry.name), { :action => 'browse', :id => @project, :path => entry.path, :rev => @rev }, :class => "icon " + (entry.is_dir? ? 'folder' : 'file') %></td>
+            <td><%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'entry_revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => "icon " + (entry.is_dir? ? 'folder' : 'file') %></td>
             <td align="right"><%= human_size(entry.size) unless entry.is_dir? %></td>
             <td align="right"><%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %></td>
             <td align="center"><em><%=h entry.lastrev.author %></em></td>

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

@@ -1,4 +1,4
1	<h2><%= render :partial => 'navigation', :locals => { :path => @path, :revision => @rev } %></h2>	1	<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
2		2
3	<%= stylesheet_link_tag "scm" %>	3	<%= stylesheet_link_tag "scm" %>
4		4

scm/app/views/repositories/entry_revisions.rhtml +3 -3

             <%= submit_tag 'OK' %>
             </div>
-            <h2><%= render :partial => 'navigation', :locals => { :path => @entry.path, :revision => @rev } %></h2>
+            <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => @entry.kind, :revision => @rev } %></h2>
             <h3><%=h @entry.name %></h3>
-            <p><%= link_to 'Download', {}, :class => "icon file" %></p>
+            <p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= human_size @entry.size %>)</p>
             <h3>Revisions</h3>
             <td align="center"><em><%=h revision.author %></em></td>
             <td align="center"><%= format_time(revision.time) %></td>
             <td width="70%"><%= simple_format(h(revision.message)) %></td>
-            <td><%= link_to 'View diff', :action => 'diff', :id => @project, :path => @entry.path, :rev => revision.identifier %></td>
+            <td align="center"><%= link_to 'Diff', :action => 'diff', :id => @project, :path => @path, :rev => revision.identifier unless revision == @revisions.last %></td>
             </tr>
             <% end %>
             </tbody>

scm/app/views/repositories/revision.rhtml +7 -1

             <h2><%= l(:label_revision) %> <%= @revision.identifier %></h2>
-            <p><%= l(:field_author) %>: <em><%= @revision.author %></em></p>
+            <p><em><%= @revision.author %>, <%= format_time(@revision.time) %></em></p>
             <%= simple_format @revision.message %>
+            <div style="float:right;">
+            <div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %>&nbsp;</div>
+            <div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %>&nbsp;</div>
+            <div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %>&nbsp;</div>
+            </div>
             <h3><%= l(:label_attachment_plural) %></h3>
             <table class="list">
             <tbody>

scm/lang/fr.yml +3 0

             label_modification: %d modification
             label_modification_plural: %d modifications
             label_revision: Révision
+            label_added: ajouté
+            label_modified: modifié
+            label_deleted: supprimé
             button_login: Connexion
             button_submit: Soumettre

scm/public/stylesheets/scm.css +2 -1

             	font-weight: normal;
                 text-align: center;
                 background: #eed;
+                border: 1px solid #d7d7d7;
             }
             .icon {
-            table.diff tr.spacing {
+            tr.spacing {
                 border: 1px solid #d7d7d7;
             }

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