Merge pull request #16964 from hellcp-work/diff-use-revs

Make use of the revs in the comments to display the right diff

src/api/.rubocop_todo.yml

@@ -106,7 +106,7 @@ Metrics/BlockNesting:
     - 'app/models/bs_request_action.rb'
     - 'lib/xpath_engine.rb'
 
-# Offense count: 85
+# Offense count: 86
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -143,6 +143,7 @@ Metrics/ClassLength:
     - 'app/models/bs_request_permission_check.rb'
     - 'app/models/buildresult.rb'
     - 'app/models/channel.rb'
+    - 'app/models/comment.rb'
     - 'app/models/event/base.rb'
     - 'app/models/event/request.rb'
     - 'app/models/group.rb'

src/api/app/components/bs_request_activity_timeline_component.rb

@@ -26,7 +26,7 @@ def diff_for_ref(comment)
     return unless (ref = comment.diff_ref&.match(/diff_([0-9]+)/))
 
     file_index = ref.captures.first
-    sourcediff = @commented_actions.find(comment.commentable.id).first.webui_sourcediff.first
+    sourcediff = @commented_actions.find(comment.commentable.id).first.webui_sourcediff(rev: comment.source_rev, orev: comment.target_rev).first
     filename = sourcediff.dig('filenames', file_index.to_i)
     sourcediff.dig('files', filename)
   end

src/api/app/components/bs_request_comment_component.html.haml

@@ -52,11 +52,12 @@
           - if diff
             - action = comment.commentable
             .px-3.pt-3.pb-2
-              = link_to request_show_path(number: action.bs_request, request_action_id: action) do
-                = action.uniq_key
+              = link_to(action.uniq_key, request_show_path(number: action.bs_request, request_action_id: action))
               >
               = link_to request_changes_path(number: action.bs_request, request_action_id: action, anchor: comment.diff_ref) do
                 = render(DiffSubjectComponent.new(state: diff['state'], old_filename: diff.dig('old', 'name'), new_filename: diff.dig('new', 'name')))
+              - if comment.outdated?
+                %span.badge.text-bg-warning Outdated
             = render(DiffComponent.new(diff: diff.dig('diff', '_content'), range:))
           - else
             %p.border-bottom.fst-italic.px-3.pt-3.pb-2

src/api/app/controllers/webui/comments_controller.rb

@@ -175,9 +175,8 @@ def diff
     return unless @comment.root.commentable_type == 'BsRequestAction' && @comment.root.diff_ref
     return unless (ref = @comment.root.diff_ref&.match(/diff_([0-9]+)/))
 
-    diffs = @comment.root.commentable.bs_request.webui_actions(action_id: @comment.root.commentable_id, diffs: true, cacheonly: 1).first
+    sourcediff = @comment.root.commentable.webui_sourcediff(rev: @comment.root.source_rev, orev: @comment.root.target_rev).first
     file_index = ref.captures.first
-    sourcediff = diffs[:sourcediff].first
     filename = sourcediff.dig('filenames', file_index.to_i)
     sourcediff.dig('files', filename)
   end

src/api/app/models/bs_request_action/differ/for_source.rb

@@ -43,7 +43,7 @@ def diff(source_package_name)
       end
 
       def query
-        query = {}
+        query = options.slice(:rev, :orev).compact
         query[:view] = :xml if options[:view].to_s == 'xml'
         query[:withissues] = 1 if options[:withissues].present?
         if options[:nodiff].present?

src/api/app/models/bs_request_action_submit.rb

@@ -170,6 +170,14 @@ def forward
     forward_object
   end
 
+  def source_srcmd5
+    source_package_object&.dir_hash({ rev: source_rev }.compact)&.[]('srcmd5')
+  end
+
+  def target_srcmd5
+    target_package_object&.dir_hash&.[]('srcmd5')
+  end
+
   #### Alias of methods
 end
 

src/api/app/models/comment.rb

@@ -83,6 +83,20 @@ def body
     super
   end
 
+  def revisions?
+    return false if diff_ref.blank?
+    return false if source_rev.nil? || target_rev.nil?
+
+    true
+  end
+
+  def outdated?
+    return false unless revisions?
+    return true unless commentable.target_srcmd5 == target_rev && commentable.source_srcmd5 == source_rev
+
+    false
+  end
+
   private
 
   def create_event