vcs 0.4.1 → 0.5.2.4

data/NEWS

@@ -1,4 +1,32 @@
-New in 0.4 ...:
+New in 0.5 ...:
+
+  * Add the full CVS support.
+
+  * Add a new_user flag in the configuration, this flag is enable by default
+    and makes vcs be more explicit. To turn of this option add this to your
+    main configuration file (~/.vcs):
+      new_user: false
+
+  * The interactive is now more by default (in non new_user mode):
+      So no question will be asked to you before the commit.
+      To active the interactive mode add this to your main .vcs:
+        interactive: true
+
+  * Add a force option to commit to bypass the unrecognized file rule.
+
+  * Now, just few colors are set by default. To have your full colored vcs
+    add this to your main configuration file:
+      color: xmas_tree
+
+  * Enforce the revision managment to avoid some conlifcts during two
+    commits at the same time.
+
+  * Add paginate which just open a file with your default pager program.
+
+  * Remove Prcs from the list of default systems, because it is not fully
+    supported. Of course contributions are wellcome :)
+
+New in 0.4 2005-10-03:
 
   * Vcs now supports ruby 1.8.3.
 

data/SPEC.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = %q{vcs}
-  s.version = "0.4.1"
-  s.date = %q{2005-10-10}
+  s.version = "0.5.2.4"
+  s.date = %q{2006-02-28}
   s.summary = %q{A wrapper over Version Control Systems}
   s.email = ["ertai@lrde.epita.fr"]
   s.homepage = %q{http://rubyforge.org/projects/vcs}
   s.rubyforge_project = %q{vcs}
   s.description = %q{Version  control  systems (Subversion, CVS, PRCS...), however useful, are not very  extensible:  adding  new  features can be cumbersome, especially if you want  them  for  different such systems at once. Vcs provide a simple dynamic hierarchy for Version Control Systems.}
   s.authors = ["Nicolas Pouillard"]
-  s.files = ["lib/vcs/add.rb", "lib/vcs/app.rb", "lib/vcs/back.rb", "lib/vcs/changelog.rb", "lib/vcs/common_commit.rb", "lib/vcs/conflict.rb", "lib/vcs/cvs.rb", "lib/vcs/delete.rb", "lib/vcs/diff.rb", "lib/vcs/diffstat.rb", "lib/vcs/edit.rb", "lib/vcs/environment.rb", "lib/vcs/form.rb", "lib/vcs/ignore.rb", "lib/vcs/junk.rb", "lib/vcs/last_changed_date.rb", "lib/vcs/list.rb", "lib/vcs/mail.rb", "lib/vcs/message.rb", "lib/vcs/news.rb", "lib/vcs/opt_parse.rb", "lib/vcs/prcs.rb", "lib/vcs/revision.rb", "lib/vcs/script.rb", "lib/vcs/status.rb", "lib/vcs/svn.rb", "lib/vcs/url.rb", "lib/vcs/vcs.rb", "bin/vcs", "bin/vcs-cvs", "bin/vcs-prcs", "bin/vcs-svn", "AUTHORS", "HOWTO", "NEWS", "NEWS.FR", "Rakefile", "README", "SPEC.dyn.yml", "SPEC.gemspec", "SPEC.yml"]
-  s.executables = ["vcs", "vcs-cvs", "vcs-prcs", "vcs-svn"]
-  s.add_dependency(%q<ruby_ex>, ["~> 0.3.0"])
+  s.files = ["lib/vcs/revision.rb", "lib/vcs/diff.rb", "lib/vcs/conflict.rb", "lib/vcs/message.rb", "lib/vcs/common_commit.rb", "lib/vcs/junk.rb", "lib/vcs/opt_parse.rb", "lib/vcs/edit.rb", "lib/vcs/list.rb", "lib/vcs/mail.rb", "lib/vcs/add.rb", "lib/vcs/app.rb", "lib/vcs/cvs.rb", "lib/vcs/form.rb", "lib/vcs/news.rb", "lib/vcs/delete.rb", "lib/vcs/svn.rb", "lib/vcs/vcs.rb", "lib/vcs/url.rb", "lib/vcs/back.rb", "lib/vcs/environment.rb", "lib/vcs/status.rb", "lib/vcs/changelog.rb", "lib/vcs/last_changed_date.rb", "lib/vcs/script.rb", "lib/vcs/version.rb", "lib/vcs/prcs.rb", "lib/vcs/diffstat.rb", "lib/vcs/ignore.rb", "bin/vcs", "bin/vcs-prcs", "bin/vcs-cvs", "bin/vcs-svn", "contrib/emacs-support/vcs.el", "NEWS", "SPEC.gemspec", "HOWTO", "Rakefile", "README", "NEWS.FR", "AUTHORS", "SPEC.yml"]
+  s.executables = ["vcs", "vcs-prcs", "vcs-cvs", "vcs-svn"]
+  s.add_dependency(%q<ruby_ex>, ["~> 0.4.5"])
 end

data/SPEC.yml

@@ -3,7 +3,7 @@ Author: Nicolas Pouillard
 License: GNU General Public License (GPL)
 Revision: '$Id$'
 
-name: vcs
+version: !feydakins.org,2006/version dev-util/vcs-0.5_beta4
 
 title: Vcs -- A wrapper over Version Control Systems
 summary: A wrapper over Version Control Systems
@@ -14,11 +14,12 @@ description: |
   hierarchy for Version Control Systems.
 homepage: http://rubyforge.org/projects/vcs
 
+user: ertai
+rubyforge_project: vcs
 rdoc_dir: doc/html
+trunk_url: https://svn.lrde.epita.fr/svn/lrdetools/trunk/vcs
 tags_url: https://svn.lrde.epita.fr/svn/lrdetools/tags
-
-commit_command: ltci
-commit_dir: ..
+version_path: !path lib/vcs/version.rb
 
 rdoc_files: !filelist
   - README
@@ -28,15 +29,16 @@ rdoc_files: !filelist
 pkg_files: !filelist
   - lib/vcs/**/*.rb
   - bin/**/*
+  - contrib/emacs-support/**/*.el
   - '[A-Z]*'
 
 executables: [ vcs, vcs-svn, vcs-cvs, vcs-prcs ]
 
 dependencies:
   ruby_ex:
-    gem    : ~> 0.3.0
-    tarball: 6317/ruby_ex-0.3.0.tar.gz 
+    gem    : ~> 0.4.5
+    tarball: 8879/ruby_ex-0.4.tar.gz
     vcs    : svn://svn.feydakins.org/ruby_ex/trunk
 
 root_test_suite: test/vcs-check.yml
-ttk_version: ~> 0.3.0
+uttk_version: ~> 0.3.1

data/contrib/emacs-support/vcs.el

@@ -0,0 +1,11 @@
+(defun vcs-mode ()
+  "Mode for editing VCS message files."
+  (interactive)
+  (kill-all-local-variables)
+  (let ((file-name buffer-file-name))
+    (message-mode)
+    ;; Ensure message-mode didn't modified file-name.
+    (setq buffer-file-name file-name
+          major-mode 'vcs-mode
+          mode-name "VCS")
+    (run-hooks 'vcs-mode-hook)))

data/lib/vcs/add.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: add.rb 265 2005-10-03 12:37:03Z pouill_n $
+# Revision::  $Id: /lrde/tools/trunk/vcs/lib/vcs/add.rb 9106 2005-10-03T12:37:03.631187Z pouill_n  $
 
 class Vcs
 

data/lib/vcs/app.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: app.rb 261 2005-10-03 00:45:53Z pouill_n $
+# Revision::  $Id: /w/lrde/tools/trunk/vcs/lib/vcs/app.rb 22374 2006-02-28T14:42:27.599831Z pouillar  $
 
 require 'pathname'
 
@@ -29,7 +29,7 @@ class VcsApp
 
     def requirements
       Pathname.glob("{#{vcs_dir},#{extension_dirs.join(',')}}/*.rb") do |file|
-        next if file.to_s =~ /\/(app|opt_parse|vcs)\.rb$/
+        next if file.to_s =~ /\/(app|opt_parse|vcs|svn|version)\.rb$/
         logger.debug { file.basename.to_s } if require file.to_s
       end
       grab_all_vcs()
@@ -85,7 +85,7 @@ class VcsApp
   end
 
   def user_configuration_setup
-    grab_dirs('.vcs').each do |vcs_user_conf|
+    grab_dirs('.vcs').reverse_each do |vcs_user_conf|
       Vcs.merge_user_conf(vcs_user_conf)
     end
   end
@@ -95,6 +95,7 @@ class VcsApp
     begin
       user_configuration_setup()
       Vcs.logger.color = Vcs.color? { STDERR.tty? }
+      Vcs::Logger.enable_xmas_tree_colors if Vcs.xmas_tree_colors?
       vcs_extensions_setup()
       @@parser.parse! ARGV if Vcs.default.nil?
       if Vcs.default.nil?

data/lib/vcs/back.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: back.rb 261 2005-10-03 00:45:53Z pouill_n $
+# Revision::  $Id: /lrde/tools/trunk/vcs/lib/vcs/back.rb 9102 2005-10-03T00:45:53.019651Z pouill_n  $
 
 class Vcs
   # This command take a command as argument and search the last revision where

data/lib/vcs/changelog.rb

@@ -39,6 +39,8 @@ class Vcs
   # Same switches as status
   def mk_log_entry! ( *args )
     with_cache! LogEntry, 'Log entry' do
+      puts '<%= Title %>'
+      puts
       mk_log_entry_contents(*args).each do |se|
         puts "- #{se.file}: #{se.comment}."
       end
@@ -47,12 +49,25 @@ class Vcs
   alias_command :mkl, :mk_log_entry
   LogEntry = ',log'.to_path unless defined? LogEntry
 
+
+  # Same switches as status
+  def mk_yaml_log_entry! ( *args )
+    raise NotImplentedError
+    # with_cache! LogEntry, 'Log entry' do
+      # mk_log_entry_contents(*args).each do |se|
+        # puts "  - #{se.file}: >2\n    #{se.comment}."
+      # end
+    # end
+  end
+  alias_command :mkyl, :mk_yaml_log_entry
+
+
   def log_to_changelog ( aString )
     if aString.blank?
       puts
     else
-      putc ?\t
-      aString.sub!(/^-/, '*')
+      aString.sub!(/^([^-\s])/, "\t\\1")
+      aString.sub!(/^-/, "\t*")
       puts aString
     end
   end
@@ -72,6 +87,7 @@ class Vcs
       puts 'Index: ChangeLog'
       puts "from  #{Vcs.full_email}"
       puts
+      puts "\tDo not fill this draft entry!" if editing?
       mk_log_entry(*args).each_line(&method(:log_to_changelog))
   end
   alias_command :mkml, :mk_message_entry

data/lib/vcs/common_commit.rb

@@ -5,18 +5,27 @@
 
 class Vcs
 
-  def common_commit! ( subject_format, files=[], opts={}, &block )
+  cattr_accessor :commit_state
+
+  def common_commit! ( subject_format, files=[], commit_opts={}, &block )
 
     unless CL.exist?
       raise Failure, "No `#{CL}', you are probably not in a valid directory."
     end
 
+    Vcs.commit_state = :editing
+    force = commit_opts[:force]
+    commit_opts.delete :force
+
+    opts = just_standard_options commit_opts
+
     @@subject_format = subject_format
 
-    update!
+    logger.info { 'Updating your working copy...' }
+    update! [], opts
 
     have_unrecognized_files = false
-    status(files) do |se|
+    status(files, opts) do |se|
       if se.category == :unrecognize
         have_unrecognized_files = true
         se.colorize! if color?
@@ -24,87 +33,123 @@ class Vcs
       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 comply with the rule:
-        |- 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!
+      message = 'You have unrecognized files in your working copy!'
+      if Vcs.user_conf.new_user
+        message << "
+          |This meant that these files won't be committed!
+          |You have some solutions to comply with the rule:
+          |- 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:
+          |    #{@cmd.command} commit foo.c bar/
+          |
+          |".head_cut!
+      end
+      if force
+        logger.warn { message }
+      else
+        logger.error { message }
+        commit_failed
+      end
     end
 
-    Vcs.commited = edit_form!(files)
+    block['empty subject'] if block_given?
 
-    mk_message(files)
-    edit! Message
+    Vcs.commit_state = edit_form!(files, opts.merge(:to => Vcs.mail_options.to))
 
-    iform = nil
+    iform = YAML.load(IForm.read)
 
-    if commited?
-      iform ||= YAML.load(IForm.read)
-    else
+    Message.unlink if Message.exist? and not committed?
+    mk_message(files, opts.merge(iform))
+    block[iform['Subject']] if block_given?
+    paginate! Message
 
-      unless @h.agree 'Committing, are you sure? (y/n)', true
-        commit_failed
+    unless committed?
+
+      if Vcs.interactive?
+        question = 'Committing, are you sure?'
+        begin
+          response = @h.agree "#{question} (y/n)", true
+        rescue NoMethodError
+          response = @h.agree "#{question} (yes/no)"
+        end
+        unless response
+          commit_failed
+        end
       end
 
-      concat_changelog!(files)
+      concat_changelog!(files, opts)
 
       files << 'ChangeLog' unless files.empty?
 
       begin
-        commit_!(files, opts.merge(:message => mk_log_entry(files).read))
-        iform = YAML.load(IForm.read).merge('commited' => true)
+        commit_!(files, commit_opts.merge(:message => mk_log_entry(files).read))
+        update!
+        revision = rev.read.to_i
+        iform = YAML.load(IForm.read).merge('Revision' => revision)
         IForm.open('w') { |f| f.print iform.to_yaml }
+        Vcs.commit_state = revision
         TMP_CL.delete if TMP_CL.exist?
       rescue Exception => ex
         commit_failed ex
       end
 
-      update!
-
     end
 
-    block[iform['subject']] if block_given?
+    Vcs.commit_state = :sending
+    block[iform['Subject']] if block_given?
 
-    logger.info 'Deleting junk files...'
+    logger.info { 'Deleting junk files...' }
     TMP_CL.delete if TMP_CL.exist?
-    destdir = '+commited'.to_path/iform['revision'].to_s
+    # Backward typo compatibility
+    '+commited'.to_path.mv('+committed') if '+commited'.to_path.exist?
+    destdir = '+committed'.to_path/iform['Revision'].to_s
     destdir.mkpath unless destdir.directory?
-    [LogEntry, Form, IForm, Message, MAIL, NEWS].each do |path|
+    moved = PathList.new
+    [LogEntry, Form, IForm, Message].each do |path|
       next unless path.exist?
       dest = destdir/path
-      logger.info "Moving `#{path}' to `#{dest}'..."
+      moved << path
       path.rename(dest)
     end
+    logger.info { "Moving `#{moved.join('\', `')}' to `#{destdir}'..." }
 
   end
   protected :common_commit!
 
   def commit_failed ( ex=nil )
-    logger.error "Aborting #{ex}"
-    logger.info 'You can rerun the same command to resume the commit'
+    Message.unlink if defined? Message and Message.exist? and not committed?
+    logger.error { "Aborting #{ex}" }
+    logger.info { 'You can rerun the same command to resume the commit' }
     raise 'Commit failed'
   end
 
-  cattr_accessor :commited
-  def commited?
-    Vcs.commited
+  def committed?
+    Vcs.commit_state.is_a? Integer
+  end
+
+  def editing?
+    Vcs.commit_state == :editing
+  end
+
+  def sending?
+    Vcs.commit_state == :sending
+  end
+
+  def committing?
+    [:editing, :committing, :sending].include? Vcs.commit_state
   end
 
 end # class Vcs

data/lib/vcs/conflict.rb

@@ -5,19 +5,23 @@
 
 class Vcs
 
-  def mk_conflicts_list ( files, options={} )
-    ls = status.output.readlines.grep(/^C/).map! { |s| s[/^C\s+(.*)/, 1] }
-    raise "no conflicts" if ls.empty?
-    ls
+  def mk_conflicts_list ( files=[], options={} )
+    conflicts = []
+    status(files, options) do |se|
+      conflicts << se.file if se.category == :conflict
+    end
+    raise "no conflicts" if conflicts.empty?
+    conflicts
   end
   protected :mk_conflicts_list
 
-  def edit_conflicts! ( files, options={} )
-    edit! mk_conflicts_list
+  def edit_conflicts! ( files=[], options={} )
+    edit! mk_conflicts_list(files, options)
+    resolve_conflicts! files, options
   end
 
-  def resolve_conflicts! ( files, options={} )
-    conflicts = mk_conflicts_list
+  def resolve_conflicts! ( files=[], options={} )
+    conflicts = mk_conflicts_list(files, options)
     question = "Resolve these conflicts?: \n  - #{conflicts.join("\n  - ")}\n(y/n)"
     if @h.agree question, true
       return resolved(conflicts)

data/lib/vcs/cvs.rb

@@ -15,10 +15,30 @@ class Cvs < Vcs
     self.option_controller = @@cvs_option_controller
   end
 
-  %w[ rdiff rtag tag ].each do |m|
+  %w[ rdiff rtag tag login ].each do |m|
     add_basic_method(m)
   end
 
-  @@options_specification ||= ""
+  @@options_specification ||= "
+    -H (--usage)             ((Displays usage information for command.))
+    -Q (--really-quiet)      ((Cause CVS to be really quiet.))
+    -q (--somewhat-quiet)    ((Cause CVS to be somewhat quiet.))
+    -r (--read-only)         ((Make checked-out files read-only.))
+    -w (--read-write)        ((Make checked-out files read-write (default).))
+    -n (--pretend)           ((Do not execute anything that will change the disk.))
+    -t (--trace)             ((Show trace of program execution -- try with -n.))
+    -v (--version)           ((CVS version and copyright.))
+    -T (--tmp) TMPDIR        ((Use 'tmpdir' for temporary files.))
+    -e (--editor) EDITOR     ((Use 'editor' for editing log information.))
+    -d (--cvsroot) CVSROOT   ((Overrides $CVSROOT as the root of the CVS tree.))
+    -f (--no-cvsrc)          ((Do not use the ~/.cvsrc file.))
+    -z (--compression) LEVEL ((Use compression level 'LEVEL' for net traffic.))
+    -a (--auth)              ((Authenticate all net traffic.))
+    -s (--set) VAR=VAL       ((Set CVS user variable.))
+  ".gsub(/^( +)/, '*PRE*\1')
+
+  def diffw ( files=[], options={} )
+    super
+  end
 
 end # class Cvs