[Findit] Improve output format and cherry-pick bugs fix.

tools/findit/findit_for_crash.py

 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 from threading import Lock, Thread
 
 import blame
 from common import utils
 import component_dictionary
@@ skipping 438 matching lines @@
     for i in range(len(match_by_priority)):
       (priority, crashed_line_numbers, file_name, stack_frame_indices,
        function_list) = match_by_priority[i]
 
       # If the file in the match is a line change, append a explanation.
       if priority == LINE_CHANGE_PRIORITY:
         crashed_line_numbers = [crashed_line_number
                                 for lines in crashed_line_numbers
                                 for crashed_line_number in lines]
         reason.append(
-            'Line %s of file %s which potentially caused the crash '
-            'according to the stacktrace, is changed in this cl'
-            ' (From stack frame %s, function %s).' %
-            (crash_utils.PrettifyList(crashed_line_numbers),
+            'Lines %s of file %s which potentially caused crash '
+            'are changed in this cl (%s).\n' %
+            (utils.JoinLineNumbers(crashed_line_numbers, accepted_gap=4),
              file_name,
-             crash_utils.PrettifyList(stack_frame_indices),
-             crash_utils.PrettifyList(function_list)))
+             crash_utils.PrettifyFrameInfo(stack_frame_indices, function_list)))
 
       else:
         # Get all the files that are not line change.
         rest_of_the_files = match_by_priority[i:]
 
         if len(rest_of_the_files) == 1:
           file_string = 'File %s is changed in this cl '
         else:
           file_string = 'Files %s are changed in this cl '
 
         # Create a list of file names, and prettify the list.
         file_names = [
             file_name for (_, _, file_name, _, _) in rest_of_the_files]
         pretty_file_names = crash_utils.PrettifyList(file_names)
 
         # Add the reason, break because we took care of the rest of the files.
-        file_string += ('(From stack frames %s, functions %s)' %
-                        (crash_utils.PrettifyList(stack_frame_indices),
-                         crash_utils.PrettifyList(function_list)))
+        file_string += '(%s)' % crash_utils.PrettifyFrameInfo(
+            stack_frame_indices, function_list)
         reason.append(file_string % pretty_file_names)
         break
 
     # Set the reason as string.
     match.reason = '\n'.join(reason)
 
 
 def CombineMatches(matches):
   """Combine possible duplicates in matches.
 
@@ skipping 23 matching lines @@
     # Combine the reason if the current match is already in there.
     found_match.reason += match.reason
     if match.min_distance < found_match.min_distance:
       found_match.min_distance = match.min_distance
       found_match.min_distance_info = match.min_distance_info
 
   for stack_index, cl, match in combined_matches:
     if match.min_distance_info:
       file_name, min_crashed_line, min_changed_line = match.min_distance_info
       match.reason += \
-          ('\nMininimum distance from crashed line to changed line: %d. '
-           '(File: %s, Crashed on: %d, Changed: %d).' %
+          ('Minimum distance from crashed line to changed line: %d. '
+           '(File: %s, Crashed on: %d, Changed: %d).\n' %
            (match.min_distance, file_name, min_crashed_line, min_changed_line))
 
   return combined_matches
 
 
 def FilterAndGenerateReasonForMatches(result):
   """A wrapper function.
 
   It generates reasons for the matches and returns string representation
   of filtered results.
@@ skipping 135 matching lines @@
         'the blame information.')
 
   # When findit could not find any CL that changes file in stacktrace or if
   # if cannot get any blame information, return a message saying that no
   # results are available.
   else:
     return_message = ('Findit could not find any suspected CLs.')
 
   return (return_message, result)