コミット: d2beb7ff63ffabf54b309f2d0fda241ade19e97e - allura (git)

allura

コミットメタ情報

• リビジョン: d2beb7ff63ffabf54b309f2d0fda241ade19e97e (tree)
• 日時: 2010-06-23 01:18:28
• 作者: Rick Copeland <rcopeland@geek...>
• コミッター: Rick Copeland

ログメッセージ

[#574] - Diff based on words, not characters

変更サマリ

• modified: pyforge/pyforge/lib/custom_middleware.py
• modified: pyforge/pyforge/lib/helpers.py

差分

--- a/pyforge/pyforge/lib/custom_middleware.py
+++ b/pyforge/pyforge/lib/custom_middleware.py
@@ -8,6 +8,7 @@ import tg
 import pylons
 import pkg_resources
 from paste import fileapp
+from paste.deploy.converters import asbool
 from pylons.util import call_wsgi_application
 from tg.controllers import DecoratedController
 from webob import exc, Request
@@ -177,6 +178,7 @@ class StatsMiddleware(object):
         self.active = False
         try:
             self.sample_rate = config.get('stats.sample_rate', 0.25)
+            self.debug = asbool(config.get('debug', 'false'))
             self.instrument_pymongo()
             self.instrument_template()
             self.active = True
@@ -205,7 +207,7 @@ class StatsMiddleware(object):
         req = Request(environ)
         req.environ['sf.stats'] = s = StatsRecord(req, random() < self.sample_rate)
         with s.timing('total'):
-            resp = req.get_response(self.app)
+            resp = req.get_response(self.app, catch_exc_info=self.debug)
             result = resp(environ, start_response)
         if s.active:
             self.log.info('Stats: %r', s)

--- a/pyforge/pyforge/lib/helpers.py
+++ b/pyforge/pyforge/lib/helpers.py
@@ -243,17 +243,19 @@ def absurl(url):
     return request.scheme + '://' + request.host + url
 
 def diff_text(t1, t2, differ=None):
+    t1_words = re.split(' ', t1)
+    t2_words = re.split(' ', t2)
     if differ is None:
-        differ = difflib.SequenceMatcher(None, t1, t2)
+        differ = difflib.SequenceMatcher(None, t1_words, t2_words)
     result = []
     for tag, i1, i2, j1, j2 in differ.get_opcodes():
         if tag in ('delete', 'replace'):
-            result += [ '<del>', t1[i1:i2], '</del>' ]
+            result += [ '<del>' ] + t1_words[i1:i2] + [ '</del>' ]
         if tag in ('insert', 'replace'):
-            result += [ '<ins>', t2[j1:j2], '</ins>' ]
+            result += [ '<ins>' ] + t2_words[j1:j2] + [ '</ins>' ]
         if tag == 'equal':
-            result += t1[i1:i2]
-    return ''.join(result).replace('\n', '<br/>\n')
+            result += t1_words[i1:i2]
+    return ' '.join(result).replace('\n', '<br/>\n')
 
 def diff_text_genshi(t1, t2):
     Markup = genshi.Markup