Merge "Refactor diffs"

diff --cc includes/AutoLoader.php
index 29d2209,ce98d7b..f73f24b
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -490,36 -530,22 +490,36 @@@ $wgAutoloadLocalClasses = array
        # includes/debug
        'MWDebug' => 'includes/debug/Debug.php',
  
 +      # includes/deferred
 +      'DataUpdate' => 'includes/deferred/DataUpdate.php',
 +      'DeferrableUpdate' => 'includes/deferred/DeferredUpdates.php',
 +      'DeferredUpdates' => 'includes/deferred/DeferredUpdates.php',
 +      'HTMLCacheUpdate' => 'includes/deferred/HTMLCacheUpdate.php',
 +      'LinksDeletionUpdate' => 'includes/deferred/LinksUpdate.php',
 +      'LinksUpdate' => 'includes/deferred/LinksUpdate.php',
 +      'MWCallableUpdate' => 'includes/deferred/CallableUpdate.php',
 +      'SearchUpdate' => 'includes/deferred/SearchUpdate.php',
 +      'SiteStatsUpdate' => 'includes/deferred/SiteStatsUpdate.php',
 +      'SqlDataUpdate' => 'includes/deferred/SqlDataUpdate.php',
 +      'SquidUpdate' => 'includes/deferred/SquidUpdate.php',
 +      'ViewCountUpdate' => 'includes/deferred/ViewCountUpdate.php',
 +
        # includes/diff
-       '_DiffEngine' => 'includes/diff/DairikiDiff.php',
-       '_DiffOp' => 'includes/diff/DairikiDiff.php',
-       '_DiffOp_Add' => 'includes/diff/DairikiDiff.php',
-       '_DiffOp_Change' => 'includes/diff/DairikiDiff.php',
-       '_DiffOp_Copy' => 'includes/diff/DairikiDiff.php',
-       '_DiffOp_Delete' => 'includes/diff/DairikiDiff.php',
-       '_HWLDF_WordAccumulator' => 'includes/diff/DairikiDiff.php',
-       'ArrayDiffFormatter' => 'includes/diff/DairikiDiff.php',
+       'DiffEngine' => 'includes/diff/DairikiDiff.php',
+       'DiffOp' => 'includes/diff/DairikiDiff.php',
+       'DiffOp_Add' => 'includes/diff/DairikiDiff.php',
+       'DiffOp_Change' => 'includes/diff/DairikiDiff.php',
+       'DiffOp_Copy' => 'includes/diff/DairikiDiff.php',
+       'DiffOp_Delete' => 'includes/diff/DairikiDiff.php',
+       'HWLDF_WordAccumulator' => 'includes/diff/DairikiDiff.php',
+       'ArrayDiffFormatter' => 'includes/diff/ArrayDiffFormatter.php',
        'Diff' => 'includes/diff/DairikiDiff.php',
        'DifferenceEngine' => 'includes/diff/DifferenceEngine.php',
-       'DiffFormatter' => 'includes/diff/DairikiDiff.php',
+       'DiffFormatter' => 'includes/diff/DiffFormatter.php',
        'MappedDiff' => 'includes/diff/DairikiDiff.php',
        'RangeDifference' => 'includes/diff/WikiDiff3.php',
-       'TableDiffFormatter' => 'includes/diff/DairikiDiff.php',
-       'UnifiedDiffFormatter' => 'includes/diff/DairikiDiff.php',
+       'TableDiffFormatter' => 'includes/diff/TableDiffFormatter.php',
+       'UnifiedDiffFormatter' => 'includes/diff/UnifiedDiffFormatter.php',
        'WikiDiff3' => 'includes/diff/WikiDiff3.php',
        'WordLevelDiff' => 'includes/diff/DairikiDiff.php',