- Open Build Service Commits

[obs-commits] [PATCH] [webui] Rdiff overhaul.
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> Uses newer source diff partial (i.e. CodeWarrior2). The parameter 'rev' is now used instead of 'commit', as it always means the rev of the diff source. If there are 'oproject' and 'opackage' parameters, it is clear that a diff to a link target is to be shown. --- src/webui/app/controllers/package_controller.rb | 68 +++++++++++++------- src/webui/app/views/package/_commit_item.html.erb | 4 +- src/webui/app/views/package/rdiff.rhtml | 60 +++++++----------- src/webui/app/views/package/view_file.rhtml | 4 +- 4 files changed, 72 insertions(+), 64 deletions(-) diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index f2b9e1f..9db1ae3 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -290,46 +290,66 @@ class PackageController < ApplicationController def rdiff required_parameters :project, :package - if params[:commit] - @rev = params[:commit] + @last_rev = Package.current_rev(@project, @package.name) + if params[:oproject] and params[:opackage] + @oproject, @opackage = params[:oproject], params[:opackage] + @last_req = BsRequest.find_last_request(:targetproject => @oproject, :targetpackage => @opackage, :sourceproject => params[:project], :sourcepackage => params[:package]) + if @last_req and @last_req.state.name != "declined" + @last_req = nil # ignore all !declined + end + end + if params[:rev] + @rev = params[:rev] else - @rev = Package.current_rev(@project, @package.name) - required_parameters :opackage, :oproject - @opackage = params[:opackage] - @oproject = params[:oproject] + @rev = @last_rev end - @rdiff = '' - path = "/source/#{CGI.escape(params[:project])}/#{CGI.escape(params[:package])}?cmd=diff&unified=1" + + path = "/source/#{CGI.escape(params[:project])}/#{CGI.escape(params[:package])}?cmd=diff&view=xml" path += "&linkrev=#{CGI.escape(params[:linkrev])}" if params[:linkrev] path += "&rev=#{CGI.escape(@rev)}" if @rev path += "&oproject=#{CGI.escape(@oproject)}" if @oproject path += "&opackage=#{CGI.escape(@opackage)}" if @opackage - path += "&orev=#{CGI.escape(@orev)}" if @orev + path += "&orev=#{CGI.escape(params[:orev])}" if params[:orev] begin - @rdiff = frontend.transport.direct_http URI(path + "&expand=1"), :method => "POST", :data => "" + rdiff = frontend.transport.direct_http URI(path + "&expand=1"), :method => "POST", :data => "" rescue ActiveXML::Transport::NotFoundError => e - message, code, api_exception = ActiveXML::Transport.extract_error_message e - flash.now[:error] = message + flash.now[:error], _, _ = ActiveXML::Transport.extract_error_message(e) return rescue ActiveXML::Transport::Error => e - message, code, api_exception = ActiveXML::Transport.extract_error_message e - flash.now[:warn] = message + flash.now[:warn], _, _ = ActiveXML::Transport.extract_error_message(e) begin - @rdiff = frontend.transport.direct_http URI(path + "&expand=0"), :method => "POST", :data => "" + rdiff = frontend.transport.direct_http URI(path + "&expand=0"), :method => "POST", :data => "" rescue ActiveXML::Transport::Error => e - message, code, api_exception = ActiveXML::Transport.extract_error_message e + message, _, _ = ActiveXML::Transport.extract_error_message e flash.now[:warn] = nil flash.now[:error] = "Error getting diff: " + message return end end - if not params[:commit] - @lastreq = BsRequest.find_last_request(:targetproject => @oproject, :targetpackage => @opackage, - :sourceproject => params[:project], :sourcepackage => params[:package]) - if @lastreq and @lastreq.state.name != "declined" - @lastreq = nil # ignore all !declined + + result = ActiveXML::Base.new(rdiff) + # Sort files into categories by their ending and add all of them to a hash. We + # will later use the sorted and concatenated categories as key index into the per action file hash. + changes_file_keys, spec_file_keys, patch_file_keys, other_file_keys = [], [], [], [] + @files = {} + result.each('files/file') do |file_element| + if file_element.new + filename = file_element.new.name.to_s + elsif file_element.old # in case of deleted files + filename = file_element.old.name.to_s end + if filename.ends_with?('.spec') + spec_file_keys << filename + elsif filename.ends_with?('.changes') + changes_file_keys << filename + elsif filename.match(/.*.(patch|diff|dif)/) + patch_file_keys << filename + else + other_file_keys << filename + end + @files[filename] = file_element end + @filenames = changes_file_keys.sort + spec_file_keys.sort + patch_file_keys.sort + other_file_keys.sort; end def wizard_new @@ -773,11 +793,11 @@ class PackageController < ApplicationController def view_file @filename = params[:file] || '' - @srcmd5 = params[:srcmd5] + @rev = params[:rev] @addeditlink = false if @package.can_edit?( session[:login] ) begin - files = @package.files(@srcmd5, params[:expand]) + files = @package.files(@rev, params[:expand]) rescue ActiveXML::Transport::Error => e files = [] end @@ -789,7 +809,7 @@ class PackageController < ApplicationController end end begin - @file = frontend.get_source(:project => @project.to_s, :package => @package.to_s, :filename => @filename, :rev => @srcmd5) + @file = frontend.get_source(:project => @project.to_s, :package => @package.to_s, :filename => @filename, :rev => @rev) rescue ActiveXML::Transport::NotFoundError => e flash[:error] = "File not found: #{@filename}" redirect_to :action => :files, :package => @package, :project => @project and return diff --git a/src/webui/app/views/package/_commit_item.html.erb b/src/webui/app/views/package/_commit_item.html.erb index 8a43e67..469c255 100644 --- a/src/webui/app/views/package/_commit_item.html.erb +++ b/src/webui/app/views/package/_commit_item.html.erb @@ -23,9 +23,9 @@ <% end %> <%= link_to(image_tag('icons/brick.png'), { :controller => :package, :action => :rdiff, :package => @package, :project => @project, - :commit => commit[:revision], :linkrev => 'base'}, :style => "margin-left: 2em") %> + :rev => commit[:revision], :linkrev => 'base'}, :style => "margin-left: 2em") %> <%= link_to('Show diff', :controller => :package, :action => :rdiff, - :package => @package, :project => @project, :commit => commit[:revision], :linkrev => 'base') %> + :package => @package, :project => @project, :rev => commit[:revision], :linkrev => 'base') %> <% else %> <i>Revision <%=rev.to_s%> not found</i> <% end %> diff --git a/src/webui/app/views/package/rdiff.rhtml b/src/webui/app/views/package/rdiff.rhtml index 666bba0..e87562a 100644 --- a/src/webui/app/views/package/rdiff.rhtml +++ b/src/webui/app/views/package/rdiff.rhtml @@ -1,48 +1,36 @@ -<% @pagetitle = "Changes of Commit #{params[:commit]}" - package_bread_crumb("Changes") --%> +<% @pagetitle = "Changes" %> +<% package_bread_crumb("Changes") %> <%= render :partial => "tabs" %> -<% if params[:commit] %> - <h3><%= h @pagetitle %></h3> +<% if @oproject and @opackage %> + <h3>Difference Between Revision <%= @rev %> and <%= link_to(h(@oproject + "/" + @opackage), :action => :show, :package => @opackage, :project => @oproject) %></h3> <% else %> - + <h3>Changes of Revision <%= @rev %></h3> <% end %> -<% if @rdiff.empty? %> - <p><i>No difference</i></p> -<% else %> - <% if @addeditlink %> - <p> - <% link_to(image_tag("icon/package_edit.png", :title => "Edit diff"), :action => :edit_file, :project => @project, :package => @package, :file => @filename) %> - <% link_to("Edit diff", :action => :edit_file, :project => @project, :package => @package, :file => @filename) %> - </p> - <% end %> - - <%= render :partial => "shared/editor", :locals => {:text => @rdiff, :mode => 'diff'} %> +<% if @last_req %> +<p>The previous request <%= @last_req %> was declined <%= "%s by %s:" % [fuzzy_time_string((a)last_req.state.when), @last_req.state.who ] %>: <%= @last_req.state.comment %></p> +<% end %> - <% if @lastreq %> - <h3>The last request (<%= @lastreq.value(:id) %>) was declined <%= "%s by %s:" % [fuzzy_time_string((a)lastreq.state.when), @lastreq.state.who ] %></h3> - <p><%= @lastreq.state.comment %></p> +<% if session[:login] %> + <% if @oproject and @opackage %> + <% msg = "Submit to #{h((a)oproject.to_s + '/' + @opackage.to_s)}" %> + <% target_project, target_package = @oproject, @opackage %> + <% elsif @rev != @last_rev %> + <% msg = "Revert #{h((a)project.to_s + '/' + @package.to_s)} to revision #{@rev}" %> + <% target_project, target_package = @project, nil %> + <% else %> + <% msg = nil %> <% end %> - - <% if session[:login] %> - <h3>Actions</h3> - <% if params[:commit] %> - <% msg = "Revert #{h((a)project.to_s + ' / ' + @package.to_s)} to this revision" %> - <% target_project, target_package = @project, nil %> - <% else %> - <% msg = "Submit these changes to #{h((a)oproject.to_s + ' / ' + @opackage.to_s)}" %> - <% target_project, target_package = @oproject, @opackage %> - <% end %> + <% if msg %> <p> - <%= link_to_remote(image_tag('icons/package_go.png', :title => msg), - :url => {:action => 'submit_request_dialog', :project => @project, :package => @package, :targetproject => target_project, :targetpackage => target_package, :revision => @rev, :readonly => true}) %> - <%= link_to_remote(msg, - :url => {:action => 'submit_request_dialog', :project => @project, :package => @package, :targetproject => target_project, :targetpackage => target_package, :revision => @rev, :readonly => true}) %> + <%= link_to_remote(image_tag('icons/package_go.png', :title => msg), + :url => {:action => 'submit_request_dialog', :project => @project, :package => @package, :targetproject => target_project, :targetpackage => target_package, :revision => @rev, :readonly => true}) %> + <%= link_to_remote(msg, + :url => {:action => 'submit_request_dialog', :project => @project, :package => @package, :targetproject => target_project, :targetpackage => target_package, :revision => @rev, :readonly => true}) %> </p> <% end %> <% end %> + +<%= render(:partial => 'shared/sourcediff', :locals => {:filenames => @filenames, :files => @files, :source => {:project => @project, :package => @package, :rev => @rev}}) %> diff --git a/src/webui/app/views/package/view_file.rhtml b/src/webui/app/views/package/view_file.rhtml index 8ef65d6..ec6a414 100644 --- a/src/webui/app/views/package/view_file.rhtml +++ b/src/webui/app/views/package/view_file.rhtml @@ -1,12 +1,12 @@ <% @pagetitle = "File #{@filename} of Package #{@package}" %> -<% package_bread_crumb(link_to('Files', :action => :files, :project => @project, :package => @package, :rev => @srcmd5), h(@filename)) %> +<% package_bread_crumb(link_to('Files', :action => :files, :project => @project, :package => @package, :rev => @rev), h(@filename)) %> <%= render :partial => "tabs" %> <h3><%= @pagetitle %></h3> <div style="margin-left: 15px; margin-right: 15px;"> <% if @addeditlink %> - <%= render :partial => "shared/editor", :locals => {:text => @file, :mode => guess_code_class(@filename), :save => {:url => {:controller => 'package', :action => 'save_modified_file'}, :method => 'POST', :data => {:project => @project, :package => @package, :file => '@@@', :comment => '', :filename => @filename, :srcmd5 => @srcmd5}}} %> + <%= render :partial => "shared/editor", :locals => {:text => @file, :mode => guess_code_class(@filename), :save => {:url => {:controller => 'package', :action => 'save_modified_file'}, :method => 'POST', :data => {:project => @project, :package => @package, :file => '@@@', :comment => '', :filename => @filename, :rev => @rev}}} %> <%# TODO: Provide a comments field thru a callback!! %> <% else %> <%= render :partial => "shared/editor", :locals => {:text => @file, :mode => guess_code_class(@filename), :read_only => true} %> -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Allow to provide an individual revision to the submit request dialog.
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> It doesn't always have to be the lastest revision... --- src/webui/app/controllers/package_controller.rb | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index b4fd34e..f2b9e1f 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -175,7 +175,11 @@ class PackageController < ApplicationController end def submit_request_dialog - @revision = Package.current_rev(@project, @package) + if params[:revision] + @revision = params[:revision] + else + @revision = Package.current_rev(@project, @package) + end end def submit_request if params[:targetproject].nil? or params[:targetproject].empty? -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Naa, it's params[:file], not 'file'.
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> --- src/webui/app/controllers/package_controller.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index cf081e3..fad5c59 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -809,7 +809,7 @@ class PackageController < ApplicationController project = params[:project] package = params[:package] filename = params[:filename] - file.gsub!( /\r\n/, "\n" ) + params[:file].gsub!( /\r\n/, "\n" ) begin frontend.put_file(params[:file], :project => project, :package => package, :filename => filename, :comment => params[:comment]) Directory.free_cache(:project => project, :package => package) -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Naa, it's params[:file], not 'file'.
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> --- src/webui/app/controllers/package_controller.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index cf081e3..fad5c59 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -809,7 +809,7 @@ class PackageController < ApplicationController project = params[:project] package = params[:package] filename = params[:filename] - file.gsub!( /\r\n/, "\n" ) + params[:file].gsub!( /\r\n/, "\n" ) begin frontend.put_file(params[:file], :project => project, :package => package, :filename => filename, :comment => params[:comment]) Directory.free_cache(:project => project, :package => package) -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Oops, one colon to much ;-)
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> --- src/webui/app/views/package/rdiff.rhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/webui/app/views/package/rdiff.rhtml b/src/webui/app/views/package/rdiff.rhtml index 28ac0b0..a07a907 100644 --- a/src/webui/app/views/package/rdiff.rhtml +++ b/src/webui/app/views/package/rdiff.rhtml @@ -10,7 +10,7 @@ <% end %> <% if @last_req %> -<p>The previous request <%= @last_req %> was declined <%= "%s by %s:" % [fuzzy_time_string((a)last_req.state.when), @last_req.state.who ] %>: <%= @last_req.state.comment %></p> +<p>The previous request <%= @last_req %> was declined <%= "%s by %s:" % [fuzzy_time_string((a)last_req.state.when), @last_req.state.who ] %> <%= @last_req.state.comment %></p> <% end %> <% if session[:login] %> -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Add another div around the diff table and the issue tracker display.
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> Needed to catch the floating div. Otherwise it breaks layout. --- src/webui/app/views/shared/_sourcediff.html.erb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/webui/app/views/shared/_sourcediff.html.erb b/src/webui/app/views/shared/_sourcediff.html.erb index 0adb64f..5f2c474 100644 --- a/src/webui/app/views/shared/_sourcediff.html.erb +++ b/src/webui/app/views/shared/_sourcediff.html.erb @@ -29,6 +29,7 @@ <% table_id ||= nil %> <% bugs ||= nil %> +<div> <% if bugs && bugs.length > 0 %> <%# TODO: Anything but nice, move to 'box' when request view is restructured: %> <div style="float:right;"> @@ -95,3 +96,4 @@ <% else %> <p>No source changes!</p> <% end %> +</div> -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Also display bugs for rdiff against linked package
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> May help the submitter to see what's changed or which bugs have to be touched before creating the submit request. --- src/webui/app/controllers/package_controller.rb | 1 + src/webui/app/views/package/rdiff.rhtml | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index d04b097..cf081e3 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -330,6 +330,7 @@ class PackageController < ApplicationController filenames_and_bugs = sorted_filenames_and_bugs_from_sourcediff(ActiveXML::Base.new(rdiff)) @files = filenames_and_bugs[:files] @filenames = filenames_and_bugs[:filenames] + @bugs = filenames_and_bugs[:bugs] if @oproject and @opackage end def wizard_new diff --git a/src/webui/app/views/package/rdiff.rhtml b/src/webui/app/views/package/rdiff.rhtml index e87562a..28ac0b0 100644 --- a/src/webui/app/views/package/rdiff.rhtml +++ b/src/webui/app/views/package/rdiff.rhtml @@ -33,4 +33,4 @@ <% end %> <% end %> -<%= render(:partial => 'shared/sourcediff', :locals => {:filenames => @filenames, :files => @files, :source => {:project => @project, :package => @package, :rev => @rev}}) %> +<%= render(:partial => 'shared/sourcediff', :locals => {:filenames => @filenames, :files => @files, :bugs => @bugs, :source => {:project => @project, :package => @package, :rev => @rev}}) %> -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Move code to parse bugs and sorted filenames from sourcediff into own partial.
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> --- src/webui/app/controllers/package_controller.rb | 26 +---------- src/webui/app/controllers/request_controller.rb | 50 +--------------------- src/webui/app/helpers/application_helper.rb | 47 +++++++++++++++++++++ 3 files changed, 53 insertions(+), 70 deletions(-) diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index 9db1ae3..d04b097 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -327,29 +327,9 @@ class PackageController < ApplicationController end end - result = ActiveXML::Base.new(rdiff) - # Sort files into categories by their ending and add all of them to a hash. We - # will later use the sorted and concatenated categories as key index into the per action file hash. - changes_file_keys, spec_file_keys, patch_file_keys, other_file_keys = [], [], [], [] - @files = {} - result.each('files/file') do |file_element| - if file_element.new - filename = file_element.new.name.to_s - elsif file_element.old # in case of deleted files - filename = file_element.old.name.to_s - end - if filename.ends_with?('.spec') - spec_file_keys << filename - elsif filename.ends_with?('.changes') - changes_file_keys << filename - elsif filename.match(/.*.(patch|diff|dif)/) - patch_file_keys << filename - else - other_file_keys << filename - end - @files[filename] = file_element - end - @filenames = changes_file_keys.sort + spec_file_keys.sort + patch_file_keys.sort + other_file_keys.sort; + filenames_and_bugs = sorted_filenames_and_bugs_from_sourcediff(ActiveXML::Base.new(rdiff)) + @files = filenames_and_bugs[:files] + @filenames = filenames_and_bugs[:filenames] end def wizard_new diff --git a/src/webui/app/controllers/request_controller.rb b/src/webui/app/controllers/request_controller.rb index 388f0cd..65bcc02 100644 --- a/src/webui/app/controllers/request_controller.rb +++ b/src/webui/app/controllers/request_controller.rb @@ -107,54 +107,10 @@ class RequestController < ApplicationController diff_per_action = {} # Parse each action and get the it's diff (per file) result.each_with_index('/request/action') do |action_element, index| - # Sort files into categories by their ending and add all of them to a hash. We - # will later use the sorted and concatenated categories as key index into the per action file hash. - changes_file_keys, spec_file_keys, patch_file_keys, other_file_keys = [], [], [], [] - files_hash = {} - - action_element.each('sourcediff/files/file') do |file_element| - if file_element.new - filename = file_element.new.name.to_s - elsif file_element.old # in case of deleted files - filename = file_element.old.name.to_s - end - if filename.ends_with?('.spec') - spec_file_keys << filename - elsif filename.ends_with?('.changes') - changes_file_keys << filename - elsif filename.match(/.*.(patch|diff|dif)/) - patch_file_keys << filename - else - other_file_keys << filename - end - files_hash[filename] = file_element - end - - # Grep for bugs mentioned in changes and spec files - # TODO: Get summary from upstream issue tracker to display, needs API support... - bugs_mentioned = {} - (changes_file_keys + spec_file_keys).each do |file| - contents = files_hash[file] - if contents - IssueTracker.acronyms_with_urls_hash.each do |acronym, urls| - contents.text.each_line do |line| - if line.match(/^[+-].*/) # Only incorporate bugs in added / removed lines - line.scan(/#{acronym}\#\d+/).each do |matched_bug| - bugs_mentioned[matched_bug] = urls[:show_url].gsub('@@@', matched_bug.split('#')[1]) - end - end - end - end - end - end - + filenames_and_bugs = sorted_filenames_and_bugs_from_sourcediff(action_element.sourcediff) + filenames_and_bugs[:action] = action_element; # Use a more complex key for actions to be able to distinguish them (like 0_submit and 1_submit): - diff_per_action["#{index}_#{action_element.value('type')}"] = { - :action => action_element, - :filenames => changes_file_keys.sort + spec_file_keys.sort + patch_file_keys.sort + other_file_keys.sort, - :files => files_hash, - :bugs => bugs_mentioned - } + diff_per_action["#{index}_#{action_element.value('type')}"] = filenames_and_bugs end diff_per_action end diff --git a/src/webui/app/helpers/application_helper.rb b/src/webui/app/helpers/application_helper.rb index 04f374a..910302f 100644 --- a/src/webui/app/helpers/application_helper.rb +++ b/src/webui/app/helpers/application_helper.rb @@ -432,5 +432,52 @@ module ApplicationHelper return false end + def sorted_filenames_and_bugs_from_sourcediff(xml_element) + # Sort files into categories by their ending and add all of them to a hash. We + # will later use the sorted and concatenated categories as key index into the per action file hash. + changes_file_keys, spec_file_keys, patch_file_keys, other_file_keys = [], [], [], [] + files_hash = {} + + xml_element.each('files/file') do |file_element| + if file_element.new + filename = file_element.new.name.to_s + elsif file_element.old # in case of deleted files + filename = file_element.old.name.to_s + end + if filename.ends_with?('.spec') + spec_file_keys << filename + elsif filename.ends_with?('.changes') + changes_file_keys << filename + elsif filename.match(/.*.(patch|diff|dif)/) + patch_file_keys << filename + else + other_file_keys << filename + end + files_hash[filename] = file_element + end + + # Grep for bugs mentioned in changes and spec files + # TODO: Get summary from upstream issue tracker to display, needs API support... + bugs_mentioned = {} + (changes_file_keys + spec_file_keys).each do |file| + contents = files_hash[file] + if contents + IssueTracker.acronyms_with_urls_hash.each do |acronym, urls| + contents.text.each_line do |line| + if line.match(/^[+-].*/) # Only incorporate bugs in added / removed lines + line.scan(/#{acronym}\#\d+/).each do |matched_bug| + bugs_mentioned[matched_bug] = urls[:show_url].gsub('@@@', matched_bug.split('#')[1]) + end + end + end + end + end + end + + return {:filenames => changes_file_keys.sort + spec_file_keys.sort + patch_file_keys.sort + other_file_keys.sort, + :files => files_hash, + :bugs => bugs_mentioned} + end + end -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Rdiff overhaul.
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> Uses newer source diff partial (i.e. CodeWarrior2). The parameter 'rev' is now used instead of 'commit', as it always means the rev of the diff source. If there are 'oproject' and 'opackage' parameters, it is clear that a diff to a link target is to be shown. --- src/webui/app/controllers/package_controller.rb | 68 +++++++++++++------- src/webui/app/views/package/_commit_item.html.erb | 4 +- src/webui/app/views/package/rdiff.rhtml | 60 +++++++----------- src/webui/app/views/package/view_file.rhtml | 4 +- 4 files changed, 72 insertions(+), 64 deletions(-) diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index f2b9e1f..9db1ae3 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -290,46 +290,66 @@ class PackageController < ApplicationController def rdiff required_parameters :project, :package - if params[:commit] - @rev = params[:commit] + @last_rev = Package.current_rev(@project, @package.name) + if params[:oproject] and params[:opackage] + @oproject, @opackage = params[:oproject], params[:opackage] + @last_req = BsRequest.find_last_request(:targetproject => @oproject, :targetpackage => @opackage, :sourceproject => params[:project], :sourcepackage => params[:package]) + if @last_req and @last_req.state.name != "declined" + @last_req = nil # ignore all !declined + end + end + if params[:rev] + @rev = params[:rev] else - @rev = Package.current_rev(@project, @package.name) - required_parameters :opackage, :oproject - @opackage = params[:opackage] - @oproject = params[:oproject] + @rev = @last_rev end - @rdiff = '' - path = "/source/#{CGI.escape(params[:project])}/#{CGI.escape(params[:package])}?cmd=diff&unified=1" + + path = "/source/#{CGI.escape(params[:project])}/#{CGI.escape(params[:package])}?cmd=diff&view=xml" path += "&linkrev=#{CGI.escape(params[:linkrev])}" if params[:linkrev] path += "&rev=#{CGI.escape(@rev)}" if @rev path += "&oproject=#{CGI.escape(@oproject)}" if @oproject path += "&opackage=#{CGI.escape(@opackage)}" if @opackage - path += "&orev=#{CGI.escape(@orev)}" if @orev + path += "&orev=#{CGI.escape(params[:orev])}" if params[:orev] begin - @rdiff = frontend.transport.direct_http URI(path + "&expand=1"), :method => "POST", :data => "" + rdiff = frontend.transport.direct_http URI(path + "&expand=1"), :method => "POST", :data => "" rescue ActiveXML::Transport::NotFoundError => e - message, code, api_exception = ActiveXML::Transport.extract_error_message e - flash.now[:error] = message + flash.now[:error], _, _ = ActiveXML::Transport.extract_error_message(e) return rescue ActiveXML::Transport::Error => e - message, code, api_exception = ActiveXML::Transport.extract_error_message e - flash.now[:warn] = message + flash.now[:warn], _, _ = ActiveXML::Transport.extract_error_message(e) begin - @rdiff = frontend.transport.direct_http URI(path + "&expand=0"), :method => "POST", :data => "" + rdiff = frontend.transport.direct_http URI(path + "&expand=0"), :method => "POST", :data => "" rescue ActiveXML::Transport::Error => e - message, code, api_exception = ActiveXML::Transport.extract_error_message e + message, _, _ = ActiveXML::Transport.extract_error_message e flash.now[:warn] = nil flash.now[:error] = "Error getting diff: " + message return end end - if not params[:commit] - @lastreq = BsRequest.find_last_request(:targetproject => @oproject, :targetpackage => @opackage, - :sourceproject => params[:project], :sourcepackage => params[:package]) - if @lastreq and @lastreq.state.name != "declined" - @lastreq = nil # ignore all !declined + + result = ActiveXML::Base.new(rdiff) + # Sort files into categories by their ending and add all of them to a hash. We + # will later use the sorted and concatenated categories as key index into the per action file hash. + changes_file_keys, spec_file_keys, patch_file_keys, other_file_keys = [], [], [], [] + @files = {} + result.each('files/file') do |file_element| + if file_element.new + filename = file_element.new.name.to_s + elsif file_element.old # in case of deleted files + filename = file_element.old.name.to_s end + if filename.ends_with?('.spec') + spec_file_keys << filename + elsif filename.ends_with?('.changes') + changes_file_keys << filename + elsif filename.match(/.*.(patch|diff|dif)/) + patch_file_keys << filename + else + other_file_keys << filename + end + @files[filename] = file_element end + @filenames = changes_file_keys.sort + spec_file_keys.sort + patch_file_keys.sort + other_file_keys.sort; end def wizard_new @@ -773,11 +793,11 @@ class PackageController < ApplicationController def view_file @filename = params[:file] || '' - @srcmd5 = params[:srcmd5] + @rev = params[:rev] @addeditlink = false if @package.can_edit?( session[:login] ) begin - files = @package.files(@srcmd5, params[:expand]) + files = @package.files(@rev, params[:expand]) rescue ActiveXML::Transport::Error => e files = [] end @@ -789,7 +809,7 @@ class PackageController < ApplicationController end end begin - @file = frontend.get_source(:project => @project.to_s, :package => @package.to_s, :filename => @filename, :rev => @srcmd5) + @file = frontend.get_source(:project => @project.to_s, :package => @package.to_s, :filename => @filename, :rev => @rev) rescue ActiveXML::Transport::NotFoundError => e flash[:error] = "File not found: #{@filename}" redirect_to :action => :files, :package => @package, :project => @project and return diff --git a/src/webui/app/views/package/_commit_item.html.erb b/src/webui/app/views/package/_commit_item.html.erb index 8a43e67..469c255 100644 --- a/src/webui/app/views/package/_commit_item.html.erb +++ b/src/webui/app/views/package/_commit_item.html.erb @@ -23,9 +23,9 @@ <% end %> <%= link_to(image_tag('icons/brick.png'), { :controller => :package, :action => :rdiff, :package => @package, :project => @project, - :commit => commit[:revision], :linkrev => 'base'}, :style => "margin-left: 2em") %> + :rev => commit[:revision], :linkrev => 'base'}, :style => "margin-left: 2em") %> <%= link_to('Show diff', :controller => :package, :action => :rdiff, - :package => @package, :project => @project, :commit => commit[:revision], :linkrev => 'base') %> + :package => @package, :project => @project, :rev => commit[:revision], :linkrev => 'base') %> <% else %> <i>Revision <%=rev.to_s%> not found</i> <% end %> diff --git a/src/webui/app/views/package/rdiff.rhtml b/src/webui/app/views/package/rdiff.rhtml index 666bba0..e87562a 100644 --- a/src/webui/app/views/package/rdiff.rhtml +++ b/src/webui/app/views/package/rdiff.rhtml @@ -1,48 +1,36 @@ -<% @pagetitle = "Changes of Commit #{params[:commit]}" - package_bread_crumb("Changes") --%> +<% @pagetitle = "Changes" %> +<% package_bread_crumb("Changes") %> <%= render :partial => "tabs" %> -<% if params[:commit] %> - <h3><%= h @pagetitle %></h3> +<% if @oproject and @opackage %> + <h3>Difference Between Revision <%= @rev %> and <%= link_to(h(@oproject + "/" + @opackage), :action => :show, :package => @opackage, :project => @oproject) %></h3> <% else %> - + <h3>Changes of Revision <%= @rev %></h3> <% end %> -<% if @rdiff.empty? %> - <p><i>No difference</i></p> -<% else %> - <% if @addeditlink %> - <p> - <% link_to(image_tag("icon/package_edit.png", :title => "Edit diff"), :action => :edit_file, :project => @project, :package => @package, :file => @filename) %> - <% link_to("Edit diff", :action => :edit_file, :project => @project, :package => @package, :file => @filename) %> - </p> - <% end %> - - <%= render :partial => "shared/editor", :locals => {:text => @rdiff, :mode => 'diff'} %> +<% if @last_req %> +<p>The previous request <%= @last_req %> was declined <%= "%s by %s:" % [fuzzy_time_string((a)last_req.state.when), @last_req.state.who ] %>: <%= @last_req.state.comment %></p> +<% end %> - <% if @lastreq %> - <h3>The last request (<%= @lastreq.value(:id) %>) was declined <%= "%s by %s:" % [fuzzy_time_string((a)lastreq.state.when), @lastreq.state.who ] %></h3> - <p><%= @lastreq.state.comment %></p> +<% if session[:login] %> + <% if @oproject and @opackage %> + <% msg = "Submit to #{h((a)oproject.to_s + '/' + @opackage.to_s)}" %> + <% target_project, target_package = @oproject, @opackage %> + <% elsif @rev != @last_rev %> + <% msg = "Revert #{h((a)project.to_s + '/' + @package.to_s)} to revision #{@rev}" %> + <% target_project, target_package = @project, nil %> + <% else %> + <% msg = nil %> <% end %> - - <% if session[:login] %> - <h3>Actions</h3> - <% if params[:commit] %> - <% msg = "Revert #{h((a)project.to_s + ' / ' + @package.to_s)} to this revision" %> - <% target_project, target_package = @project, nil %> - <% else %> - <% msg = "Submit these changes to #{h((a)oproject.to_s + ' / ' + @opackage.to_s)}" %> - <% target_project, target_package = @oproject, @opackage %> - <% end %> + <% if msg %> <p> - <%= link_to_remote(image_tag('icons/package_go.png', :title => msg), - :url => {:action => 'submit_request_dialog', :project => @project, :package => @package, :targetproject => target_project, :targetpackage => target_package, :revision => @rev, :readonly => true}) %> - <%= link_to_remote(msg, - :url => {:action => 'submit_request_dialog', :project => @project, :package => @package, :targetproject => target_project, :targetpackage => target_package, :revision => @rev, :readonly => true}) %> + <%= link_to_remote(image_tag('icons/package_go.png', :title => msg), + :url => {:action => 'submit_request_dialog', :project => @project, :package => @package, :targetproject => target_project, :targetpackage => target_package, :revision => @rev, :readonly => true}) %> + <%= link_to_remote(msg, + :url => {:action => 'submit_request_dialog', :project => @project, :package => @package, :targetproject => target_project, :targetpackage => target_package, :revision => @rev, :readonly => true}) %> </p> <% end %> <% end %> + +<%= render(:partial => 'shared/sourcediff', :locals => {:filenames => @filenames, :files => @files, :source => {:project => @project, :package => @package, :rev => @rev}}) %> diff --git a/src/webui/app/views/package/view_file.rhtml b/src/webui/app/views/package/view_file.rhtml index 8ef65d6..ec6a414 100644 --- a/src/webui/app/views/package/view_file.rhtml +++ b/src/webui/app/views/package/view_file.rhtml @@ -1,12 +1,12 @@ <% @pagetitle = "File #{@filename} of Package #{@package}" %> -<% package_bread_crumb(link_to('Files', :action => :files, :project => @project, :package => @package, :rev => @srcmd5), h(@filename)) %> +<% package_bread_crumb(link_to('Files', :action => :files, :project => @project, :package => @package, :rev => @rev), h(@filename)) %> <%= render :partial => "tabs" %> <h3><%= @pagetitle %></h3> <div style="margin-left: 15px; margin-right: 15px;"> <% if @addeditlink %> - <%= render :partial => "shared/editor", :locals => {:text => @file, :mode => guess_code_class(@filename), :save => {:url => {:controller => 'package', :action => 'save_modified_file'}, :method => 'POST', :data => {:project => @project, :package => @package, :file => '@@@', :comment => '', :filename => @filename, :srcmd5 => @srcmd5}}} %> + <%= render :partial => "shared/editor", :locals => {:text => @file, :mode => guess_code_class(@filename), :save => {:url => {:controller => 'package', :action => 'save_modified_file'}, :method => 'POST', :data => {:project => @project, :package => @package, :file => '@@@', :comment => '', :filename => @filename, :rev => @rev}}} %> <%# TODO: Provide a comments field thru a callback!! %> <% else %> <%= render :partial => "shared/editor", :locals => {:text => @file, :mode => guess_code_class(@filename), :read_only => true} %> -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [webui] Allow to provide an individual revision to the submit request dialog.
by OBS build-service 07 Nov '11

07 Nov '11

From: Sascha Peilicke <saschpe(a)suse.de> It doesn't always have to be the lastest revision... --- src/webui/app/controllers/package_controller.rb | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb index b4fd34e..f2b9e1f 100644 --- a/src/webui/app/controllers/package_controller.rb +++ b/src/webui/app/controllers/package_controller.rb @@ -175,7 +175,11 @@ class PackageController < ApplicationController end def submit_request_dialog - @revision = Package.current_rev(@project, @package) + if params[:revision] + @revision = params[:revision] + else + @revision = Package.current_rev(@project, @package) + end end def submit_request if params[:targetproject].nil? or params[:targetproject].empty? -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0