kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/pathname.rb (Pathname#relative_path_from): compares path

Browse source 
components according to system default case-sensitiveness.
  [ruby-core:22829]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-28 23:59:28 +00:00
parent c79e8ba065
commit 896db7d625
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Mar 29 08:59:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/pathname.rb (Pathname#relative_path_from): compares path
components according to system default case-sensitiveness.
[ruby-core:22829]
Sat Mar 28 11:10:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Mar 28 11:10:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (ruby.imp): all symbols in static library need to be * common.mk (ruby.imp): all symbols in static library need to be

11
lib/pathname.rb
View file

@ -197,6 +197,13 @@ class Pathname
# to_path is implemented so Pathname objects are usable with File.open, etc. # to_path is implemented so Pathname objects are usable with File.open, etc.
TO_PATH = :to_path TO_PATH = :to_path
end end
SAME_PATHS = if File::FNM_SYSCASE
proc {|a, b| a.casecmp(b).zero?}
else
proc {|a, b| a == b}
end
# :startdoc: # :startdoc:
# #
@ -786,12 +793,12 @@ class Pathname
base_prefix, basename = r base_prefix, basename = r
base_names.unshift basename if basename != '.' base_names.unshift basename if basename != '.'
end end
if dest_prefix != base_prefix unless SAME_PATHS[dest_prefix, base_prefix]
raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}" raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}"
end end
while !dest_names.empty? && while !dest_names.empty? &&
!base_names.empty? && !base_names.empty? &&
dest_names.first == base_names.first SAME_PATHS[dest_names.first, base_names.first]
dest_names.shift dest_names.shift
base_names.shift base_names.shift
end end

4
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2009-03-28" #define RUBY_RELEASE_DATE "2009-03-29"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 28 #define RUBY_RELEASE_DAY 29
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];