Projects November 2005

projects@lrde.epita.fr

6 participants
85 discussions

by Akim Demaille

/tmp % vcs-svn --version help (?, h): Describe the usage of this program or its subcommands. usage: help [SUBCOMMAND...] Valid options: --version : print client version info -q [--quiet] : print as little as possible --config-dir arg : read user configuration files from directory ARG

18 years, 2 months

vcs-svn ci: No title found. Reopen `,form' and add it

by Akim Demaille

En effet : lectures/publis/david.06.ldta % head ,form nostromo Err 1 Title: "" Subject: "<%= rev %>: <%= title %>" From: "Akim Demaille <akim(a)lrde.epita.fr>" To: [transformers-private(a)lrde.epita.fr] ChangeLog: * article.tex (natbib): Use it. (fixme): Include it before hyperref. Various fixes. (Future Work): New. --text follow this line-- mais quand je lance svn ci, il pourrait me le réouvrir lui-même.

18 years, 4 months

vcs: --verbose

by Akim Demaille

Le canal `info' ne devrait être activé qu'à la demande avec --verbose. lectures/publis/david.06.ldta % svn ci nostromo 10:20 vcs: info: Updating your working copy... Fetching external item into 'share' External at revision 1053. At revision 1055. vcs: info: Creating a new `,form' file... vcs: info: Creating a new `,log' file... vcs: info: Creating a new `,message' file... vcs: info: ,log already exists vcs: info: Creating a new `,iform' file... vcs: info: ,form already exists vcs: info: Creating a new `,message' file... vcs: info: ,log already exists vcs: info: Creating a new `,mail' file vcs: info: ,message already exists vcs: info: Backup your `ChangeLog' to `,,ChangeLog' ... vcs: info: ChangeLog: Writing your new entry ... vcs: info: ,log already exists vcs: info: ChangeLog: Writing the others ... vcs: info: ,log already exists Sending david.06.ldta/ChangeLog Sending david.06.ldta/TODO Sending david.06.ldta/article.tex Transmitting file data ... Committed revision 1056. Fetching external item into 'share' External at revision 1053. At revision 1056. Using the cache file ,mail Smtp Server: localhost Mail: Sent. vcs: info: Deleting junk files... vcs: info: Moving `,log', `,form', `,iform', `,message' to `+committed/1056'... Par ailleurs, faire un up avant un checkin, je ne suis pas sûr que ce soit un véritable service.

18 years, 4 months

vcs-svn diff: Y en a trop dedans

by Akim Demaille

Prenons un exemple : lectures/publis/david.06.ldta % svn info nostromo 15:23 Path: . URL: https://svn.lrde.epita.fr/svn/lrde-publis/trunk/david.06.ldta Repository UUID: b977b829-83e4-0310-aee4-aa4e2d4fa5a1 Revision: 1051 Node Kind: directory Schedule: normal Last Changed Author: akim Last Changed Rev: 1051 Last Changed Date: 2005-11-28 15:23:42 +0100 (Mon, 28 Nov 2005) Properties Last Updated: 2005-11-24 18:19:29 +0100 (Thu, 24 Nov 2005) Il se trouve qu'à cet endroit on a : lectures/publis/david.06.ldta % svn st nostromo 15:24 + +committed X share + share/+committed M share/styles/myacronym.sty noter le X de share : c'est un svn:externals. Que son contenu apparaisse dans svn diff, je peux le comprendre. Mais il ne devrait pas apparaître dans le diff de svn ci, parce qu'il *ne va pas être enregistré*. Pour être enregistrer il faut explicitement faire un svn ci dans tous les externals.

18 years, 4 months

[ranch] 70: No longer embed head tag in the _head layout.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> No longer embed head tag in the _head layout. * web/ranch/app/views/layouts/_head.rhtml: No more head tag since this is only the shared part of the head, not obsiously the whole things. * web/ranch/app/views/layouts/ranch.rhtml, * web/ranch/app/views/layouts/benches.rhtml, * web/ranch/app/views/layouts/systems.rhtml, * web/ranch/app/views/layouts/projects.rhtml: Add the head tag here since every layout may want to add stuff in the head without clobbering the shared part. _head.rhtml | 2 -- benches.rhtml | 2 ++ projects.rhtml | 2 ++ ranch.rhtml | 2 ++ systems.rhtml | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) Index: web/ranch/app/views/layouts/ranch.rhtml --- web/ranch/app/views/layouts/ranch.rhtml (revision 69) +++ web/ranch/app/views/layouts/ranch.rhtml (working copy) @@ -1,7 +1,9 @@  <html> + <head> <%= render :partial => "layouts/head" %> + </head> <body> <%= render :partial => "layouts/top_banner" %> <%= render :partial => "layouts/menubar" %> Index: web/ranch/app/views/layouts/_head.rhtml --- web/ranch/app/views/layouts/_head.rhtml (revision 69) +++ web/ranch/app/views/layouts/_head.rhtml (working copy) @@ -1,6 +1,4 @@  -<head> <title>Ranch: regression benchmark system</title> <%= stylesheet_link_tag 'scaffold' %> -</head> Index: web/ranch/app/views/layouts/benches.rhtml --- web/ranch/app/views/layouts/benches.rhtml (revision 69) +++ web/ranch/app/views/layouts/benches.rhtml (working copy) @@ -1,7 +1,9 @@  <html> + <head> <%= render :partial => "layouts/head" %> + </head> <body> <%= render :partial => "layouts/top_banner" %> <%= render :partial => "layouts/menubar" %> Index: web/ranch/app/views/layouts/systems.rhtml --- web/ranch/app/views/layouts/systems.rhtml (revision 69) +++ web/ranch/app/views/layouts/systems.rhtml (working copy) @@ -1,7 +1,9 @@  <html> + <head> <%= render :partial => "layouts/head" %> + </head> <body> <%= render :partial => "layouts/top_banner" %> <%= render :partial => "layouts/menubar" %> Index: web/ranch/app/views/layouts/projects.rhtml --- web/ranch/app/views/layouts/projects.rhtml (revision 69) +++ web/ranch/app/views/layouts/projects.rhtml (working copy) @@ -1,7 +1,9 @@  <html> + <head> <%= render :partial => "layouts/head" %> + </head> <body> <%= render :partial => "layouts/top_banner" %> <%= render :partial => "layouts/menubar" %>

18 years, 5 months

[ranch] 69: Remove useless files.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Remove useless files. * web/ranch/app/views/layouts/_left_margin.rhtml, * web/ranch/app/views/layouts/ranch_benches_list.rhtml, * web/ranch/app/filters/load_projects_filter.rb, * web/ranch/app/helpers/graph_form_helper.rb: Remove. Useless since the layout have changed. * web/ranch/app/controllers/benches_controller.rb: No longer use the deprecated helper `graph_form'. * web/ranch/app/helpers/benches_helper.rb: Inject `graph_form' `outputs_tag' helper in it. controllers/benches_controller.rb | 2 +- helpers/benches_helper.rb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) Index: web/ranch/app/controllers/benches_controller.rb --- web/ranch/app/controllers/benches_controller.rb (revision 68) +++ web/ranch/app/controllers/benches_controller.rb (working copy) @@ -2,7 +2,7 @@ layout 'benches' - helper :graph, :graph_form, :benches + helper :graph, :benches before_filter :list Index: web/ranch/app/helpers/benches_helper.rb --- web/ranch/app/helpers/benches_helper.rb (revision 68) +++ web/ranch/app/helpers/benches_helper.rb (working copy) @@ -1,5 +1,24 @@ module BenchesHelper + def outputs_tag(name, bench_name, arg_num=0, nb_arg=1, options={}) + bench = Bench.find_by_name bench_name + outputs = Output.find_by_sql "SELECT name, unit, arg_num " + + "FROM outputs " + + "WHERE bench_id = #{bench.id} " + + "GROUP BY arg_num " + + "ORDER BY arg_num" + + str = %(<select id="#{name}" name="#{name}">\n) + str += %(<option value="0" #{arg_num.zero? ? 'selected="selected"' : ''}>) + str += "**ALL**</option>\n" + outputs.each do |output| + str += %(<option value="#{output.arg_num}") + str += %( selected="selected") if output.arg_num == arg_num + str += %(>#{output.name}(#{output.unit})</option>\n) + end + str += %(</select>\n) + end + def system_change_tag(hostname, changes, rev_start, rev_stop) ret = %( <p>

18 years, 5 months

[ranch] 68: Link regression template to the system diff template.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Link regression template to the system diff template. * web/ranch/app/helpers/benches_helper.rb: Add link from the revision range system change to the anchor in the diff template. * web/ranch/app/helpers/systems_helper.rb: Add anchors. benches_helper.rb | 6 +++++- systems_helper.rb | 11 +++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) Index: web/ranch/app/helpers/benches_helper.rb --- web/ranch/app/helpers/benches_helper.rb (revision 67) +++ web/ranch/app/helpers/benches_helper.rb (working copy) @@ -41,7 +41,11 @@ :action => "show", :system_id => change1.system_id)} </td><td> - #{change1.revision}-#{change2.revision} + #{link_to "#{change1.revision}-#{change2.revision}", + :controller => "systems", + :action => "diff", + :system_id => change1.system_id, + :anchor => change1.system_id} </td></tr> ) end Index: web/ranch/app/helpers/systems_helper.rb --- web/ranch/app/helpers/systems_helper.rb (revision 67) +++ web/ranch/app/helpers/systems_helper.rb (working copy) @@ -4,7 +4,9 @@ ret = "<table>" system = systems.shift ret += %( - <tr><td> + <tr> + #{content_tag "a", "", :name => system.id} + <td> #{system.created_at} </td><td> <table> @@ -25,10 +27,11 @@ for system in systems do diff = prev.diff(system) ret += %( - <tr><td> + <tr> + #{content_tag "a", "", :name => system.id} + <td> #{system.created_at} - </td><td> - <table> + </td><td><table> ) for field in diff do ret += %(

18 years, 5 months

[ranch] 67: Add the diff view to the system controller.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add the diff view to the system controller. * web/ranch/test/functional/systems_controller_test.rb: Test it. * web/ranch/app/helpers/systems_helper.rb: Add the diff_tag which help to render the differences table. * web/ranch/app/models/system.rb: Store the field ignored by the diff algorithm in a class variable. * web/ranch/app/controllers/systems_controller.rb: Add the diff request. * web/ranch/app/views/systems/_menubar.rhtml: Add the diff item menu. * web/ranch/app/views/systems/diff.rhtml: New. The view for the diff request. app/controllers/systems_controller.rb | 21 ++++++++++--- app/helpers/systems_helper.rb | 45 +++++++++++++++++++++++++++++ app/models/system.rb | 7 +++- app/views/systems/_menubar.rhtml | 13 ++++---- app/views/systems/diff.rhtml | 15 +++++++++ test/functional/systems_controller_test.rb | 18 +++++++++++ 6 files changed, 107 insertions(+), 12 deletions(-) Index: web/ranch/test/functional/systems_controller_test.rb --- web/ranch/test/functional/systems_controller_test.rb (revision 66) +++ web/ranch/test/functional/systems_controller_test.rb (working copy) @@ -85,4 +85,22 @@ assert_nil assigns(:system) end + def test_diff_with_hostname + get :diff, { :system_id => 1 } + assert_response :success + assert_template "diff" + + assert_not_nil assigns(:system) + assert_not_nil assigns(:systems) + end + + def test_diff_without_hostname + get :diff + assert_response :success + assert_template "diff" + + assert_nil assigns(:system) + assert_nil assigns(:systems) + end + end Index: web/ranch/app/helpers/systems_helper.rb --- web/ranch/app/helpers/systems_helper.rb (revision 66) +++ web/ranch/app/helpers/systems_helper.rb (working copy) @@ -1,2 +1,47 @@ module SystemsHelper + + def diff_tag(systems) + ret = "<table>" + system = systems.shift + ret += %( + <tr><td> + #{system.created_at} + </td><td> + <table> + ) + for column in System.columns do + unless System.diff_exception.include?(column.name) + ret += %( + <tr> + #{content_tag "td", "#{column.name}:"} + #{content_tag "td", system.send(column.name)} + </tr> + ) + end + end + ret += "</table></td></tr>" + + prev = system + for system in systems do + diff = prev.diff(system) + ret += %( + <tr><td> + #{system.created_at} + </td><td> + <table> + ) + for field in diff do + ret += %( + <tr> + #{content_tag "td", "#{field}:"} + #{content_tag "td", system.send(field)} + </tr> + ) + end + ret += "</table></td></tr>" + prev = system + end + ret += "</table>" + end + end Index: web/ranch/app/models/system.rb --- web/ranch/app/models/system.rb (revision 66) +++ web/ranch/app/models/system.rb (working copy) @@ -31,11 +31,14 @@ systems end + @@diff_exception = %w( info id created_at ) + + cattr_reader :diff_exception + def diff(other) - except = %w( info id created_at ) ret = [] attributes.each do |k, v| - if not except.include? k and v != other.attributes[k] + if not System.diff_exception.include? k and v != other.attributes[k] ret << k end end Index: web/ranch/app/controllers/systems_controller.rb --- web/ranch/app/controllers/systems_controller.rb (revision 66) +++ web/ranch/app/controllers/systems_controller.rb (working copy) @@ -2,6 +2,8 @@ layout 'systems' + before_filter :current_system + def index redirect_to :action => 'list' end @@ -14,17 +16,28 @@ @ascendant = params[:ascendant] != "false" - @systems = System.find :all, { - :order => "#@order_by #{@ascendant ? "" : "DESC"}" - } + @systems = System.find(:all, + :order => "#@order_by #{@ascendant ? "" : "DESC"}") end def show - @system = System.find_by_id params[:system_id] + end + + def diff + unless @system.nil? + @systems = System.find(:all, + :conditions => [ "hostname = ?", + @system.hostname ], + :order => "created_at") + end end protected + def current_system + @system = System.find_by_id params[:system_id] + end + def field_name_exists?(name) System.columns.each do |column| return true if column.name == name Index: web/ranch/app/views/systems/_menubar.rhtml --- web/ranch/app/views/systems/_menubar.rhtml (revision 66) +++ web/ranch/app/views/systems/_menubar.rhtml (working copy) @@ -2,15 +2,16 @@ <table> <tr> <td> - <%= link_to "List", :action => "list" %> + <%= link_to "List", :action => "list", + :system_id => @system.nil? ? nil : @system.id %> </td> <td> - <% if @system.nil? %> - <%= link_to "Information", :action => "show" %> - <% else %> <%= link_to "Information", :action => "show", - :system_id => @system.id %> - <% end %> + :system_id => @system.nil? ? nil : @system.id %> + </td> + <td> + <%= link_to "Differences", :action => "diff", + :system_id => @system.nil? ? nil : @system.id %> </td> </tr> </table> Index: web/ranch/app/views/systems/diff.rhtml --- web/ranch/app/views/systems/diff.rhtml (revision 0) +++ web/ranch/app/views/systems/diff.rhtml (revision 0) @@ -0,0 +1,15 @@ +  + +<p> +<% if @systems.nil? or @systems.empty? %> + Select a system hostname in the list first. +<% else %> + + <p> + <%= content_tag "h1", @systems.first.hostname %> + </p> + + <%= diff_tag @systems %> + +<% end %> +</p>

18 years, 5 months

[ranch] 66: Add the created_at field to the system table.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add the created_at field to the system table. * web/ranch/test/unit/system_test.rb: Make the diff test deterministic. * web/ranch/test/fixtures/systems.yml: Add fixtures for the created_at field. * web/ranch/app/models/system.rb: Do not include the created_at field in the diff. * web/ranch/db/schema.rb: Add the created_at field. app/models/system.rb | 10 +++++----- db/schema.rb | 15 ++++++++------- test/fixtures/systems.yml | 2 ++ test/unit/system_test.rb | 6 ++++-- 4 files changed, 19 insertions(+), 14 deletions(-) Index: web/ranch/test/unit/system_test.rb --- web/ranch/test/unit/system_test.rb (revision 65) +++ web/ranch/test/unit/system_test.rb (working copy) @@ -35,8 +35,10 @@ end assert ! sys1.diff?(sys2) sys2 = systems("ouagadougou2") - require 'pp' - assert_equal ["cpu_frequency"], sys1.diff(sys2) + diff_result = sys1.diff(sys2) + %w(cpu_frequency).each do |x| + assert diff_result.include?(x), "#{x} is missing in the diff" + end end end Index: web/ranch/test/fixtures/systems.yml --- web/ranch/test/fixtures/systems.yml (revision 65) +++ web/ranch/test/fixtures/systems.yml (working copy) @@ -4,6 +4,7 @@ <%= "ouagadougou#{i}:" %> id: <%= id += 1 %> + created_at: <%= "2005-11-0#{i} 18:02:50.550163 +01:00" %> hostname: ouagadougou kernel_name: Linux kernel_revision: "2.4.27-2-k7" @@ -52,6 +53,7 @@ <%= "vaucanson#{i}:" %> id: <%= id += 1 %> + created_at: <%= "2005-11-1#{i} 18:02:50.550163 +01:00" %> hostname: vaucanson kernel_name: Linux kernel_revision: 2.6.10-1.760_FC3smp Index: web/ranch/app/models/system.rb --- web/ranch/app/models/system.rb (revision 65) +++ web/ranch/app/models/system.rb (working copy) @@ -3,12 +3,12 @@ has_many :output validates_presence_of(:hostname, - :kernel_name, :kernel_revision, :kernel_version, :host_type, - :os_name, - :comp_name, :comp_version, :comp_flags, + :cpu_name, :cpu_frequency, :mem_size, - :cpu_name, :cpu_frequency) + :comp_name, :comp_version, :comp_flags, + :os_name, + :kernel_name, :kernel_revision, :kernel_version) validates_length_of :hostname, :maximum => 128 validates_length_of :kernel_name, :maximum => 128 validates_length_of :kernel_revision, :maximum => 128 @@ -32,7 +32,7 @@ end def diff(other) - except = %w( info id ) + except = %w( info id created_at ) ret = [] attributes.each do |k, v| if not except.include? k and v != other.attributes[k] Index: web/ranch/db/schema.rb --- web/ranch/db/schema.rb (revision 65) +++ web/ranch/db/schema.rb (working copy) @@ -39,18 +39,19 @@ end create_table "systems", :force => true do |t| + t.column "created_at", :datetime, :null => false t.column "hostname", :string, :limit => 128, :default => "localhost", :null => false - t.column "kernel_name", :string, :limit => 128, :default => "", :null => false - t.column "kernel_revision", :string, :limit => 128, :default => "", :null => false - t.column "kernel_version", :string, :limit => 128, :default => "", :null => false t.column "host_type", :string, :limit => 128, :default => "", :null => false - t.column "os_name", :string, :limit => 128, :default => "", :null => false + t.column "cpu_frequency", :float, :default => 0.0, :null => false + t.column "cpu_name", :string, :limit => 128, :default => "", :null => false + t.column "mem_size", :integer, :default => 0, :null => false t.column "comp_name", :string, :limit => 128, :default => "", :null => false t.column "comp_version", :string, :limit => 128, :default => "", :null => false t.column "comp_flags", :string, :default => "", :null => false - t.column "mem_size", :integer, :default => 0, :null => false - t.column "cpu_name", :string, :limit => 128, :default => "", :null => false - t.column "cpu_frequency", :float, :default => 0.0, :null => false + t.column "os_name", :string, :limit => 128, :default => "", :null => false + t.column "kernel_name", :string, :limit => 128, :default => "", :null => false + t.column "kernel_revision", :string, :limit => 128, :default => "", :null => false + t.column "kernel_version", :string, :limit => 128, :default => "", :null => false t.column "info", :text end

18 years, 5 months

[ranch] 65: Add the diff method for the system.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add the diff method for the system. * web/ranch/app/models/system.rb: Add the diff method. * web/ranch/test/unit/system_test.rb: Test it. app/models/system.rb | 15 +++++++++++++++ test/unit/system_test.rb | 12 ++++++++++++ 2 files changed, 27 insertions(+) Index: web/ranch/test/unit/system_test.rb --- web/ranch/test/unit/system_test.rb (revision 64) +++ web/ranch/test/unit/system_test.rb (working copy) @@ -27,4 +27,16 @@ assert_equal 3, systems.size end + def test_diff + sys1 = systems("ouagadougou1") + sys2 = System.new + sys1.attributes.each do |k, v| + sys2.send("#{k}=", v) + end + assert ! sys1.diff?(sys2) + sys2 = systems("ouagadougou2") + require 'pp' + assert_equal ["cpu_frequency"], sys1.diff(sys2) + end + end Index: web/ranch/app/models/system.rb --- web/ranch/app/models/system.rb (revision 64) +++ web/ranch/app/models/system.rb (working copy) @@ -31,6 +31,21 @@ systems end + def diff(other) + except = %w( info id ) + ret = [] + attributes.each do |k, v| + if not except.include? k and v != other.attributes[k] + ret << k + end + end + ret + end + + def diff?(other) + ! diff(other).empty? + end + protected def validate

18 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects November 2005