rscm 0.4.5 → 0.5.0

data/lib/rscm/scm/cvs_log_parser.rb

@@ -27,6 +27,7 @@ module RSCM
         end
       end
       revisions.sort!
+      revisions
     end
     
     def next_log_entry

data/lib/rscm/scm/darcs.rb

@@ -7,6 +7,15 @@ module RSCM
     # See http://progetti.arstecnica.it/tailor/browser/vcpx/darcs.py
     attr_accessor :dir
 
+    def installed?
+      begin
+        darcs("--version", {}) 
+        true
+      rescue
+        false
+      end
+    end
+
     def initialize(dir=".")
       @dir = File.expand_path(dir)
     end

data/lib/rscm/scm/perforce.rb

@@ -1,149 +1,216 @@
-# TODO
-# Support int revision numbers AND dates
-# Leverage default P4 client settings (optional)
-
-require 'rscm/base'
-require 'rscm/path_converter'
-require 'rscm/line_editor'
-
-require 'fileutils'
-require 'time'
-require 'socket'
-
-module RSCM
-  class Perforce < Base
-    DATE_FORMAT = "%Y/%m/%d:%H:%M:%S"
-    # Doesn't work for empty messages, (Like 21358 in Aslak's P4 repo)
-    CHANGELIST_PATTERN = /^Change \d+ by (.*)@.* on (.*)\n\n(.*)\n\nAffected files ...\n\n(.*)/m
-    # But this one does
-    CHANGELIST_PATTERN_NO_MSG = /^Change \d+ by (.*)@.* on (.*)\n\nAffected files ...\n\n(.*)/m
-  
-    def initialize(user=nil, password=nil, view=nil)
-      @user, @password = user, password
-    end
-  
-    def revisions(from_identifier, options={})
-      from_identifier = Time.epoch unless from_identifier
-      from_identifier = Time.epoch if (from_identifier.is_a? Time and from_identifier < Time.epoch)
-      from = revision_spec(from_identifier+1) # We have to add 1 because of the constract of this method.
-
-      to_identifier = options[:to_identifier] ? options[:to_identifier] : Time.infinity
-      to = revision_spec(to_identifier)
-
-      changes = execute("p4 #{p4_opts(false)} changes //...@#{from},#{to}", options) do |io|
-        io.read
-      end
-      
-      revs = changes.collect do |line|
-        revision = Revision.new
-        revision.identifier = line.match(/^Change (\d+)/)[1].to_i
-
-        execute("p4 #{p4_opts(false)} describe -s #{revision.identifier}", options) do |io|
-          log = io.read
-
-          if log =~ CHANGELIST_PATTERN
-            revision.developer, time, revision.message, files = $1, $2, $3, $4
-          elsif log =~ CHANGELIST_PATTERN_NO_MSG
-            revision.developer, time, files = $1, $2, $3
-          else
-            puts "PARSE ERROR:"
-            puts log
-            puts "\nDIDN'T MATCH:"
-            puts CHANGELIST_PATTERN
-          end
-
-          revision.time = Time.parse(time)
-
-          files.each_line do |line|
-            if line =~ /^\.\.\. (\/\/.+)#(\d+) (.+)/
-              if(STATES[$3.strip])
-                file = RevisionFile.new
-                file.path = $1
-                file.native_revision_identifier = $2.to_i
-                file.previous_native_revision_identifier = file.native_revision_identifier-1
-                file.status = STATES[$3.strip]
-                file.time = revision.time
-                file.message = revision.message
-                file.developer = revision.developer
-                revision << file
-              end
-            end
-          end
-
-        end
-
-        revision
-      end
-      Revisions.new(revs.reverse)
-    end
-
-  protected
-
-    def checkout_silent(to_identifier, options)
-      checkout_dir = PathConverter.filepath_to_nativepath(@checkout_dir, false)
-      FileUtils.mkdir_p(@checkout_dir)
-      
-      ensure_client(options)
-      execute("p4 #{p4_opts} sync", options)
-    end
-
-    def ignore_paths
-      []
-    end
-    
-  private
-  
-    STATES = {
-      "add" => RevisionFile::ADDED,
-      "edit" => RevisionFile::MODIFIED,
-      "delete" => RevisionFile::DELETED
-    }
-
-    def p4_opts(with_client=true)
-      user_opt = @user.to_s.empty? ? "" : "-u #{@user}"
-      password_opt = @password.to_s.empty? ? "" : "-P #{@password}"
-      client_opt = with_client ? "-c \"#{client_name}\"" : ""
-      "#{user_opt} #{password_opt} #{client_opt}"
-    end
-    
-    def client_name
-      raise "checkout_dir not set" unless @checkout_dir
-      Socket.gethostname + ":" + @checkout_dir
-    end
-    
-    def ensure_client(options)
-      create_client(options)
-    end
-    
-    def create_client(options)
-      options = {:mode => "w+"}.merge(options)
-      execute("p4 #{p4_opts(false)} client -i", options) do |io|
-        io.puts(client_spec)
-        io.close_write
-      end
-    end
-    
-    def client_spec
-      <<-EOF
-Client: #{client_name}
-Owner: #{@user}
-Host: #{Socket.gethostname}
-Description: RSCM client
-Root: #{@checkout_dir}
-Options: noallwrite noclobber nocompress unlocked nomodtime normdir
-LineEnd: local
-View: #{@view} //#{client_name}/...
-EOF
-    end
-    
-    def revision_spec(identifier)
-      if identifier.is_a?(Time)
-        identifier.strftime(DATE_FORMAT)
-      else
-        identifier.to_i
-      end
-    end
-
-  end
-
-end
+# TODO
+# Support int revision numbers AND dates
+# Leverage default P4 client settings (optional)
+
+require 'rscm/base'
+require 'rscm/path_converter'
+require 'rscm/line_editor'
+
+require 'fileutils'
+require 'time'
+require 'socket'
+
+module RSCM
+  class Perforce < Base
+    unless defined? DATE_FORMAT
+      DATE_FORMAT = "%Y/%m/%d:%H:%M:%S"
+      # Doesn't work for empty messages, (Like 21358 in Aslak's P4 repo)
+      CHANGELIST_PATTERN = /^Change \d+ by (.*)@.* on (.*)\n\n(.*)\n\nAffected files ...\n\n(.*)/m
+      # But this one does
+      CHANGELIST_PATTERN_NO_MSG = /^Change \d+ by (.*)@.* on (.*)\n\nAffected files ...\n\n(.*)/m
+      
+      STATES = {
+        "add" => RevisionFile::ADDED,
+        "edit" => RevisionFile::MODIFIED,
+        "delete" => RevisionFile::DELETED
+      }
+    end
+
+    attr_accessor :view
+    attr_accessor :username
+    attr_accessor :password
+
+    def installed?
+      begin
+        execute("p4 info", {}) 
+        true
+      rescue
+        false
+      end
+    end
+
+    def revisions(from_identifier=Time.new.utc, options={})
+      raise "from_identifer cannot be nil" if from_identifier.nil?
+      set_utc_offset(options)
+      view_as_regexp = "^" + @view.gsub(/\.\.\./, "(.*)")
+      relative_path_pattern = Regexp.new(view_as_regexp)
+    
+      from_identifier = Time.epoch unless from_identifier
+      from_identifier = Time.epoch if (from_identifier.is_a? Time and from_identifier < Time.epoch)
+      from = revision_spec(from_identifier + 1) # We have to add 1 because of the contract of this method.
+
+      to_identifier = options[:to_identifier] ? options[:to_identifier] : Time.infinity
+      to = revision_spec(to_identifier - 1) # We have to subtract 1 because of the contract of this method.
+
+      cmd = "p4 #{p4_opts(false)} changes #{@view}@#{from},#{to}"
+      revisions = Revisions.new
+      revisions.cmd = cmd if store_revisions_command?
+
+      changes = execute(cmd, options) do |io|
+        io.read
+      end
+
+      changes.each do |line|
+        revision = nil
+        identifier = line.match(/^Change (\d+)/)[1].to_i
+
+        execute("p4 #{p4_opts(false)} describe -s #{identifier}", options) do |io|
+          log = io.read
+
+          if log =~ CHANGELIST_PATTERN
+            developer, time, message, files = $1, $2, $3, $4
+          elsif log =~ CHANGELIST_PATTERN_NO_MSG
+            developer, time, files = $1, $2, $3
+          else
+            puts "PARSE ERROR:"
+            puts log
+            puts "\nDIDN'T MATCH:"
+            puts CHANGELIST_PATTERN
+          end
+
+          # The parsed time doesn't have timezone info. We'll tweak it.
+          time = Time.parse(time + " UTC") - @utc_offset
+
+          files.each_line do |line|
+            if line =~ /^\.\.\. (\/\/.+)#(\d+) (.+)/
+              depot_path = $1
+              file_identifier = $2.to_i
+              state = $3.strip
+              if(STATES[state])
+                if(depot_path =~ relative_path_pattern)
+                  relative_path = $1
+
+                  if revision.nil?
+                    revision = Revision.new
+                    revision.identifier = identifier
+                    revision.developer = developer
+                    revision.message = message
+                    revision.time = time
+                    revisions.add revision
+                  end
+
+                  file = RevisionFile.new
+                  file.path = relative_path
+                  file.native_revision_identifier = file_identifier
+                  file.previous_native_revision_identifier = file.native_revision_identifier-1
+                  file.status = STATES[state]
+                  revision.add file
+                end
+              end
+            end
+          end
+        end
+      end
+      revisions
+    end
+    
+    def destroy_working_copy(options={})
+      execute("p4 #{p4_opts(false)} client -d #{client_name}", options)
+    end
+
+    def open(revision_file, options={}, &block)
+      path = @view.gsub(/\.\.\./, revision_file.path) # + "@" + revision_file.native_revision_identifier
+      cmd = "p4 #{p4_opts(false)} print -q #{path}"
+      execute(cmd, options) do |io|
+        block.call io
+      end
+    end
+    
+    def diff
+    #p4 diff2 //depot/trunk/build.xml@26405 //depot/trunk/build.xml@26409
+    end
+
+  protected
+
+    def checkout_silent(to_identifier, options)
+      checkout_dir = PathConverter.filepath_to_nativepath(@checkout_dir, false)
+      FileUtils.mkdir_p(@checkout_dir)
+      
+      ensure_client(options)
+      execute("p4 #{p4_opts} sync #{@view}@#{to_identifier}", options)
+    end
+
+    def ignore_paths
+      []
+    end
+    
+  private
+  
+    def p4_opts(with_client=true)
+      user_opt = @username.to_s.empty? ? "" : "-u #{@username}"
+      password_opt = @password.to_s.empty? ? "" : "-P #{@password}"
+      client_opt = with_client ? "-c \"#{client_name}\"" : ""
+      "#{user_opt} #{password_opt} #{client_opt}"
+    end
+    
+    def client_name
+      raise "checkout_dir not set" unless @checkout_dir
+      Socket.gethostname + ":" + @checkout_dir
+    end
+    
+    def ensure_client(options)
+      create_client(options)
+    end
+    
+    def create_client(options)
+      options = {:mode => "w+"}.merge(options)
+      FileUtils.mkdir_p(@checkout_dir)
+      execute("p4 #{p4_opts(false)} client -i", options) do |io|
+        io.puts(client_spec)
+        io.close_write
+      end
+    end
+    
+    def client_spec
+      <<-EOF
+Client: #{client_name}
+Owner: #{@username}
+Host: #{Socket.gethostname}
+Description: RSCM client
+Root: #{@checkout_dir}
+Options: noallwrite noclobber nocompress unlocked nomodtime normdir
+LineEnd: local
+View: #{@view} //#{client_name}/...
+EOF
+    end
+    
+    def revision_spec(identifier)
+      if identifier.is_a?(Time)
+        # The p4 client uses local time, but rscm uses utc
+        # We have to convert to local time
+        identifier += @utc_offset
+        identifier.strftime(DATE_FORMAT)
+      else
+        identifier.to_i
+      end
+    end
+
+    # Queries the server for the time offset. Required in order to get proper
+    # timezone for revisions
+    def set_utc_offset(options)
+      unless @utc_offset
+        execute("p4 #{p4_opts(false)} info", options) do |io|
+          io.each do |line|
+            if line =~ /^Server date: (.*)/
+              server_time = Time.parse($1)
+              @utc_offset = server_time.utc_offset
+            end
+          end
+        end
+        raise "Couldn't get server's UTC offset" if @utc_offset.nil?
+      end
+    end
+
+  end
+
+end

data/lib/rscm/scm/subversion.rb

@@ -2,6 +2,7 @@ require 'rscm/base'
 require 'rscm/path_converter'
 require 'rscm/line_editor'
 require 'rscm/scm/subversion_log_parser'
+require 'stringio'
 
 module RSCM
 
@@ -27,17 +28,30 @@ module RSCM
       @username = ""
       @password = ""
     end
+    
+    def path
+      @path ||= ""
+    end
+
+    def installed?
+      begin
+        svn("--version", {}) 
+        true
+      rescue
+        false
+      end
+    end
 
     def to_identifier(raw_identifier)
       raw_identifier.to_i
     end
     
     def add(relative_filename, options={})
-      svn("add #{relative_filename}", options)
+      svn("add #{checkout_dir}/#{relative_filename}", options)
     end
 
     def move(relative_src, relative_dest, options={})
-      svn("mv #{relative_src} #{relative_dest}", options)
+      svn("mv #{checkout_dir}/#{relative_src} #{checkout_dir}/#{relative_dest}", options)
     end
 
     def transactional?
@@ -56,24 +70,25 @@ module RSCM
     def commit(message, options={})
       svn(commit_command(message), options)
       # We have to do an update to get the local revision right
-      svn("update", options)
+      checkout_silent(nil, options)
     end
 
     def label
       local_revision_identifier.to_s
     end
 
-    def diff(file, options={}, &block)
-      cmd = "svn diff --revision #{file.previous_native_revision_identifier}:#{file.native_revision_identifier} \"#{url}/#{file.path}\""
+    def diff(path, from, to, options={}, &block)
+      cmd = "svn diff --revision #{from}:#{to} \"#{url}/#{path}\""
       execute(cmd, options) do |io|
-        return(yield(io))
+        return(block.call(io))
       end
     end
     
-    def open(revision_file, options, &block)
-      cmd = "svn cat #{url}/#{revision_file.path}@#{revision_file.native_revision_identifier}"
+    def open(path, native_revision_identifier, options={}, &block)
+      raise "native_revision_identifier cannot be nil" if native_revision_identifier.nil?
+      cmd = "svn cat #{url}/#{path}@#{native_revision_identifier}"
       execute(cmd, options) do |io|
-        return(yield(io))
+        return(block.call(io))
       end
     end
 
@@ -123,10 +138,10 @@ module RSCM
       native_path = PathConverter.filepath_to_nativepath(svnrootdir, false)
       mkdir_p(PathConverter.nativepath_to_filepath(native_path))
       svnadmin("create #{native_path}", options)
-      if(@path && @path != "")
+      if(path != "")
         options = options.dup.merge({:dir => "."})
         # create the directories
-        paths = @path.split("/")
+        paths = path.split("/")
         paths.each_with_index do |p,i|
           p = paths[0..i]
           u = "#{repourl}/#{p.join('/')}"
@@ -153,12 +168,13 @@ module RSCM
       not_already_commented
     end
     
-    def import_central(options)
-      import_cmd = "import #{url} -m \"#{options[:message]}\""
+    def import_central(dir, options={})
+      import_cmd = "import #{dir} #{url} -m \"#{options[:message]}\""
       svn(import_cmd, options)
     end
 
-    def revisions(from_identifier, options={})
+    def revisions(from_identifier=Time.new.utc, options={})
+      raise "from_identifer cannot be nil" if from_identifier.nil?
       options = {
         :from_identifier => from_identifier,
         :to_identifier => Time.infinity, 
@@ -170,9 +186,11 @@ module RSCM
       revisions = nil
       command = "svn #{changes_command(options[:from_identifier], options[:to_identifier], options[:relative_path])}"
       execute(command, options) do |stdout|
-        parser = SubversionLogParser.new(stdout, @url, options[:from_identifier], @path)
+        stdout = StringIO.new(stdout.read)
+        parser = SubversionLogParser.new(stdout, @url, options[:from_identifier], options[:to_identifier], path)
         revisions = parser.parse_revisions
       end
+      revisions.cmd = command if store_revisions_command?
       revisions
     end
     
@@ -208,7 +226,7 @@ module RSCM
 
     def local_revision_identifier(options)
       local_revision_identifier = nil
-      svn("info", options) do |line|
+      svn("info #{quoted_checkout_dir}", options) do |line|
         if(line =~ /Revision: ([0-9]*)/)
           return $1.to_i
         end
@@ -287,21 +305,17 @@ module RSCM
     end
     
     def checkout_command(to_identifier)
-      cd = "\"#{checkout_dir}\""
-      raise "checkout_dir not set" if cd == ""
-      "checkout #{login_options} #{url} #{cd} #{revision_option(nil,to_identifier)}"
+      "checkout #{login_options} #{url} #{revision_option(nil,to_identifier)} #{quoted_checkout_dir}"
     end
 
     def update_command(to_identifier)
-      "update #{login_options} #{revision_option(nil,to_identifier)}"
+      "update #{login_options} #{revision_option(nil,to_identifier)} #{quoted_checkout_dir}"
     end
     
     def changes_command(from_identifier, to_identifier, relative_path)
       # http://svnbook.red-bean.com/svnbook-1.1/svn-book.html#svn-ch-3-sect-3.3
       # file_list = files.join('\n')
-      full_url = relative_path ? "#{url}/#{relative_path}" : ""
-      cmd = "log --verbose #{login_options} #{revision_option(from_identifier, to_identifier)} #{full_url}"
-      cmd
+      "log --verbose #{login_options} #{revision_option(from_identifier, to_identifier)} #{@url}"
     end
 
     def login_options
@@ -352,7 +366,13 @@ module RSCM
     end
 
     def commit_command(message)
-      "commit #{login_options} --force-log -m \"#{message}\""
+      "commit #{login_options} --force-log -m \"#{message}\" #{quoted_checkout_dir}"
+    end
+    
+    def quoted_checkout_dir
+      cd = '"' + PathConverter.filepath_to_nativepath(checkout_dir, false) + '"'
+      raise "checkout_dir not set" if cd == ""
+      cd
     end
     
     def local?