Changeset 9900

Timestamp:

05/22/2020 05:52:27 AM (6 years ago)

Author:

dd32

Message:

Trac: When a PR is added to a ticket, toggle the has-patch/needs-patch/needs-refresh and needs-unit-tests/has-unit-tests if it touches a tests-looking directory.

Fixes #5080.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/dotorg/trac/pr/functions.php (modified) (2 diffs)
• api.wordpress.org/public_html/dotorg/trac/pr/webhook.php (modified) (2 diffs)
• trac.wordpress.org/templates/ticket_change.html (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php

@@ -59 +59 @@
         }
 
+        $touches_tests = false;
+        $_files = api_request(
+                '/repos/' . $repo . '/pulls/' . intval( $pr ) . '/files?per_page=999',
+                null,
+                [ 'Accept: application/vnd.github.antiope-preview+json' ]
+        );
+        foreach ( $_files as $f ) {
+                if ( preg_match( '!(^tests/|/tests/)!', $f->filename ) ) {
+                        $touches_tests = true;
+                        break;
+                }
+        }
+
         return (object) [
                 'repo'            => $data->base->repo->full_name,
@@ -71 +84 @@
                 'check_runs'      => $check_runs,
                 'reviews'         => $reviews,
+                'touches_tests'   => $touches_tests,
                 'body'            => $data->body,
                 'user'            => (object) [

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/webhook.php

@@ -83 +83 @@
 
                         $pr_description = format_pr_desc_for_trac_comment( $pr_data );
+                        $attributes     = [];
+
+                        // Update ticket keywords if possible.
+                        $ticket = $trac->get( $pr_data->trac_ticket[1] );
+                        if ( $ticket ) {
+                                $keywords = preg_split( '![,\s]+!', $ticket['keywords'] );
+
+                                // Remove needs-patch
+                                if ( false !== ( $key = array_search( 'needs-patch', $keywords ) ) ) {
+                                        unset( $keywords[ $key ] );
+                                }
+                                if ( false !== ( $key = array_search( 'needs-refresh', $keywords ) ) ) {
+                                        unset( $keywords[ $key ] );
+                                }
+
+                                // Add has-patch if not already there.
+                                if ( false === array_search( 'has-patch', $keywords ) ) {
+                                        $keywords[] = 'has-patch';
+                                }
+
+                                if ( $pr_data->touches_tests ) {
+                                        if ( false !== ( $key = array_search( 'needs-unit-tests', $keywords ) ) ) {
+                                                unset( $keywords[ $key ] );
+                                        }
+                                        if ( false === array_search( 'has-unit-tests', $keywords ) ) {
+                                                $keywords[] = 'has-unit-tests';
+                                        }
+                                }
+
+                                $attributes['keywords'] = implode( ' ', $keywords );
+                        }
 
                         $trac->update(
@@ -90 +121 @@
                                         "by [{$pr_data->user->url} {$pr_data->user->name}].''" .
                                         ( $pr_description ? "\n{$pr_description}" : '' ),
-                                [],  // Attributes changed
+                                $attributes,  // Attributes changed
                                 true // Notify
                         );

sites/trunk/trac.wordpress.org/templates/ticket_change.html

@@ -59 +59 @@
            pr_byline   = change.comment.partition('\n')[0];
            pr_comment  = ''.join(change.comment.partition('\n')[1:]) or False;
-           prbot_class = 'prbot with-context' if pr_comment else 'prbot without-context';
+           prbot_class = 'prbot with-context' if pr_comment or change.fields else 'prbot without-context';
          ">
   <h3 class="change chat-bot ${prbot_class}">
@@ -70 +70 @@
     </span>
   </h3>
+  <ul py:if="change.fields" class="changes">
+    <li py:for="field_name, field in sorted(change.fields.iteritems(), key=lambda item: item[1].label.lower())"
+        class="trac-field-${field_name}">
+      <strong class="trac-field-${field_name}">${field.label}</strong>
+      <py:choose>
+        <py:when test="'rendered' in field">${field.rendered}</py:when>
+        <py:when test="field.old and field.new"><i18n:msg params="old, new">
+          changed from <em>${field.old}</em> to <em>${field.new}</em>
+        </i18n:msg></py:when>
+        <py:when test="not field.old and field.new"><i18n:msg params="value">
+          set to <em>${field.new}</em>
+        </i18n:msg></py:when>
+        <py:otherwise><i18n:msg params="value">
+          <em>${field.old}</em> deleted
+        </i18n:msg></py:otherwise>
+      </py:choose>
+    </li>
+  </ul>
   <div py:if="pr_comment" class="comment searchable" xml:space="preserve">
     ${wiki_to_html(context, pr_comment, escape_newlines=preserve_newlines)}