Projects September 2005

projects@lrde.epita.fr

8 participants
56 discussions

[LrdeTools] 255: Fix a bug woth error handlers.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fix a bug woth error handlers. * vcs/lib/vcs/vcs.rb: Use a class variable to store them. * vcs/lib/vcs/app.rb: Split a line to store the real vcs instance. app.rb | 9 +++++++-- vcs.rb | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 254) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -245,7 +245,6 @@ def initialize ( aCmd ) @cmd = aCmd.to_cmd - @handlers = Set.new @runner = Commands::Runners::System.new @h = HighLine.new self.cmd_data_factory = VcsCmdDataFactory.new(:output => STDOUT, :error => STDERR) @@ -329,6 +328,8 @@ delegate_to_cmd_data Vcs.output_io_methods @@checkers = Set.new + OrderedHash.import! + @@handlers = OHash.new def run! ( command, files=[], options={} ) flush @@ -417,18 +418,18 @@ def with_cache ( path=nil, description=nil, &block ) loc = block.source_location # FIXME verify that this type of cache is working return @@cache[loc].dup if @@cache.has_key? loc - if path.exist? - logger.info "#{path} already exists" - return path.read - end unless path.nil? if description.nil? raise ArgumentError, "need a description for #{path}" end - error_handling do + error_handling(path) do logger.info "#{path}: Contains your #{description}" if path.exist? end end + if path.exist? + logger.info "#{path} already exists" + return path.read + end begin logger.info "Creating a new `#{path}' file ..." path.open('w') { |f| result = with(f, &block) } @@ -533,12 +534,12 @@ alias_command :checkin, :commit alias_command :populate, :add - def error_handling ( meth=nil, &block ) - @handlers << ((block.nil?)? method(meth) : block) + def error_handling ( meth_or_path, &block ) + @@handlers[meth_or_path] = (block.nil?)? method(meth_or_path) : block end def call_handlers - @handlers.each { |block| block[] } + @@handlers.each { |k, v| v[k] } end def call_conf_checkers Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 254) +++ vcs/lib/vcs/app.rb (working copy) @@ -106,12 +106,17 @@ ".head_cut! exit end - vcs = @@all_vcs[Vcs.default.to_s.downcase.to_sym].new.run_argv(ARGV) + vcs = @@all_vcs[Vcs.default.to_s.downcase.to_sym].new + vcs.run_argv(ARGV) rescue SystemExit => ex raise ex rescue Exception => ex - vcs.call_handlers unless vcs.nil? + if vcs.nil? + logger.error { "No Vcs instanciated" } + else + vcs.call_handlers + end err = ex.to_s.sub(/\.$/, '') logger.debug { err = ex.long_pp ; "Backtrace enabled:" } err = ex.inspect if err.empty?

18 years, 7 months

[LrdeTools] 254: Vcs outputs can now be sorted!.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Vcs outputs can now be sorted!. * vcs/NEWS: Explain the sorting feature. * vcs/lib/vcs/vcs.rb: Add sorting to the default configuration. Add Vcs.regex_list. * vcs/lib/vcs/svn.rb: Fix the --revision switch which does not takes just an integer. * vcs/lib/vcs/status.rb: Add a comment attribute to StatusEntry. Add a color for the X status. Call the sort_with_regex_list in the status method. * vcs/lib/vcs/diff.rb: Remove the set which lose the order. * vcs/lib/vcs/changelog.rb: Adapt. NEWS | 38 ++++++++++++++++++++++++++++++++++++++ lib/vcs/changelog.rb | 7 ++++--- lib/vcs/diff.rb | 7 ++++--- lib/vcs/status.rb | 12 ++++++++++-- lib/vcs/svn.rb | 2 +- lib/vcs/vcs.rb | 5 +++++ 6 files changed, 62 insertions(+), 9 deletions(-) Index: vcs/NEWS --- vcs/NEWS (revision 253) +++ vcs/NEWS (working copy) @@ -59,6 +59,44 @@ - svn junk: This command use `list' to remove all junk files. + * Sorted outputs: + - Vcs now support sorting!!! + In a .vcs configuration file you can add a `sorting' key which + contains a list of regular expressions. + For example: + >>>> ~/.vcs <<<< + --- + sorting: + - !re (NEWS|README|TODO) # These files in first + - !re src/ # Then the src directory + - !re test/ # Then the test directory + - !re parse/ # parse and ast are subdirectories + - !re ast/ # present in both src and test + - !re \.cc$ # directories. Thus you will get + - !re \.hh$ # something like: + # - NEWS + # - src/parse/a.hh + # - src/parse/b.hh + # - src/parse/a.cc + # - src/parse/b.cc + # - src/ast/a.hh + # - src/ast/b.hh + # - src/ast/a.cc + # - src/ast/b.cc + # - test/parse/a.hh + # - test/parse/a.cc + # - test/ast/a.hh + # - test/ast/a.cc + - Affected commands: + - status + - diffw (a more human readable diff) + - mk_log_entry + - mk_changelog_entry + - mk_message_entry + - diffstat + - message + - mk_form + New in 0.3 2005-09-16: * The help command now show all commands including vcs ones. Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 253) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -36,6 +36,7 @@ :junk => [/^,/], :precious => [/^(\+|\.vcs)/], :color => :auto, + :sorting => [], :sign => true ) @@output_io_methods ||= %w[ print puts putc ] # FIXME and so ... @@ -576,6 +577,10 @@ end end + def regex_list + @@regex_list ||= RegexList.new(user_conf.sorting) + end + def merge_user_conf ( conf ) conf = YAML.load(conf.read) if conf.is_a? Pathname conf.each do |k, v| Index: vcs/lib/vcs/svn.rb --- vcs/lib/vcs/svn.rb (revision 253) +++ vcs/lib/vcs/svn.rb (working copy) @@ -54,7 +54,7 @@ --quiet (-q) --recursive (-R) --relocate FROM TO [PATH...] - --revision (-r) REV {Integer} + --revision (-r) REV --revprop --show-updates (-u) --stop-on-copy Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 253) +++ vcs/lib/vcs/status.rb (working copy) @@ -8,7 +8,7 @@ class Svn class StatusEntry - attr_accessor :line, :file_st, :prop_st, :cpy, :file, :category + attr_accessor :line, :file_st, :prop_st, :cpy, :file, :category, :comment def initialize ( high_line, aString ) @high_line = high_line @@ -29,6 +29,10 @@ @line[0] = @high_line.color(@file_st.chr, *@@style[@file_st]) end + def to_s + @file.to_s + end + @@category_symbol ||= { :precious => ?+, @@ -44,6 +48,7 @@ ?, => [:YELLOW], ?+ => [:YELLOW], ?G => [:BLUE], + ?X => [:BLUE], ?D => [:MAGENTA], ?R => [:MAGENTA], ?~ => [:RED], @@ -55,12 +60,15 @@ def status ( *args, &block ) return status_(*args) if block.nil? + result = PathList.new status_(*args).each_line do |line| next unless line =~ /^.{5} / status_entry = StatusEntry.new(@h, line) next if status_entry.category == :exclude - block[status_entry] + result << status_entry end + result.sort_with_regex_list! Vcs.regex_list + result.each(&block) end def color_status! ( *args ) Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 253) +++ vcs/lib/vcs/diff.rb (working copy) @@ -23,15 +23,16 @@ # A diff only for your eyes def diffw! ( files_orig=[], options={} ) - files = Set.new + files = [] status(files_orig) do |se| next if se.file_st.chr =~ /[?X\\,+D]/ next if se.file.to_s == 'ChangeLog' next if se.file.directory? - files << se.file + files << se.file unless files.include? se.file end return if files.empty? and not files_orig.empty? - diff_! files.to_a, options.merge(:diff_cmd => 'diff', :extensions => '-NPbuw') + diff_! files, + options.merge(:diff_cmd => 'diff', :extensions => '-NPbuw') end end # class Svn Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 253) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -27,7 +27,8 @@ next if se.file.to_s == 'ChangeLog' ls = [@@file_st[se.file_st], @@prop_st[se.prop_st]].compact! ls.first.capitalize! unless ls.empty? - result << [se.file, ls.join(', ')] + se.comment = ls.join(', ') + result << se end raise Failure, 'No changes, so no ChangeLog entry.' if result.empty? result @@ -38,8 +39,8 @@ # Same switches as status def mk_log_entry! ( *args ) with_cache! LogEntry, 'Log entry' do - mk_log_entry_contents(*args).each do |file, comments| - puts "- #{file}: #{comments}." + mk_log_entry_contents(*args).each do |se| + puts "- #{se.file}: #{se.comment}." end end end

18 years, 7 months

[LrdeTools] 253: Make default_commit happened just one time.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Make default_commit happened just one time. * vcs/lib/vcs/vcs.rb: Use just_one_time. vcs.rb | 3 +++ 1 files changed, 3 insertions(+) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 252) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -592,10 +592,13 @@ end # Set the given method as default commit action, use commit_ for the old one + # This method can be called just one time to avoid conflicts def default_commit ( meth ) + just_one_time do alias_command :commit, meth alias_command :ci, meth end + end end # class << self

18 years, 7 months

[LrdeTools] 252: Forbid commits with unrecognized files.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Forbid commits with unrecognized files. * vcs/lib/vcs/common_commit.rb: Add an explicative message. common_commit.rb | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+) Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 251) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -15,6 +15,39 @@ update! + have_unrecognized_files = false + status(files) do |se| + if se.category == :unrecognize + have_unrecognized_files = true + se.colorize! if color? + puts se.line + end + end + if have_unrecognized_files + raise Failure, " + |You have unrecognized files in your working copy ! + |This meant that these files won't be commited ! + |You have some solutions to get rid of this limitation: + |- You must put these files in some categories. + | For instance you can rename these files and put a `+' before + | to make it `precious': + | put `,' for `junk' + | put `\\' for `unmask' + | put `-' for `exclude' + |- You can also edit your configuration file (.vcs) to customize + | these categories. For example add this: + | ------------ .vcs ------------ + | precious: + | - !re my_precious_file[0-9]* + | - !re .*\.patch + | ------------ .vcs ------------ + |- You can also perform a partial commit and specify which files + | and directories commit. For example this command: + | #{@command} commit foo.c bar/ + | + |Commit failed".head_cut! + end + Vcs.commited = edit_form!(files) message(files)

18 years, 7 months

[LrdeTools] 251: Vcs::Logger: Better handling of multiline messages.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Vcs::Logger: Better handling of multiline messages. * vcs/lib/vcs/app.rb: Make the backtrace appear as error but just when debug is on. * vcs/lib/vcs/vcs.rb (Logger): Put the same header before each line of the message. Cache the coloring to speed up the logger. app.rb | 4 ++-- vcs.rb | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 250) +++ vcs/lib/vcs/app.rb (working copy) @@ -112,10 +112,10 @@ raise ex rescue Exception => ex vcs.call_handlers unless vcs.nil? - logger.debug { raise ex } err = ex.to_s.sub(/\.$/, '') + logger.debug { err = ex.long_pp ; "Backtrace enabled:" } err = ex.inspect if err.empty? - logger.error err + logger.error { err } end end Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 250) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -62,12 +62,21 @@ @color = false end + def header ( progname, severity ) + @@headers[[progname, severity]] ||= [ + '[', 'vcs', ']', ' ', progname, severity, ':', ' ' + ].compact.map { |x| stylize x }.join + end + def format_message(severity, timestamp, msg, progname) progname += ': ' unless progname.nil? or progname.empty? - "#{stylize('[')}#{stylize('vcs')}#{stylize(']')} " + - "#{progname}#{stylize(severity)}#{stylize(':')} #{msg}\n" + msg.inject([]) do |accu, line| + accu << header(progname, severity) << line.chomp << "\n" + end.join end + @@headers ||= {} + @@style = { :vcs => [:cyan],

18 years, 7 months

[LrdeTools] 250: Objectify status entries.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Objectify status entries. * vcs/lib/vcs/status.rb: Add StatusEntry and adapt. * vcs/lib/vcs/changelog.rb, vcs/lib/vcs/diff.rb: Adapt to StatusEntry. changelog.rb | 10 +++---- diff.rb | 10 +++---- status.rb | 83 ++++++++++++++++++++++++++++++++++------------------------- 3 files changed, 59 insertions(+), 44 deletions(-) Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 249) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -22,12 +22,12 @@ def mk_log_entry_contents ( *args ) return @@entries[args] if @@entries.has_key? args @@entries[args] = result = [] - from_status(*args) do |line, file_st, prop_st, copy_st, file| - next if file_st.chr =~ /[?X\\,+]/ - next if file.to_s == 'ChangeLog' - ls = [@@file_st[file_st], @@prop_st[prop_st]].compact! + status(*args) do |se| + next if se.file_st.chr =~ /[?X\\,+]/ + next if se.file.to_s == 'ChangeLog' + ls = [@@file_st[se.file_st], @@prop_st[se.prop_st]].compact! ls.first.capitalize! unless ls.empty? - result << [file, ls.join(', ')] + result << [se.file, ls.join(', ')] end raise Failure, 'No changes, so no ChangeLog entry.' if result.empty? result Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 249) +++ vcs/lib/vcs/diff.rb (working copy) @@ -24,11 +24,11 @@ # A diff only for your eyes def diffw! ( files_orig=[], options={} ) files = Set.new - from_status(files_orig) do |line, file_st, prop_st, cpy, file| - next if file_st.chr =~ /[?X\\,+D]/ - next if file.to_s == 'ChangeLog' - next if file.directory? - files << file + status(files_orig) do |se| + next if se.file_st.chr =~ /[?X\\,+D]/ + next if se.file.to_s == 'ChangeLog' + next if se.file.directory? + files << se.file end return if files.empty? and not files_orig.empty? diff_! files.to_a, options.merge(:diff_cmd => 'diff', :extensions => '-NPbuw') Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 249) +++ vcs/lib/vcs/status.rb (working copy) @@ -7,47 +7,34 @@ class Svn - @@category_symbol = - { - :precious => ?+, - :unmask => ?\\, - :junk => ?, - } + class StatusEntry + attr_accessor :line, :file_st, :prop_st, :cpy, :file, :category - def from_status ( *args, &block ) - status_(*args).each_line do |line| - next unless line =~ /^.{5} / - m = /^(.)(.)(.)(.)(.\s*)(.*)$/.match(line) + def initialize ( high_line, aString ) + @high_line = high_line + m = /^(.)(.)(.)(.)(.\s*)(.*)$/.match(aString) line, file_st, bl1, prop_st, cpy, bl2, file = m.to_a - file = file.to_path - file_st, prop_st, cpy = file_st[0], prop_st[0], cpy[0] - if file_st == ?? - category = Vcs.classify(file) - next if category == :exclude - file_st = @@category_symbol[category] || file_st - end - line = "#{file_st.chr}#{bl1}#{prop_st.chr}#{cpy.chr}#{bl2}#{file}" - block[line, file_st, prop_st, cpy, file] + @file = file.to_path + @file_st, @prop_st, @cpy = file_st[0], prop_st[0], cpy[0] + if @file_st == ?? + @category = Vcs.classify(@file) + @file_st = @@category_symbol[@category] || @file_st + else + @category = :normal end + @line = "#{(a)file_st.chr}#{bl1}#{prop_st}#{cpy}#{bl2}#{file}" end - protected :from_status - def color_status! ( *args ) - from_status(*args) do |line, file_st, prop_st, cpy, file| - line[0] = @h.color(file_st.chr, *@@style[file_st]) - puts line - end + def colorize! + @line[0] = @high_line.color(@file_st.chr, *@@style[@file_st]) end - def status! ( *args ) - if color? - color_status!(*args) - else - from_status(*args) do |line, file_st, prop_st, cpy, file| - puts line - end - end - end + @@category_symbol ||= + { + :precious => ?+, + :unmask => ?\\, + :junk => ?, + } @@style ||= { @@ -64,5 +51,33 @@ ?? => [:BLINK, :RED], ?C => [:BLINK, :RED], } + end # class StatusEntry + + def status ( *args, &block ) + return status_(*args) if block.nil? + status_(*args).each_line do |line| + next unless line =~ /^.{5} / + status_entry = StatusEntry.new(@h, line) + next if status_entry.category == :exclude + block[status_entry] + end + end + + def color_status! ( *args ) + status(*args) do |status_entry| + status_entry.colorize! + puts status_entry.line + end + end + + def status! ( *args ) + if color? + color_status!(*args) + else + status(*args) do |status_entry| + puts status_entry.line + end + end + end end # class Svn

18 years, 7 months

[LrdeTools][Vcs] 249: Fill X-Mailer in mails.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fill X-Mailer in mails. * vcs/lib/vcs/mail.rb: Update DEFAULT_OPTIONS. mail.rb | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 248) +++ vcs/lib/vcs/mail.rb (working copy) @@ -10,7 +10,8 @@ MAIL = Sendmail::MAIL_FILE MAILER = Sendmail.new - DEFAULT_OPTIONS = { :confirm => true, :mime => true } + DEFAULT_OPTIONS = { :confirm => true, :mime => true, + :header => "X-Mailer: Vcs.mail (#{Vcs.version})" } # # Mail.

18 years, 7 months

[LrdeTools] 248: Add the junk command.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Add the junk command. * vcs/lib/vcs/junk.rb: New. * vcs/NEWS: Add an entry for junk. NEWS | 2 ++ lib/vcs/junk.rb | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) Index: vcs/lib/vcs/junk.rb --- vcs/lib/vcs/junk.rb (revision 0) +++ vcs/lib/vcs/junk.rb (revision 0) @@ -0,0 +1,26 @@ +# Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved. +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# License:: Gnu General Public License. +# Revision:: $Id$ + + +class Vcs + + # This command removes all junk files (by default all files begining with `,'). + # Warning: this command removes some files that may contains some relevant + # information. For example during a commit the information that you type is + # stored in one of these `,files'. So be careful using this command. + # See the user configuration to customize what is considered as a junk file. + def junk! ( files=[], options={} ) + list!(files, options.merge(:junk => true)) do |path_list| + path_list.each { |path| logger.info { "Remove #{path}" } } + if @h.agree('Are you sure? (y/n)', true) + path_list.each do |path| + logger.info { "Removing #{path}..." } + path.rm_f + end + end + end + end + +end # class Vcs Property changes on: vcs/lib/vcs/junk.rb ___________________________________________________________________ Name: svn:keywords + Id Index: vcs/NEWS --- vcs/NEWS (revision 247) +++ vcs/NEWS (working copy) @@ -57,6 +57,8 @@ - svn list --junk --do rm - svn list --precious --do wc + - svn junk: This command use `list' to remove all junk files. + New in 0.3 2005-09-16: * The help command now show all commands including vcs ones.

18 years, 7 months

[LrdeTools] 247: Improve svn list.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Improve svn list. * vcs/lib/vcs/list.rb: New. * vcs/NEWS: Explain this feature. NEWS | 11 +++++++++++ lib/vcs/list.rb | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) Index: vcs/NEWS --- vcs/NEWS (revision 246) +++ vcs/NEWS (working copy) @@ -46,6 +46,17 @@ For this just add this "sign: false" to .vcs configuration file. However it's better to keep this option set. + * Commands: + - svn list: + - Now support category listing: + - list all junk files in foo: + svn list --junk foo + - list all precious, and unmasked files: + svn list --precious --unmask + - Action support (--do switch): + - svn list --junk --do rm + - svn list --precious --do wc + New in 0.3 2005-09-16: * The help command now show all commands including vcs ones. Index: vcs/lib/vcs/list.rb --- vcs/lib/vcs/list.rb (revision 0) +++ vcs/lib/vcs/list.rb (revision 0) @@ -0,0 +1,55 @@ +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# Copyright:: Copyright (c) 2005 LRDE. All rights reserved. +# License:: Gnu General Public License. +# Revision:: $Id$ + +require 'vcs/svn' + +class Svn + + specific_options << '--do ACTION' + Vcs.categories.each do |name| + specific_options << "--#{name}" + end + + def list! ( files=[], options={}, &block ) + if options.has_key?(:do) or block \ + or Vcs.categories.any? { |cat| options.has_key?(cat) } + + action = options[:do] + options.delete(:do) + categories = [] + Vcs.categories.each do |cat| + if options.has_key? cat + categories << cat + options.delete(cat) + end + end + path_list = PathList.new + if categories.empty? + list_(files, options).output.read.each do |line| + path_list << line.chomp.to_path + end + else + files << '.' if files.empty? + files.each do |file| + file.to_path.find do |path| + Find.prune if path.to_s =~ /(\/|^)\.svn$/ + next if path.to_s == '.' + path_list << path if categories.include? Vcs.classify(path) + end + end + end + if action + system "#{action} #{path_list}" + elsif block + block[path_list] + else + puts path_list + end + else + list_!(files, options) + end + end + +end # class Svn Property changes on: vcs/lib/vcs/list.rb ___________________________________________________________________ Name: svn:keywords + Id

18 years, 7 months

[LrdeTools] 246: Make some generalizations with file categories.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Make some generalizations with file categories. * vcs/lib/vcs/vcs.rb: Add Vcs.categories and simplify classify. Some fixes for options. * vcs/lib/vcs/svn.rb: Little fix to make the option_controller make only once. svn.rb | 6 +++++- vcs.rb | 15 ++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) Index: vcs/lib/vcs/svn.rb --- vcs/lib/vcs/svn.rb (revision 245) +++ vcs/lib/vcs/svn.rb (working copy) @@ -10,6 +10,10 @@ def initialize ( aCmd='svn' ) super + @@svn_option_controller ||= + OptionController.new(Svn, @@options_specification + + Vcs.specific_options.join("\n")) + self.option_controller = @@svn_option_controller end %w[ blame cat cleanup copy export import list log merge mkdir move propedit @@ -17,7 +21,7 @@ add_basic_method(m) end - self.option_controller = OptionController.new Svn, " + @@options_specification ||= " --auto-props --config-dir DIR --diff-cmd CMD Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 245) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -39,12 +39,16 @@ :sign => true ) @@output_io_methods ||= %w[ print puts putc ] # FIXME and so ... + @@specific_options ||= [] + @@categories ||= [:precious, :unmask, :exclude, :junk, :unrecognize, :normal] cattr_accessor :version cattr_accessor :default cattr_accessor :user_conf cattr_accessor :output_io_methods cattr_accessor :logger + cattr_accessor :specific_options + cattr_accessor :categories class_inheritable_accessor :option_controller @@ -109,7 +113,6 @@ begin @output.read rescue IOError => ex - Vcs.logger.debug { ex.long_pp } super end end @@ -147,6 +150,7 @@ (?:\sor\s(-(?:\?|\w)))? # Another one (-f or -o) \) )? + \s* (.*?) # An argument (--foo NUM) \s* (?:\{(.*)\})? # A type (--foo NUM {Integer}) @@ -165,7 +169,8 @@ end def to_a_for_option_parser - @shortcuts + ["--#@name#@argument", @type].compact + argument = (@argument.nil? || @argument.empty?)? '' : ' ' + @argument + @shortcuts + ["--#@name#{argument}", @type].compact end def to_sym @@ -370,7 +375,7 @@ meth.sub!(/([^!])$/, '\1!') if meth != 'script' end logger.debug { "meth: #{meth}, files: #{files.inspect}, options: #{options.inspect}" } - result = send(meth, files, options) + send(meth, files, options) end %w[ checkout delete diff status log add update commit ].each do |m| @@ -388,7 +393,7 @@ end else with_bang = meth + '!' - return run_missing!(meth, *args) unless respond_to? with_bang + return run_missing!(meth, meth, *args) unless respond_to? with_bang copy = sub_vcs_with_name(meth) copy.send(with_bang, *args) out = copy.cmd_data @@ -547,7 +552,7 @@ end def classify ( file ) - [:precious, :unmask, :exclude, :junk].each do |category| + Vcs.categories.each do |category| return category if Vcs.user_conf_match(category, file) end return :unrecognize

18 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects September 2005