Ticket #2591: detect_big_changesets.2.patch

trac/db_default.py

@@ -436 +436 @@
   ('timeline', 'default_daysback', '30'),
   ('timeline', 'changeset_show_files', '0'),
   ('timeline', 'ticket_show_details', 'false'),
+  ('changeset', 'max_diff_files', '1000'),
+  ('changeset', 'max_diff_bytes', '100000'),
   ('browser', 'hide_properties', 'svk:merge'),
   ('wiki', 'ignore_missing_pages', 'false'),
 )

trac/versioncontrol/web_ui/changeset.py

@@ -370 +370 @@
                         del changed_props[k]
             return changed_props
 
+        def _estimate_changes(old_node, new_node):
+            old_size = old_node.get_content_length()
+            new_size = new_node.get_content_length()
+            return abs(old_size - new_size)
+
         mimeview = Mimeview(self.env)
 
         def _content_changes(old_node, new_node):
@@ -409 +414 @@
             else:
                 return []
 
+        max_diff_bytes = int(self.config.get('changeset', 'max_diff_bytes'))
+        max_diff_files = int(self.config.get('changeset', 'max_diff_files'))
+        diff_bytes = diff_files = 0
+        if max_diff_bytes or max_diff_files:
+            for old_node, new_node, kind, change in get_changes():
+                if change == Changeset.EDIT and kind == Node.FILE:
+                    diff_files += 1
+                    diff_bytes += _estimate_changes(old_node, new_node)
+        show_diffs = (not max_diff_files or diff_files <= max_diff_files) and \
+                     (not max_diff_bytes or diff_bytes <= max_diff_bytes or \
+                      diff_files == 1)                      
+                
         idx = 0
         for old_node, new_node, kind, change in get_changes():
             if change != Changeset.EDIT:
@@ -420 +437 @@
                 if props:
                     req.hdf['changeset.changes.%d.props' % idx] = props
                     show_entry = True
-                if kind == Node.FILE:
+                if kind == Node.FILE and show_diffs:
                     diffs = _content_changes(old_node, new_node)
                     if diffs != []:
                         if diffs:
                             req.hdf['changeset.changes.%d.diff' % idx] = diffs
                         # elif None (means: manually compare to (previous))
                         show_entry = True
-            if show_entry:
+            if show_entry or not show_diffs:
                 info = _change_info(old_node, new_node, change)
+                if change == Changeset.EDIT and not show_diffs:
+                    if chgset:
+                        diff_href = self.env.href.changeset(new_node.rev,
+                                                            new_node.path)
+                    else:
+                        diff_href = self.env.href.changeset(
+                            new_node.created_rev, new_node.created_path,
+                            old=old_node.created_rev,
+                            old_path=old_node.created_path)
+                    info['diff_href'] = diff_href                        
                 req.hdf['changeset.changes.%d' % idx] = info
             idx += 1 # the sequence should be immutable
 

templates/changeset.cs

@@ -136 +136 @@
     var:item.browser_href.old ?>" title="Show original file (rev. <?cs
     var:item.rev.old ?>)"><?cs var:item.path.old ?></a>)</em></small><?cs
   /if ?><?cs
-  if:$ndiffs + $nprops > #0 ?>
+  if:item.diff_href ?>
+    (<a href="<?cs var:item.diff_href ?>" title="Show differences">full diff</a>)<?cs
+  elif:$ndiffs + $nprops > #0 ?>
     (<a href="#file<?cs var:name(item) ?>" title="Show differences"><?cs
       if:$ndiffs > #0 ?><?cs var:ndiffs ?>&nbsp;diff<?cs if:$ndiffs > #1 ?>s<?cs /if ?><?cs 
       /if ?><?cs