| @@ -6,30 +6,31 class RepositoriesController < ApplicationController | |||
|
|
6 | 6 | end |
|
|
7 | 7 | |
|
|
8 | 8 | def browse |
|
|
9 | @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0 | |
|
|
9 | @entries = @repository.scm.entries(@path, @rev) | |
|
|
10 | redirect_to :action => 'show', :id => @project and return unless @entries | |
|
|
11 | end | |
|
|
12 | ||
|
|
13 | def entry_revisions | |
|
|
10 | 14 | @entry = @repository.scm.entry(@path, @rev) |
|
|
11 | redirect_to :action => 'show', :id => @project and return unless @entry | |
|
|
12 | if @entry.is_dir? | |
|
|
13 | # if entry is a dir, shows directory listing | |
|
|
14 | @entries = @repository.scm.entries(@path, @rev) | |
|
|
15 | redirect_to :action => 'show', :id => @project and return unless @entries | |
|
|
16 | else | |
|
|
17 | # else, shows file's revisions | |
|
|
18 | @revisions = @repository.scm.revisions(@path, @rev) | |
|
|
19 | redirect_to :action => 'show', :id => @project and return unless @revisions | |
|
|
20 | render :action => 'entry_revisions' | |
|
|
15 | @revisions = @repository.scm.revisions(@path, @rev) | |
|
|
16 | redirect_to :action => 'show', :id => @project and return unless @entry && @revisions | |
|
|
17 | end | |
|
|
18 | ||
|
|
19 | def entry | |
|
|
20 | if 'raw' == params[:format] | |
|
|
21 | content = @repository.scm.cat(@path, @rev) | |
|
|
22 | redirect_to :action => 'show', :id => @project and return unless content | |
|
|
23 | send_data content, :filename => @path.split('/').last | |
|
|
21 | 24 | end |
|
|
22 | 25 | end |
|
|
23 | 26 | |
|
|
24 | 27 | def revision |
|
|
25 | @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0 | |
|
|
26 | 28 | @revisions = @repository.scm.revisions '', @rev, @rev, :with_paths => true |
|
|
27 | 29 | redirect_to :action => 'show', :id => @project and return unless @revisions |
|
|
28 | 30 | @revision = @revisions.first |
|
|
29 | 31 | end |
|
|
30 | 32 | |
|
|
31 | 33 | def diff |
|
|
32 | @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0 | |
|
|
33 | 34 | @rev_to = params[:rev_to] || (@rev-1) |
|
|
34 | 35 | @diff = @repository.scm.diff(params[:path], @rev, @rev_to) |
|
|
35 | 36 | redirect_to :action => 'show', :id => @project and return unless @diff |
| @@ -40,5 +41,7 private | |||
|
|
40 | 41 | @project = Project.find(params[:id]) |
|
|
41 | 42 | @repository = @project.repository |
|
|
42 | 43 | @path = params[:path].squeeze('/').gsub(/^\//, '') if params[:path] |
|
|
44 | @path ||= '' | |
|
|
45 | @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0 | |
|
|
43 | 46 | end |
|
|
44 | 47 | end |
| @@ -9,7 +9,7 module SvnRepos | |||
|
|
9 | 9 | @url = nil |
|
|
10 | 10 | @login = nil |
|
|
11 | 11 | @password = nil |
|
|
12 | ||
|
|
12 | ||
|
|
13 | 13 | def initialize(url, login=nil, password=nil) |
|
|
14 | 14 | @url = url |
|
|
15 | 15 | @login = login if login && !login.empty? |
| @@ -19,31 +19,8 module SvnRepos | |||
|
|
19 | 19 | # Returns the entry identified by path and revision identifier |
|
|
20 | 20 | # or nil if entry doesn't exist in the repository |
|
|
21 | 21 | def entry(path=nil, identifier=nil) |
|
|
22 | path ||= '' | |
|
|
23 | identifier = 'HEAD' unless identifier and identifier > 0 | |
|
|
24 | entry = nil | |
|
|
25 | cmd = "svn info --xml -r #{identifier} #{target(path)}" | |
|
|
26 | IO.popen(cmd) do |io| | |
|
|
27 | begin | |
|
|
28 | doc = REXML::Document.new(io) | |
|
|
29 | doc.elements.each("info/entry") do |info| | |
|
|
30 | entry = Entry.new({:name => info.attributes['path'], | |
|
|
31 | :path => path, | |
|
|
32 | :kind => info.attributes['kind'], | |
|
|
33 | :lastrev => Revision.new({ | |
|
|
34 | :identifier => info.elements['commit'].attributes['revision'], | |
|
|
35 | :author => info.elements['commit'].elements['author'].text, | |
|
|
36 | :time => Time.parse(info.elements['commit'].elements['date'].text) | |
|
|
37 | }) | |
|
|
38 | }) | |
|
|
39 | end | |
|
|
40 | rescue | |
|
|
41 | end | |
|
|
42 | end | |
|
|
43 | return nil if $? && $?.exitstatus != 0 | |
|
|
44 | entry | |
|
|
45 | rescue Errno::ENOENT | |
|
|
46 | raise RepositoryCmdFailed | |
|
|
22 | e = entries(path, identifier) | |
|
|
23 | e ? e.first : nil | |
|
|
47 | 24 | end |
|
|
48 | 25 | |
|
|
49 | 26 | # Returns an Entries collection |
| @@ -52,8 +29,8 module SvnRepos | |||
|
|
52 | 29 | path ||= '' |
|
|
53 | 30 | identifier = 'HEAD' unless identifier and identifier > 0 |
|
|
54 | 31 | entries = Entries.new |
|
|
55 |
cmd = "svn list --xml |
|
|
|
56 |
|
|
|
|
32 | cmd = "svn list --xml #{target(path)}@#{identifier}" | |
|
|
33 | shellout(cmd) do |io| | |
|
|
57 | 34 | begin |
|
|
58 | 35 | doc = REXML::Document.new(io) |
|
|
59 | 36 | doc.elements.each("lists/list/entry") do |entry| |
| @@ -85,7 +62,7 module SvnRepos | |||
|
|
85 | 62 | cmd = "svn log --xml -r #{identifier_from}:#{identifier_to} " |
|
|
86 | 63 | cmd << "--verbose " if options[:with_paths] |
|
|
87 | 64 | cmd << target(path) |
|
|
88 |
|
|
|
|
65 | shellout(cmd) do |io| | |
|
|
89 | 66 | begin |
|
|
90 | 67 | doc = REXML::Document.new(io) |
|
|
91 | 68 | doc.elements.each("log/logentry") do |logentry| |
| @@ -95,6 +72,8 module SvnRepos | |||
|
|
95 | 72 | :path => path.text |
|
|
96 | 73 | } |
|
|
97 | 74 | end |
|
|
75 | paths.sort! { |x,y| x[:path] <=> y[:path] } | |
|
|
76 | ||
|
|
98 | 77 | revisions << Revision.new({:identifier => logentry.attributes['revision'], |
|
|
99 | 78 | :author => logentry.elements['author'].text, |
|
|
100 | 79 | :time => Time.parse(logentry.elements['date'].text), |
| @@ -121,9 +100,9 module SvnRepos | |||
|
|
121 | 100 | cmd = "svn diff -r " |
|
|
122 | 101 | cmd << "#{identifier_to}:" |
|
|
123 | 102 | cmd << "#{identifier_from}" |
|
|
124 | cmd << target(path) | |
|
|
103 | cmd << "#{target(path)}@#{identifier_from}" | |
|
|
125 | 104 | diff = [] |
|
|
126 |
|
|
|
|
105 | shellout(cmd) do |io| | |
|
|
127 | 106 | io.each_line do |line| |
|
|
128 | 107 | diff << line |
|
|
129 | 108 | end |
| @@ -133,11 +112,35 module SvnRepos | |||
|
|
133 | 112 | rescue Errno::ENOENT => e |
|
|
134 | 113 | raise CommandFailed |
|
|
135 | 114 | end |
|
|
115 | ||
|
|
116 | def cat(path, identifier=nil) | |
|
|
117 | identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" | |
|
|
118 | cmd = "svn cat #{target(path)}@#{identifier}" | |
|
|
119 | cat = nil | |
|
|
120 | shellout(cmd) do |io| | |
|
|
121 | cat = io.read | |
|
|
122 | end | |
|
|
123 | return nil if $? && $?.exitstatus != 0 | |
|
|
124 | cat | |
|
|
125 | rescue Errno::ENOENT => e | |
|
|
126 | raise CommandFailed | |
|
|
127 | end | |
|
|
136 | 128 | |
|
|
137 | 129 | private |
|
|
138 | 130 | def target(path) |
|
|
139 | 131 | " \"" << "#{@url}/#{path}".gsub(/["'<>]/, '') << "\"" |
|
|
140 | 132 | end |
|
|
133 | ||
|
|
134 | def logger | |
|
|
135 | RAILS_DEFAULT_LOGGER | |
|
|
136 | end | |
|
|
137 | ||
|
|
138 | def shellout(cmd, &block) | |
|
|
139 | logger.debug "Shelling out: #{cmd}" if logger && logger.debug? | |
|
|
140 | IO.popen(cmd) do |io| | |
|
|
141 | block.call(io) if block_given? | |
|
|
142 | end | |
|
|
143 | end | |
|
|
141 | 144 | end |
|
|
142 | 145 | |
|
|
143 | 146 | class Entries < Array |
| @@ -1,9 +1,18 | |||
|
|
1 | 1 | <%= link_to 'root', :action => 'browse', :id => @project, :path => '', :rev => @rev %> |
|
|
2 | <% link_path = '' | |
|
|
3 | path.split('/').each do |dir| | |
|
|
2 | <% | |
|
|
3 | dirs = path.split('/') | |
|
|
4 | if 'file' == kind | |
|
|
5 | filename = dirs.pop | |
|
|
6 | end | |
|
|
7 | link_path = '' | |
|
|
8 | dirs.each do |dir| | |
|
|
4 | 9 | link_path << '/' unless link_path.empty? |
|
|
5 | 10 | link_path << "#{dir}" |
|
|
6 | 11 | %> |
|
|
7 | 12 | / <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %> |
|
|
8 | 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 | 18 | <%= "@ #{revision}" if revision %> No newline at end of file |
| @@ -6,7 +6,7 | |||
|
|
6 | 6 | <%= submit_tag 'OK' %> |
|
|
7 | 7 | </div> |
|
|
8 | 8 | |
|
|
9 |
<h2><%= render :partial => 'navigation', :locals => { :path => @ |
|
|
|
9 | <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2> | |
|
|
10 | 10 | |
|
|
11 | 11 | <table class="list"> |
|
|
12 | 12 | <thead><tr> |
| @@ -20,7 +20,7 | |||
|
|
20 | 20 | <% total_size = 0 |
|
|
21 | 21 | @entries.each do |entry| %> |
|
|
22 | 22 | <tr class="<%= cycle 'odd', 'even' %>"> |
|
|
23 | <td><%= link_to h(entry.name), { :action => 'browse', :id => @project, :path => entry.path, :rev => @rev }, :class => "icon " + (entry.is_dir? ? 'folder' : 'file') %></td> | |
|
|
23 | <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> | |
|
|
24 | 24 | <td align="right"><%= human_size(entry.size) unless entry.is_dir? %></td> |
|
|
25 | 25 | <td align="right"><%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %></td> |
|
|
26 | 26 | <td align="center"><em><%=h entry.lastrev.author %></em></td> |
| @@ -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 | 3 | <%= stylesheet_link_tag "scm" %> |
|
|
4 | 4 | |
| @@ -6,10 +6,10 | |||
|
|
6 | 6 | <%= submit_tag 'OK' %> |
|
|
7 | 7 | </div> |
|
|
8 | 8 | |
|
|
9 |
<h2><%= render :partial => 'navigation', :locals => { :path => @entry. |
|
|
|
9 | <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => @entry.kind, :revision => @rev } %></h2> | |
|
|
10 | 10 | |
|
|
11 | 11 | <h3><%=h @entry.name %></h3> |
|
|
12 | <p><%= link_to 'Download', {}, :class => "icon file" %></p> | |
|
|
12 | <p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= human_size @entry.size %>)</p> | |
|
|
13 | 13 | |
|
|
14 | 14 | <h3>Revisions</h3> |
|
|
15 | 15 | |
| @@ -28,7 +28,7 | |||
|
|
28 | 28 | <td align="center"><em><%=h revision.author %></em></td> |
|
|
29 | 29 | <td align="center"><%= format_time(revision.time) %></td> |
|
|
30 | 30 | <td width="70%"><%= simple_format(h(revision.message)) %></td> |
|
|
31 |
<td><%= link_to ' |
|
|
|
31 | <td align="center"><%= link_to 'Diff', :action => 'diff', :id => @project, :path => @path, :rev => revision.identifier unless revision == @revisions.last %></td> | |
|
|
32 | 32 | </tr> |
|
|
33 | 33 | <% end %> |
|
|
34 | 34 | </tbody> |
| @@ -8,9 +8,15 | |||
|
|
8 | 8 | |
|
|
9 | 9 | <h2><%= l(:label_revision) %> <%= @revision.identifier %></h2> |
|
|
10 | 10 | |
|
|
11 | <p><%= l(:field_author) %>: <em><%= @revision.author %></em></p> | |
|
|
11 | <p><em><%= @revision.author %>, <%= format_time(@revision.time) %></em></p> | |
|
|
12 | 12 | <%= simple_format @revision.message %> |
|
|
13 | 13 | |
|
|
14 | <div style="float:right;"> | |
|
|
15 | <div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %> </div> | |
|
|
16 | <div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %> </div> | |
|
|
17 | <div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %> </div> | |
|
|
18 | </div> | |
|
|
19 | ||
|
|
14 | 20 | <h3><%= l(:label_attachment_plural) %></h3> |
|
|
15 | 21 | <table class="list"> |
|
|
16 | 22 | <tbody> |
| @@ -289,6 +289,9 label_browse: Parcourir | |||
|
|
289 | 289 | label_modification: %d modification |
|
|
290 | 290 | label_modification_plural: %d modifications |
|
|
291 | 291 | label_revision: Révision |
|
|
292 | label_added: ajouté | |
|
|
293 | label_modified: modifié | |
|
|
294 | label_deleted: supprimé | |
|
|
292 | 295 | |
|
|
293 | 296 | button_login: Connexion |
|
|
294 | 297 | button_submit: Soumettre |
| @@ -29,6 +29,7 table.list tbody th { | |||
|
|
29 | 29 | font-weight: normal; |
|
|
30 | 30 | text-align: center; |
|
|
31 | 31 | background: #eed; |
|
|
32 | border: 1px solid #d7d7d7; | |
|
|
32 | 33 | } |
|
|
33 | 34 | |
|
|
34 | 35 | .icon { |
| @@ -42,7 +43,7 table.list tbody th { | |||
|
|
42 | 43 | |
|
|
43 | 44 | |
|
|
44 | 45 | |
|
|
45 |
|
|
|
|
46 | tr.spacing { | |
|
|
46 | 47 | border: 1px solid #d7d7d7; |
|
|
47 | 48 | } |
|
|
48 | 49 | |
General Comments 0
You need to be logged in to leave comments.
Login now