Changeset 34175 in webkit

Timestamp:

May 28, 2008 10:31:37 AM (16 years ago)

Author:

Adam Roben

Message:

Make PrettyPatch able to handle diffs taken from outside the WebKit source tree

Part of Bug 19290: More patches not handled by PrettyPatch.rb
<​https://bugs.webkit.org/show_bug.cgi?id=19290>

Reviewed by David Kilzer.

• PrettyPatch/PrettyPatch.rb: (PrettyPatch.find_url_and_path): Added. Searches the file path from the bottom up looking for a directory that exists in the source tree. (PrettyPatch.linkifyFilename): Changed to call find_url_and_path.

Location:

trunk/BugsSite

Files:

• ChangeLog (modified) (1 diff)
• PrettyPatch/PrettyPatch.rb (modified) (1 diff)

trunk/BugsSite/ChangeLog

@@ +1 @@
+2008-05-28  Adam Roben  <aroben@apple.com>
+
+        Make PrettyPatch able to handle diffs taken from outside the WebKit
+        source tree
+
+        Part of Bug 19290: More patches not handled by PrettyPatch.rb
+        <https://bugs.webkit.org/show_bug.cgi?id=19290>
+
+        Reviewed by David Kilzer.
+
+        * PrettyPatch/PrettyPatch.rb:
+        (PrettyPatch.find_url_and_path): Added. Searches the file path from
+        the bottom up looking for a directory that exists in the source tree.
+        (PrettyPatch.linkifyFilename): Changed to call find_url_and_path.
+
 2008-05-28  Adam Roben  <aroben@apple.com>
 

trunk/BugsSite/PrettyPatch/PrettyPatch.rb

@@ -62 +62 @@
     ]
 
+    def self.find_url_and_path(file_path)
+        # Search file_path from the bottom up, at each level checking whether
+        # we've found a directory we know exists in the source tree.
+
+        dirname, basename = File.split(file_path)
+        dirname.split(/\//).reverse.inject(basename) do |path, directory|
+            path = directory + "/" + path
+
+            return [OPENSOURCE_TRAC_URL, path] if OPENSOURCE_DIRS.include?(directory)
+
+            path
+        end
+
+        [nil, file_path]
+    end
+
     def self.linkifyFilename(filename)
-        directory = /^([^\/]+)/.match(filename)[1]
-        url, pathBeneathTrunk = if filename =~ /\bOpenSource\// then
-                                    [OPENSOURCE_TRAC_URL, filename.gsub(/^.*\bOpenSource\//, '')]
-                                elsif OPENSOURCE_DIRS.include?(directory) then
-                                    [OPENSOURCE_TRAC_URL, filename]
-                                else
-                                    [nil, nil]
-                                end
+        url, pathBeneathTrunk = find_url_and_path(filename)
 
         url.nil? ? filename : "<a href='#{url}browser/trunk/#{pathBeneathTrunk}'>#{filename}</a>"