[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 3a5dae87b15a6774c39539f7d939d2f1d508ddf1
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 00:58:50 2011 +0000

    2011-01-20  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Oliver Hunt.
    
            Could review tool include style failure info?
            https://bugs.webkit.org/show_bug.cgi?id=49049
    
            This does not handle patches that have old paths (e.g. without the Source prefix).
            Although that would be fairly straightforward to workaround.
    
            * code-review.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76310 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 3e16960..ee88f28 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-20  Ojan Vafai  <ojan at chromium.org>
 
+        Reviewed by Oliver Hunt.
+
+        Could review tool include style failure info?
+        https://bugs.webkit.org/show_bug.cgi?id=49049
+
+        This does not handle patches that have old paths (e.g. without the Source prefix).
+        Although that would be fairly straightforward to workaround.
+
+        * code-review.js:
+
+2011-01-20  Ojan Vafai  <ojan at chromium.org>
+
         Reviewed by Adam Barth.
 
         handle cases where PrettyPatch.rb doesn't linkify filenames
diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index 203f213..b103819 100644
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -417,7 +417,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=27"></script>
+<script src="code-review.js?version=28"></script>
 EOF
 
     def self.revisionOrDescription(string)
diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index ffa251d..45b4bc8 100644
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -201,6 +201,33 @@
     $('#message .commentStatus').text('This patch has ' + descriptor + '.  Scroll through them with the "n" and "p" keys. ' + help_text);
   }
 
+  function scanForStyleQueueComments(text) {
+    var comments = []
+    var lines = text.split('\n');
+    for (var i = 0; i < lines.length; ++i) {
+      var parts = lines[i].match(/^([^:]+):(-?\d+):(.*)$/);
+      if (!parts)
+        continue;
+
+      var file_name = parts[1];
+      var line_number = parts[2];
+      var comment_text = parts[3].trim();
+
+      if (!file_name in files) {
+        console.log('Filename in style queue output is not in the patch: ' + file_name);
+        continue;
+      }
+
+      comments.push({
+        'author': 'StyleQueue',
+        'file_name': file_name,
+        'line_number': line_number,
+        'comment_text': comment_text
+      });
+    }
+    return comments;
+  }
+
   function scanForComments(author, text) {
     var comments = []
     var lines = text.split('\n');
@@ -290,9 +317,14 @@
         $(data).find('.bz_comment').each(function() {
           var author = $(this).find('.email').text();
           var text = $(this).find('.bz_comment_text').text();
+
           var comment_marker = '(From update of attachment ' + attachment_id + ' .details.)';
           if (text.match(comment_marker))
             $.merge(comments, scanForComments(author, text));
+
+          var style_queue_comment_marker = 'Attachment ' + attachment_id + ' .details. did not pass style-queue.'
+          if (text.match(style_queue_comment_marker))
+            $.merge(comments, scanForStyleQueueComments(text));
         });
         displayPreviousComments(comments);
       });

-- 
WebKit Debian packaging