From 44fcc21eb6d784359427d63030b5014ce4bbf911 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 23 Nov 2010 08:21:08 +0000 Subject: merge revision(s) 29333: * lib/pathname.rb (relative_path_from): backport r23093 and r25440 from ruby_1_9_2. [ruby-core:32415] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/pathname.rb | 11 +++++++++-- version.h | 8 ++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe5b7a869d..2df69679e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 23 17:09:14 2010 NAKAMURA Usaku + + * lib/pathname.rb (relative_path_from): backport r23093 and r25440 + from ruby_1_9_2. [ruby-core:32415] + Mon Nov 22 14:13:45 2010 Masaki Suketa * ext/win32ole/win32ole.c: fix checking version of GCC. diff --git a/lib/pathname.rb b/lib/pathname.rb index 84196355a6..f2791b9823 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -194,6 +194,13 @@ class Pathname # to_path is implemented so Pathname objects are usable with File.open, etc. TO_PATH = :to_path end + + SAME_PATHS = if File::FNM_SYSCASE.nonzero? + proc {|a, b| a.casecmp(b).zero?} + else + proc {|a, b| a == b} + end + # :startdoc: # @@ -719,12 +726,12 @@ class Pathname base_prefix, basename = r base_names.unshift basename if basename != '.' end - if dest_prefix != base_prefix + unless SAME_PATHS[dest_prefix, base_prefix] raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}" end while !dest_names.empty? && !base_names.empty? && - dest_names.first == base_names.first + SAME_PATHS[dest_names.first, base_names.first] dest_names.shift base_names.shift end diff --git a/version.h b/version.h index 32fa909d8e..de238105eb 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2010-11-22" +#define RUBY_RELEASE_DATE "2010-11-23" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20101122 -#define RUBY_PATCHLEVEL 317 +#define RUBY_RELEASE_CODE 20101123 +#define RUBY_PATCHLEVEL 318 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 23 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3