[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ojan at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit c215f92c5241b14a599f1af4272fd3f58e911547
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 00:30:17 2011 +0000

    2011-01-18  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Eric Seidel.
    
            make file expansion use the file at the svn revision the diff was created at
            https://bugs.webkit.org/show_bug.cgi?id=52650
    
            This only works for patches created with SVN for now since the git
            diff does not include SVN revision numbers in it.
    
            * PrettyPatch/PrettyPatch.rb:
            * code-review.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 1c260d1..dd67ea3 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-18  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        make file expansion use the file at the svn revision the diff was created at
+        https://bugs.webkit.org/show_bug.cgi?id=52650
+
+        This only works for patches created with SVN for now since the git
+        diff does not include SVN revision numbers in it.
+
+        * PrettyPatch/PrettyPatch.rb:
+        * code-review.js:
+
 2011-01-15  Adam Barth  <abarth at webkit.org>
 
         Rubber-stamped by Eric Seidel.
diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index fc0f911..1633116 100644
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -409,7 +409,7 @@ body {
 }
 </style>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> 
-<script src="code-review.js?version=24"></script>
+<script src="code-review.js?version=25"></script>
 EOF
 
     def self.revisionOrDescription(string)
@@ -516,6 +516,11 @@ EOF
             else
                 str += @sections.collect{ |section| section.to_html }.join("<br>\n") unless @sections.nil?
             end
+
+            if @from then
+                str += "<span class='revision'>" + @from + "</span>"
+            end
+
             str += "</div>\n"
         end
 
diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index 2daac2d..bdb938e 100644
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -408,6 +408,11 @@
     convertAllFileDiffs(difftype, file_diffs);
   }
 
+  function patchRevision() {
+    var revision = $('.revision');
+    return revision[0] ? revision.first().text() : null;
+  }
+
   function getWebKitSourceFile(file_name, onLoad, expand_bar) {
     function handleLoad(contents) {
       original_file_contents[file_name] = contents.split('\n');
@@ -415,8 +420,11 @@
       onLoad();
     };
 
+    var revision = patchRevision();
+    var queryParameters = revision ? '?p=' + revision : '';
+
     $.ajax({
-      url: WEBKIT_BASE_DIR + file_name,
+      url: WEBKIT_BASE_DIR + file_name + queryParameters,
       context: document.body,
       complete: function(xhr, data) {
               if (xhr.status == 0)
@@ -432,9 +440,6 @@
   }
 
   function handleLoadError(expand_bar) {
-    // FIXME: In this case, try fetching the source file at the revision the patch was created at,
-    // in case the file has bee deleted.
-    // Might need to modify webkit-patch to include that data in the diff.
     replaceExpandLinkContainers(expand_bar, "Can't expand. Is this a new or deleted file?");
   }
 

-- 
WebKit Debian packaging