vcs 0.3.0 → 0.4.0

data/lib/vcs/revision.rb

@@ -10,7 +10,7 @@ require 'vcs/svn'
 class Svn
 
   def revision! ( *args )
-    puts info.read[/^Revision:\s+(\d+)/, 1]
+    puts info(*args).read[/^Revision:\s+(\d+)/, 1]
   end
 
   alias_command :rev, :revision

data/lib/vcs/script.rb

@@ -1,19 +1,25 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 LRDE. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: script.rb 221 2005-07-07 14:41:23Z pouill_n $
+# Revision::  $Id: script.rb 261 2005-10-03 00:45:53Z pouill_n $
 
 require 'vcs/vcs'
 
 class Vcs
 
-  def script! ( code, *args )
+  def script ( files=[], options={} )
+    puts script!(files, options)
+  end
+
+  def script! ( files=[], options={} )
     begin
-      eval(code)
+      eval(files.join(' '))
+    rescue SystemExit => ex
+      raise ex
     rescue Exception => ex
-      LOG.error { 'Vcs#script: during the client execution' }
-      LOG.error { ex.long_pp }
+      logger.error { 'Vcs#script: during the client execution' }
+      logger.error { ex.long_pp }
     end
   end
 
-end # class Svn
+end # class Vcs

data/lib/vcs/status.rb

@@ -3,15 +3,87 @@
 # License::   GNU General Public License (GPL).
 # Revision::  $Id$
 
+require 'vcs/svn'
+
 class Svn
 
-  def from_status ( *args, &block )
-    status(*args).each_line do |line|
+  class StatusEntry
+    attr_accessor :line, :file_st, :prop_st, :cpy, :file, :category, :comment
+
+    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]
+      @category = Vcs.classify(@file, @file_st)
+      if @file_st == ??
+        @file_st = @@category_symbol[@category] || @file_st
+      end
+      @line = "#{@file_st.chr}#{bl1}#{prop_st}#{cpy}#{bl2}#{file}"
+    end
+
+    def colorize!
+      @line[0] = @high_line.color(@file_st.chr, *@@style[@file_st])
+    end
+
+    def to_s
+      @file.to_s
+    end
+
+    @@category_symbol ||=
+    {
+      :precious => ?+,
+      :unmask   => ?\\,
+      :junk     => ?,
+    }
+
+    @@style ||=
+      {
+        ?A  => [:GREEN],
+        ?M  => [:GREEN],
+        ?\\ => [:YELLOW],
+        ?,  => [:YELLOW],
+        ?+  => [:YELLOW],
+        ?G  => [:BLUE],
+        ?X  => [:BLUE],
+        ?D  => [:MAGENTA],
+        ?R  => [:MAGENTA],
+        ?~  => [:RED],
+        ?!  => [:RED],
+        ??  => [:BLINK, :RED],
+        ?C  => [:BLINK, :RED],
+      }
+  end # class StatusEntry
+
+  def status ( *args, &block )
+    return status_(*args) if block.nil?
+    result = PathList.new
+    status_(*args).each_line do |line|
       next unless line =~ /^.{5} /
-      m = /^(.)(.).(.).\s*(.*)$/.match(line)
-      block[*m.to_a]
+      status_entry = StatusEntry.new(@h, line)
+      next if status_entry.category == :exclude
+      result << status_entry
+    end
+    result.sort_with_regex_list! Vcs.regex_list
+    result.each(&block)
+  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
-  protected :from_status
 
 end # class Svn

data/lib/vcs/svn.rb

@@ -1,16 +1,7 @@
-# Author:: Nicolas Pouillard  <ertai@lrde.epita.fr>.
-# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
-# License:: GNU General Public License (GPL).
-
-# $LastChangedBy: ertai $
-# $Id: header 98 2004-09-29 12:07:43Z ertai $
-
-require 'vcs/vcs'
-
-CL = Pathname.new('ChangeLog')
-ADD_CL = Pathname.new(',ChangeLog')
-TMP_CL = Pathname.new(',,ChangeLog')
-META = Pathname.new(',meta')
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: header 98 2004-09-29 12:07:43Z ertai $
 
 class Svn < Vcs
 
@@ -19,6 +10,10 @@ class Svn < Vcs
 
   def initialize ( aCmd='svn' )
     super
+    @@svn_option_controller ||=
+      OptionController.new(Svn, @@options_specification +
+                                Vcs.specific_options.to_a.join("\n"))
+    self.option_controller = @@svn_option_controller
   end
 
   %w[ blame cat cleanup copy export import list log merge mkdir move propedit
@@ -26,4 +21,49 @@ class Svn < Vcs
     add_basic_method(m)
   end
 
+  @@options_specification ||= "
+    --auto-props
+    --config-dir DIR
+    --diff-cmd CMD
+    --diff3-cmd CMD
+    --dry-run
+    --editor-cmd CMD
+    --encoding ENC
+    --extensions (-x) ARGS
+    --file (-F) FILENAME
+    --force
+    --force-log
+    --help (-h or -?)
+    --ignore-ancestry
+    --ignore-externals
+    --incremental
+    --limit NUM {Integer}
+    --message (-m) MESSAGE
+    --new ARG
+    --no-auth-cache
+    --no-auto-props
+    --no-diff-added
+    --no-diff-deleted
+    --no-ignore
+    --no-unlock
+    --non-interactive
+    --non-recursive (-N)
+    --notice-ancestry
+    --old ARG
+    --password PASS
+    --quiet (-q)
+    --recursive (-R)
+    --relocate FROM TO [PATH...]
+    --revision (-r) REV
+    --revprop
+    --show-updates (-u)
+    --stop-on-copy
+    --strict
+    --targets FILENAME
+    --username NAME
+    --verbose (-v)
+    --version
+    --xml
+  "
+
 end # class Svn

data/lib/vcs/url.rb

@@ -1,16 +1,12 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: url.rb 221 2005-07-07 14:41:23Z pouill_n $
+# Revision::  $Id: url.rb 236 2005-09-26 13:08:22Z pouill_n $
 
-require 'vcs/svn'
-
-class Svn
+class Vcs
 
   def url! ( *args )
-    puts info.read[/^URL:\s+(.*)$/, 1]
+    puts info(*args).read[/^URL:\s+(.*)$/, 1]
   end
 
-  alias_command :date, :last_changed_date
-
-end # class Svn
+end # class Vcs

data/lib/vcs/vcs.rb

@@ -1,22 +1,42 @@
-# Author:: Nicolas Pouillard  <ertai@lrde.epita.fr>.
-# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
-# License:: GNU General Public License (GPL).
-
-# $LastChangedBy: ertai $
-# $Id: header 98 2004-09-29 12:07:43Z ertai $
-
-require 'rubygems'
-require_gem 'ruby_ex'
-require 'ruby_ex'
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: header 98 2004-09-29 12:07:43Z ertai $
+
+require 'pathname'
+lib = Pathname.new(__FILE__).dirname.parent
+vendor = lib.parent + 'vendor'
+unless defined? RubyEx
+  $CORE_EX_VENDORS ||= []
+  $CORE_EX_VENDORS << vendor
+  file = vendor + 'ruby_ex' + 'lib' + 'ruby_ex.rb'
+  if file.exist?
+    require file.to_s
+  else
+    require 'rubygems'
+    require_gem 'ruby_ex'
+    require 'ruby_ex'
+  end
+end
+lib.load_path!
+RubyEx.import!
 Commands.import!
 Yaml::ChopHeader.import!
 
+require 'logger'
+require 'optparse'
+require 'etc'
+require 'ostruct'
+ENV['LC_ALL'] = 'C'
+
+unless defined? Vcs
+
 # The abstract class for a Vcs wrapper.
 # Conventions:
 #   example:
 #     svn checkout http://foo.bar/proj            # alias
 #     vcs-svn checkout http://foo.bar/proj        # wrapper
-#     vcs --vcs Svn checkout http://foo.bar/proj  # manual
+#     vcs --vcs svn checkout http://foo.bar/proj  # manual
 # 
 # checkout
 # checkout_
@@ -24,6 +44,112 @@ Yaml::ChopHeader.import!
 # checkout_!
 # 
 class Vcs
+  @@version ||= '0.4.0'
+  @@user_conf ||= OpenStruct.new(
+    :exclude     => [/^-/],
+    :unmask      => [/^\\/],
+    :junk        => [/^,/],
+    :precious    => [/^(\+|\.vcs)/],
+    :color       => :auto,
+    :sorting     => [],
+    :sign        => true
+  )
+  @@output_io_methods ||= %w[ print puts putc ] # FIXME and so ...
+  @@specific_options ||= Set.new
+
+  @@user_defined_categories ||= [:precious, :unmask, :exclude, :junk]
+  @@symbol_category ||=
+  {
+    ?A => :add,
+    ?C => :conflict,
+    ?D => :delete,
+    ?G => :merge,
+    ?I => :ignore,
+    ?M => :modify,
+    ?R => :replace,
+    ?X => :external,
+    ?? => :unrecognize,
+    ?! => :missing,
+    ?~ => :obstruct,
+  }
+  @@categories ||= @@user_defined_categories + @@symbol_category.values
+
+
+  cattr_accessor :version
+  cattr_accessor :default
+  cattr_accessor :user_conf
+  cattr_accessor :output_io_methods
+  cattr_accessor :logger
+  cattr_accessor :specific_options
+  cattr_accessor :user_defined_categories
+  cattr_accessor :symbol_category
+  cattr_accessor :categories
+  class_inheritable_accessor :option_controller
+
+
+  class Logger < ::Logger
+
+    attr_accessor :color
+
+    def initialize ( *a, &b )
+      super
+      @high_line = HighLine.new
+      @color = false
+    end
+
+    def header ( progname, severity )
+      @@headers[[progname, severity]] ||= [
+        '[', 'vcs', ']', ' ', progname, severity, ':', ' '
+      ].compact.map { |x| stylize x }.join
+    end
+
+    def mk_message ( severity, progname, msg )
+      progname += ': ' unless progname.nil? or progname.empty?
+      msg.inject([]) do |accu, line|
+        accu << header(progname, severity) << line.chomp << "\n"
+      end.join
+    end
+
+    if ::Logger.const_defined? :VERSION and ::Logger::VERSION >= '1.2.6'
+      def format_message(severity, timestamp, progname, msg)
+        mk_message(severity, progname, msg)
+      end
+    else
+      def format_message(severity, timestamp, msg, progname)
+        mk_message(severity, progname, msg)
+      end
+    end
+
+    @@headers ||= {}
+
+    @@style =
+    {
+      :vcs   => [:cyan],
+      :debug => [:magenta],
+      :info  => [:green],
+      :warn  => [:yellow],
+      :error => [:red],
+      :fatal => [:red, :blink],
+      :'['   => [:blue],
+      :']'   => [:blue],
+      :':'   => [:red],
+    }
+
+    def stylize ( aString )
+      aString = aString.downcase
+      if @color
+        @high_line.color(aString, *@@style[aString.to_sym])
+      else
+        aString
+      end
+    end
+
+  end # class Logger
+
+  self.logger = Logger.new(STDERR)
+  ENV['VCS_SEVERITY'] ||= 'info'
+  logger.level = Logger.const_get(ENV['VCS_SEVERITY'].upcase)
+  logger.color = STDERR.tty?
 
   class Failure < Exception
   end
@@ -32,61 +158,165 @@ class Vcs
 
     attr_reader :out_io
 
-    def puts ( *a, &b )
-      @out_io.puts(*a, &b)
-    end
-
     def output= ( anObject )
       super
       @out_io = @output.to_io_for_commands
     end
 
+    def to_s
+      begin
+        @output.read
+      rescue IOError => ex
+        super
+      end
+    end
+
   end # class VcsCmdData
-  
-  class VcsCmdDataFactory < Commands::Datas::Factory
 
-    alias :real_new_command_data :new_command_data
+  class VcsCmdDataFactory < Commands::Datas::Factory
 
     def initialize ( values )
       super
       @command_data_class = VcsCmdData
-      @__instance = real_new_command_data
     end
 
     def new_command_data
+      @__instance ||= super
       @__instance.status = nil
       @__instance
     end
 
   end # class VcsCmdDataFactory
-  
+
+
+
+  class Switch
+    cattr_reader :shortcuts
+    attr_reader :name, :shortcuts, :argument
+
+    @@re ||=
+      /^
+        \s*
+        --([\w-]+)                              # The option (--foo)
+        \s*
+        (?: \(
+                (-\w)                           # A shortcut (-f)
+                (?:\sor\s(-(?:\?|\w)))?         # Another one (-f or -o)
+            \)
+        )?
+        \s*
+        (.*?)                                   # An argument (--foo NUM)
+        \s*
+        (?:\{(.*)\})?                           # A type (--foo NUM {Integer})
+      $/x
+
+    def initialize ( aString )
+      match = @@re.match(aString)
+      raise "Cannot parse switch: `#{aString}'" if match.nil?
+      @name, @argument, @type = match[1], match[4], match[5]
+      @type = eval(@type) unless @type.nil?
+      @shortcuts = match[2..3].compact
+    end
+
+    def to_s
+      '--' + @name
+    end
+
+    def to_a_for_option_parser
+      argument = (@argument.nil? || @argument.empty?)? '' : ' ' + @argument
+      @shortcuts + ["--#@name#{argument}", @type].compact
+    end
+
+    def to_sym
+      @name.gsub('-', '_').to_sym
+    end
+
+  end # class Switch
+
+
+
+  class OptionController
+
+    attr_reader :switches, :shortcuts, :vcs_name, :option_parser, :options
+    protected :options
+
+    def initialize ( aVcsClass, aString )
+      Vcs.logger.debug { "Creating an option_controller for #{aVcsClass}..." }
+      @switches = []
+      @shortcuts = {}
+      aString.each_line do |line|
+        next if line.blank?
+        switch = Switch.new(line)
+        @switches << switch
+        switch.shortcuts.each do |shortcut|
+          @shortcuts[shortcut] = switch.name
+        end
+      end
+      @option_parser = OptionParser.new do |o|
+        o.banner = "Type '#{$0} help' for usage."
+        o.separator ''
+        @switches.each do |switch|
+          o.on(*switch.to_a_for_option_parser) do |a, *b|
+            raise unless b.empty?
+            options[switch.to_sym] = a
+          end
+        end
+      end
+      Vcs.logger.debug { @option_parser.to_s }
+    end
+
+    def parse ( argv )
+      @options = {}
+      [@options, @option_parser.parse(argv)]
+    end
+
+    def short_to_long ( short_option )
+      @shortcuts[short_option]
+    end
+
+    def to_strings ( options )
+      result = []
+      options.each do |k, v|
+        raise if v == false
+        result << '--' + k.to_s.gsub('_', '-')
+        result << v.to_s if v != true
+      end
+      result
+    end
+
+  end # class OptionController
+
+
   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)
 
     @runner.subscribe_hook(:failure) do |data|
       if data.output == STDOUT
-        LOG.debug { raise data.to_yaml }
+        logger.debug { raise data.to_yaml }
         exit((data.status)? data.status.exitstatus : 1)
       else
         raise data.to_yaml
       end
     end
     @runner.subscribe_hook(:display_command) do |cmd|
-      LOG.debug { "running: #{cmd.to_sh}" }
+      logger.debug { "running: #{cmd.to_sh}" }
+    end
+    @runner.subscribe_hook(:before_exec) do
+      STDOUT.flush
+      STDERR.flush
     end
   end
 
   def self.add_basic_method ( meth )
     class_eval <<-end_eval
       def #{meth}! ( *args )
-	run!("#{meth}", *args)
+        run!("#{meth}", *args)
       end
       def #{meth}_! ( *args )
-	run!("#{meth}", *args)
+        run!("#{meth}", *args)
       end
     end_eval
   end
@@ -103,14 +333,18 @@ class Vcs
       def #{m1} ( *args )
         #{m2}(*args)
       end
-      def #{m1}_ ( *args )
-        #{m2}_(*args)
+      unless method_defined? :#{m1}
+        def #{m1}_ ( *args )
+          #{m2}_(*args)
+        end
       end
       def #{m1}! ( *args )
         #{m2}!(*args)
       end
-      def #{m1}_! ( *args )
-        #{m2}_!(*args)
+      unless method_defined? :#{m1}!
+        def #{m1}_! ( *args )
+          #{m2}_!(*args)
+        end
       end
     end_eval
   end
@@ -126,29 +360,52 @@ class Vcs
 
   attr_reader :cmd_data
 
+  def self.delegate_to_cmd_data ( *syms )
+    syms.flatten.each do |meth|
+      define_method(meth) do |*a|
+        raise if block_given?
+        @cmd_data.out_io.send(meth, *a)
+      end
+    end
+  end
+
+  delegate_to_cmd_data Vcs.output_io_methods
+
   @@checkers = Set.new
+  OrderedHash.import!
+  @@handlers = OHash.new
 
-  def run! ( *args )
-    (@cmd + args).run(@runner)
+  def run! ( command, files=[], options={} )
+    flush
+    cmd_options = option_controller.to_strings(options)
+    (@cmd + command + cmd_options + '--' + files).run(@runner)
   end
 
-  def sub_vcs ( out, err )
+  def sub_vcs ( out, err, &block )
     copy = self.class.new(@cmd)
     copy.cmd_data_factory = VcsCmdDataFactory.new(:output => out, :error => err)
-    copy
+    if block.nil?
+      copy
+    else
+      copy.instance_eval(&block)
+    end
   end
 
-  def sub_vcs_with_name ( name )
-    sub_vcs(TempPath.new("#{name}-out"), TempPath.new("#{name}-err"))
+  def sub_vcs_with_name ( name, &block )
+    sub_vcs(TempPath.new("#{name}-out"), TempPath.new("#{name}-err"), &block)
   end
 
-  def with ( io )
+  def with ( io, &block )
     io.flush if io.respond_to? :flush
-    sub_vcs(io, io)
+    sub_vcs(io, io, &block)
+  end
+
+  def output
+    @cmd_data.out_io
   end
 
-  def puts ( *a, &b )
-    @cmd_data.puts(*a, &b)
+  def flush
+    output.flush
   end
 
   def run ( *args )
@@ -156,16 +413,29 @@ class Vcs
   end
 
   def run_missing! ( name, orig, *args )
-    return help!(*args) if name == '--help'
     if name =~ /^(.*)_$/
       run!($1, *args)
     else
-      LOG.warn { "unknown method #{orig}" }
+      logger.warn { "unknown method #{orig}" }
       run!(name, *args)
     end
   end
+  protected :run_missing!
 
-  %w[ checkout help delete diff status log add update commit ].each do |m|
+  def run_argv ( argv )
+    options, files = option_controller.parse(argv)
+    if files.empty?
+      options.delete(:help)
+      meth = :help!
+    else
+      meth = files.shift.dup
+      meth.sub!(/([^!])$/, '\1!') if meth != 'script'
+    end
+    logger.debug { "meth: #{meth}, files: #{files.inspect}, options: #{options.inspect}" }
+    send(meth, files, options)
+  end
+
+  %w[ checkout delete diff status log add update commit ].each do |m|
     add_basic_method(m)
   end
 
@@ -173,22 +443,58 @@ class Vcs
     meth = meth.to_s
     if meth =~ /^(.*)!$/
       no_bang = $1
-      super if respond_to? no_bang
-      run_missing!(no_bang, meth, *args)
+      if respond_to? no_bang
+        puts send(no_bang, *args)
+      else
+        run_missing!(no_bang, meth, *args)
+      end
     else
       with_bang = meth + '!'
       return run_missing!(meth, meth, *args) unless respond_to? with_bang
       copy = sub_vcs_with_name(meth)
-      res = copy.send(with_bang, *args)
-      return res unless res.nil?
+      copy.send(with_bang, *args)
       out = copy.cmd_data
-      out.out_io.flush
+      out.out_io.close
       out
     end
   end
 
-  def help! ( *args )
-    return help_!(*args) unless args.empty?
+  @@cache ||= {}
+
+  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
+    unless path.nil?
+      if description.nil?
+        raise ArgumentError, "need a description for #{path}"
+      end
+      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) }
+    rescue Exception => ex
+      logger.error "Removing `#{path}' ..."
+      path.unlink
+      raise ex
+    end
+    path.read
+  end
+  protected :with_cache
+
+  def with_cache! ( *a, &b )
+    puts with_cache(*a, &b)
+  end
+  protected :with_cache!
+
+  def help! ( files=[], options={} )
+    return help_!(files, options) unless files.empty? and options.empty?
     puts "usage: #{@cmd.command} <subcommand> [options] [args]
     |Type '#{@cmd.command} help <subcommand>' for help on a specific subcommand.
     |
@@ -198,7 +504,7 @@ class Vcs
     |
     |Available subcommands:".head_cut!
     cmds = []
-    methods.each do |meth|
+    public_methods.each do |meth|
       next if meth =~ /_!?$/
       next unless meth =~ /^(.+)!$/
       cmd = $1
@@ -217,6 +523,22 @@ class Vcs
     end
   end
 
+  def color?
+    Vcs.color? { output.tty? }
+  end
+
+  def color ( aString, *someStyles )
+    if color?
+      @h.color(aString, *someStyles)
+    else
+      aString
+    end
+  end
+
+  CL = Pathname.new('ChangeLog') unless defined? CL
+  TMP_CL = Pathname.new(',,ChangeLog') unless defined? TMP_CL
+
+
   alias_command :ann, :blame
   alias_command :annotate, :blame
   alias_command :praise, :blame
@@ -260,20 +582,83 @@ class Vcs
   alias_command :checkin, :commit
   alias_command :populate, :add
 
-  def error_handling ( meth )
-    @handlers << meth
+  def error_handling ( meth_or_path, &block )
+    @@handlers[meth_or_path] = (block.nil?)? method(meth_or_path) : block
   end
 
   def call_handlers
-    @handlers.each { |meth| send(meth) }
-  end
-
-  def self.add_conf_checker ( meth )
-    @@checkers << meth
+    @@handlers.each { |k, v| (v.arity.abs == 1)? v[k] : v[] }
   end
 
   def call_conf_checkers
-    @@checkers.each { |meth| send(meth) }
+    @@checkers.each { |x| (x.is_a? Proc)? x[] : send(x) }
   end
 
+  class << self
+
+    def add_conf_checker ( meth=nil, &block )
+      @@checkers << (block.nil?)? meth : block
+    end
+
+    def user_conf_match ( sym, file )
+      if user_conf.nil? or (regexps = user_conf.send(sym)).nil?
+        return false
+      end
+      regexps.each do |re|
+        return true if re.match(file) or re.match(file.basename)
+      end
+      return false
+    end
+
+    def classify ( file, status=nil )
+      if status and category = Vcs.symbol_category[status]
+        return category unless category == :unrecognize
+      end
+      Vcs.user_defined_categories.each do |category|
+        return category if Vcs.user_conf_match(category, file)
+      end
+      return :unrecognize
+    end
+
+    def color? ( &auto_block )
+      case color = Vcs.user_conf.color
+        when :never  then return false
+        when :auto   then return (auto_block.nil?)? false : auto_block[]
+        when :always then return true
+        else raise ArgumentError, "Bad value for `color' (#{color})"
+      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|
+        v = v.to_sym if v.is_a? String
+        user_conf.send("#{k}=", (v.is_a? Array)? ((user_conf.send(k) || []) + v) : v)
+      end
+    end
+
+    # Here we can handle version conflicts with vcs extensions
+    def protocol_version ( aVersion )
+      if aVersion != '0.1'
+        raise ArgumentError, "Bad protocol version #{aVersion} but 0.1 is needed"
+      end
+    end
+
+    # Set the given method as default commit action, use commit_ for the old one
+    # This method can be called just once to avoid conflicts
+    def default_commit ( meth )
+      just_once do
+        alias_command :commit, meth
+        alias_command :ci, meth
+      end
+    end
+
+  end # class << self
+
 end # class Vcs
+
+end