Browse files

* tool/file2lastrev.rb (VCS::detect): Add support for Subversion

  1.7 which adopted a whole new working directory structure.

* tool/file2lastrev.rb (VCS::detect): Simply use .each instead of
  .sort.reverse_each which looks too arbitrary.	 If you want SVN
  to be tried first, then you just have to register it first as it
  is right now.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 432a992 commit c093401b0e81f3b6d58a623f75a77a90f6e86fcb @knu knu committed Jan 2, 2012
Showing with 20 additions and 3 deletions.
  1. +10 −0 ChangeLog
  2. +10 −3 tool/file2lastrev.rb
View
10 ChangeLog
@@ -1,3 +1,13 @@
+Mon Jan 2 22:08:00 2012 Akinori MUSHA <knu@iDaemons.org>
+
+ * tool/file2lastrev.rb (VCS::detect): Add support for Subversion
+ 1.7 which adopted a whole new working directory structure.
+
+ * tool/file2lastrev.rb (VCS::detect): Simply use .each instead of
+ .sort.reverse_each which looks too arbitrary. If you want SVN
+ to be tried first, then you just have to register it first as it
+ is right now.
+
Mon Jan 2 20:53:36 2012 Tanaka Akira <akr@fsij.org>
* lib/securerandom.rb (random_bytes): use IO#read instead of
View
13 tool/file2lastrev.rb
@@ -22,8 +22,15 @@ def self.register(dir)
end
def self.detect(path)
- @@dirs.sort.reverse_each do |dir, klass|
- return klass.new(path) if File.directory?("#{path}/#{dir}")
+ @@dirs.each do |dir, klass|
+ return klass.new(path) if File.directory?(File.join(path, dir))
+ prev = path
+ loop {
+ curr = File.realpath(File.join(prev, '..'))
+ break if curr == prev # stop at the root directory
+ return klass.new(path) if File.directory?(File.join(curr, dir))
+ prev = curr
+ }
end
raise VCS::NotFoundError, "does not seem to be under a vcs: #{path}"
end
@@ -127,7 +134,7 @@ def self.output=(output)
}
parser.parse! rescue abort "#{File.basename(Program)}: #{$!}\n#{parser}"
-srcdir = srcdir ? srcdir : File.dirname(File.dirname(Program))
+srcdir ||= File.dirname(File.dirname(Program))
begin
vcs = VCS.detect(srcdir)
rescue VCS::NotFoundError => e

0 comments on commit c093401

Please sign in to comment.