vcs 0.2.148 → 0.3.0

data/lib/vcs/conflict.rb

@@ -0,0 +1,21 @@
+class Vcs
+
+  def mk_conflicts_list
+    ls = status.output.readlines.grep(/^C/).map! { |s| s[/^C\s+(.*)/, 1] }
+    raise "no conflicts" if ls.empty?
+    ls
+  end
+
+  def edit_conflicts!
+    edit! mk_conflicts_list
+  end
+
+  def resolve_conflicts!
+    conflicts = mk_conflicts_list
+    question = "Resolve these conflicts?: \n  - #{conflicts.join("\n  - ")}\n(y/n)"
+    if @h.agree question, true
+      return resolved(conflicts)
+    end
+  end
+
+end # class Vcs

data/{src → lib/vcs}/cvs.rb

@@ -5,7 +5,7 @@
 # $LastChangedBy: ertai $
 # $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'vcs'
+require 'vcs/vcs'
 
 class Cvs < Vcs
 

data/{src → lib/vcs}/diff.rb

@@ -5,14 +5,14 @@
 
 class Svn
 
-  def diffw_from_status ( *args )
+  def diffw_from_status! ( *args )
     files = Set.new
     from_status(*args) do |line, file_st, prop_st, cpy, file|
       next if file_st =~ /[?X]/
       next if file == 'ChangeLog'
       files << Pathname.new(file)
     end
-    diffw(*files.delete_if { |f| f.directory? })
+    diffw!(*files.delete_if { |f| f.directory? })
   end
 
 end # class Svn

data/lib/vcs/diffstat.rb

@@ -0,0 +1,28 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id$
+
+require 'vcs/vcs'
+
+class Vcs
+  @@diffstat = 'diffstat'.to_cmd
+
+  # Use the diffstat command to 
+  # display statitics on your patch.
+  def diffstat! ( *a )
+    check_diffstat
+    (diff(*a) | @@diffstat).run(@runner)
+  end
+  alias_command :ds, :diffstat
+
+  def check_diffstat
+    unless `diffstat -V` =~ /diffstat version/
+      raise ArgumentError, 'The `diffstat\' tool is needed by Vcs.diffstat' 
+    end
+  end
+
+  add_conf_checker :check_diffstat
+
+end # class Vcs
+

data/lib/vcs/edit.rb

@@ -0,0 +1,16 @@
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# Copyright:: Copyright (c) 2004 LRDE. All rights reserved.
+# License::   GNU General Public License (GPL).
+# Revision::  $Id: edit.rb 225 2005-09-16 14:09:22Z pouill_n $
+
+require 'vcs/vcs'
+
+class Vcs
+
+  def edit! ( *files )
+    # stringify
+    cmd = EDITOR + files.flatten.map { |x| x.to_s } > [STDOUT, STDERR]
+    cmd.run(@runner)
+  end
+
+end # class Vcs

data/{src → lib/vcs}/last_changed_date.rb

@@ -3,14 +3,12 @@
 # License:: GNU General Public License (GPL).
 # $Id$
 
-require 'svn'
-require 'stringio'
+require 'vcs/svn'
 
 class Svn
 
-  def last_changed_date ( *args )
-    re = /^Last Changed Date:.*?\(([^)]*)\).*$/
-    StringIO.new(info.readlines.grep(/^Last Changed Date:/).first.sub(re, '\1'))
+  def last_changed_date! ( *args )
+    puts info.read[/^Last Changed Date:.*?\(([^)]*)\).*$/, 1]
   end
 
   alias_command :date, :last_changed_date

data/{src → lib/vcs}/mail.rb

@@ -3,26 +3,26 @@
 # License::   GNU General Public License (GPL).
 # Revision::  $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'vcs'
+require 'vcs/vcs'
 require 'sendmail'
 
 class Vcs
 
   MAIL = Sendmail::MAIL_FILE
   MAILER = Sendmail.new
-  DEFAULT_OPTIONS = %w[ --ask --sign --mime ]
+  DEFAULT_OPTIONS = %w[ --confirm --sign --mime ]
 
   #
   # Mail.
   #
-  def mail ( *args )
+  def mail! ( *args )
     error_handling :mail_failed
     unless MAIL.exist?
       print_body(MAIL, MAILER.parse_mail_options(*(DEFAULT_OPTIONS + args)))
     end
     MAILER.sendmail
     MAIL.delete
-    StringIO.new('Mail: Sent.')
+    puts 'Mail: Sent.'
   end
 
   def mail_failed

data/lib/vcs/message.rb

@@ -0,0 +1,79 @@
+# 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'
+require 'vcs/changelog'
+
+class Vcs
+  def diffw! ( *args )
+    diff!(*args)
+  end
+end
+
+class Svn
+  def diffw! ( *args )
+    diff! '--diff-cmd', 'diff', '-x', '-NPbuw', *args
+  end
+end
+
+class Vcs
+
+  @@message = Pathname.new(',message')
+
+  def print_body ( file, options )
+    LOG.info "Creating a new `#{file}' file"
+    file.open('w') do |f|
+      f.puts options.to_yaml
+      f.puts '---'
+      f.puts
+      f.print message.read
+    end
+  end
+  private :print_body
+
+  def message ( *args )
+    error_handling :message_failed
+
+    unless @@message.exist?
+      cl_entry = mkchangelog(*args)
+      TempPath.new('message') do |tmp|
+        tmp.open('w') do |f|
+          with(f).url!
+          if defined? COLLABOA
+            f.puts
+            f.puts 'You can also view this changeset here:'
+            f.puts
+            next_rev = rev.output.read.to_i
+            next_rev += 1 unless ',commited'.to_path.exist?
+            f.puts "http://#{COLLABOA}/repository/changesets/#{next_rev}"
+          end
+          f.puts
+          f.puts 'Index: ChangeLog'
+          f.print cl_entry.sub(/^\d+-\d+-\d+/, 'from')
+          f.puts
+          with(f).diffstat!(*args)
+          f.puts
+          diffw_from_status(*args).each_line do |line|
+            f.print line if line !~ /^=+$/
+          end
+        end
+        tmp.mv(@@message)
+      end
+    end
+    @@message.open('r')
+  end
+
+  alias_command :msg, :message
+
+  def message_failed
+    if @@message.exist?
+      LOG.info "#{@@message}: Contains the generated message"
+      LOG.info '              (the ChangeLog entry, the diffstat, the diff)'
+    end
+  end
+
+end # class Vcs

data/{src → lib/vcs}/mycommit.rb

@@ -5,21 +5,18 @@
 # $LastChangedBy: ertai $
 # $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'vcs'
-require 'ask'
+require 'vcs/vcs'
 
 class Vcs
 
   COMMITED = Pathname.new(',commited')
 
-  def edit! ( *files )
-    system(EDITOR, *files.map { |x| x.to_s })
-  end
-
-  def common_commit! ( *args, &block )
+  def common_commit! ( subject_format, *args, &block )
 
     opts, args = args.partition { |a| a =~ /^-/ }
 
+    @@subject_format = subject_format
+
     update!
 
     unless COMMITED.exist?
@@ -34,21 +31,24 @@ class Vcs
 
       edit! @@message
 
-      if ask('Committing, are you sure?', :y) == :n
+      unless @h.agree 'Committing, are you sure? (y/n)', true
         commit_failed
       end
 
-      concat_changelog!(*args)
+      cl_entry = concat_changelog!(*args)
 
       #pager! diff
       #pager! status
 
       args << 'ChangeLog' unless args.grep(/^[^-]/).empty?
 
-      if commit!('-F', ADD_CL, *(opts + args))
+      # FIXME simplify cl_entry contents
+      
+      begin
+        commit!('--message', cl_entry, *(opts + args))
         ADD_CL.rename(COMMITED)
         TMP_CL.delete if TMP_CL.exist?
-      else
+      rescue
         commit_failed
       end
 
@@ -61,18 +61,18 @@ class Vcs
 
     end
 
+    header ||= YAML::load(META.read)
 
-    rev = self.revision.readline.chomp.to_i
-
-    block.call(rev) if block_given?
+    block[header['subject']] if block_given?
 
     LOG.info 'Deleting junk files...'
     TMP_CL.delete if TMP_CL.exist?
     ADD_CL.delete if ADD_CL.exist?
     COMMITED.delete if COMMITED.exist?
+    META.delete if META.exist?
     messages = Pathname.new(',messages')
     messages.mkpath unless messages.directory?
-    message_rev = messages + "#{@@message}.#{rev}"
+    message_rev = messages + "#{@@message}.#{header['rev']}"
     LOG.info "Moving `#{@@message}' to `#{message_rev}'..."
     @@message.rename(message_rev)
     LOG.info "You can remove `#{message_rev}' if everything is ok."

data/{src → lib/vcs}/news.rb

@@ -5,8 +5,8 @@
 # $LastChangedBy: ertai $
 # $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'tools'
-require 'message'
+require 'vcs/tools'
+require 'vcs/message'
 
 class Vcs
 
@@ -59,7 +59,7 @@ class Vcs
   #
   # Post the news.
   #
-  def news ( *args )
+  def news! ( *args )
     error_handling :news_failed
 
     print_body(NEWS, parse_news_options(*args)) unless NEWS.exist?
@@ -70,9 +70,9 @@ class Vcs
       server, port = opt[:server].split(/:/)
       port ||= 119
       LOG.info('news') { "Nntp Server: #{server}:#{port}" }
-      if ask("Post a news, with this subject: #{opt[:subject]}\n" +
+      unless @h.agree("Post a news, with this subject: #{opt[:subject]}\n" +
              "  to #{opt[:groups].join(', ')}\n  from #{opt[:from]}\n" +
-             'Are you sure?', :y) == :n
+             'Are you sure? (y/n)', true)
         LOG.error('news') { 'Aborting' }
         exit
       end
@@ -95,7 +95,7 @@ class Vcs
       end
     end
     NEWS.delete
-    StringIO.new(@news_status)
+    puts @news_status
   end
 
   def news_failed

data/{src → lib/vcs}/prcs.rb

@@ -5,7 +5,7 @@
 # $LastChangedBy: ertai $
 # $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'vcs'
+require 'vcs/vcs'
 
 class Prcs < Vcs
 

data/{src → lib/vcs}/revision.rb

@@ -5,13 +5,12 @@
 # $LastChangedBy: ertai $
 # $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'svn'
-require 'stringio'
+require 'vcs/svn'
 
 class Svn
 
-  def revision ( *args )
-    StringIO.new(info.readlines.grep(/^Revision:/)[0].sub(/^Revision: /, ''))
+  def revision! ( *args )
+    puts info.read[/^Revision:\s+(\d+)/, 1]
   end
 
   alias_command :rev, :revision

data/lib/vcs/script.rb

@@ -0,0 +1,19 @@
+# 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 $
+
+require 'vcs/vcs'
+
+class Vcs
+
+  def script! ( code, *args )
+    begin
+      eval(code)
+    rescue Exception => ex
+      LOG.error { 'Vcs#script: during the client execution' }
+      LOG.error { ex.long_pp }
+    end
+  end
+
+end # class Svn

data/{src → lib/vcs}/status.rb

@@ -6,7 +6,7 @@
 class Svn
 
   def from_status ( *args, &block )
-    status(*args).each do |line|
+    status(*args).each_line do |line|
       next unless line =~ /^.{5} /
       m = /^(.)(.).(.).\s*(.*)$/.match(line)
       block[*m.to_a]

data/{src → lib/vcs}/svn.rb

@@ -5,12 +5,12 @@
 # $LastChangedBy: ertai $
 # $Id: header 98 2004-09-29 12:07:43Z ertai $
 
-require 'vcs'
-require 'tools'
+require 'vcs/vcs'
 
 CL = Pathname.new('ChangeLog')
 ADD_CL = Pathname.new(',ChangeLog')
 TMP_CL = Pathname.new(',,ChangeLog')
+META = Pathname.new(',meta')
 
 class Svn < Vcs
 
@@ -21,11 +21,9 @@ class Svn < Vcs
     super
   end
 
-  %w[ blame cat cleanup copy export import list log merge mkdir move 
+  %w[ blame cat cleanup copy export import list log merge mkdir move propedit
       switch resolved revert info propdel propget proplist propset ].each do |m|
     add_basic_method(m)
   end
 
-  add_basic_method!(:propedit)
-
 end # class Svn

data/lib/vcs/url.rb

@@ -0,0 +1,16 @@
+# 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 $
+
+require 'vcs/svn'
+
+class Svn
+
+  def url! ( *args )
+    puts info.read[/^URL:\s+(.*)$/, 1]
+  end
+
+  alias_command :date, :last_changed_date
+
+end # class Svn