[rietveld] 2 new revisions pushed by maruel@chromium.org on 2012-11-02 19:50 GMT

[riet...@googlecode.com]

2 new revisions:

Revision: cf2ff50d3c55
Branch: default
Author: Marc-Antoine Ruel <mar...@chromium.org>
Date: Fri Nov 2 12:50:00 2012
Log: Fixes issue 158736: use the pseudo-patience sequence matcher only
for ...
http://code.google.com/p/rietveld/source/detail?r=cf2ff50d3c55

Revision: 5031f8ba45c4
Branch: chromium
Author: Marc-Antoine Ruel <mar...@chromium.org>
Date: Fri Nov 2 12:50:40 2012
Log: Merge default @ cf2ff50d3c55
http://code.google.com/p/rietveld/source/detail?r=5031f8ba45c4

==============================================================================
Revision: cf2ff50d3c55
Branch: default
Author: Marc-Antoine Ruel <mar...@chromium.org>
Date: Fri Nov 2 12:50:00 2012
Log: Fixes issue 158736: use the pseudo-patience sequence matcher only
for full
lines.

BUG=http://crbug.com/158736

Author: Marc-Antoine Courteau <macou...@chromium.org

Review: https://codereview.appspot.com/6816065/
http://code.google.com/p/rietveld/source/detail?r=cf2ff50d3c55

Modified:
/codereview/engine.py
/codereview/intra_region_diff.py

=======================================
--- /codereview/engine.py Fri Oct 12 12:34:31 2012
+++ /codereview/engine.py Fri Nov 2 12:50:00 2012
@@ -16,7 +16,6 @@

import cgi
import difflib
-import patiencediff
import re

from google.appengine.api import users
@@ -260,7 +259,7 @@
difflib.SequenceMatchser.get_opcodes(), and old_slice and new_slice
are lists of lines taken from old_lines and new_lines.
"""
- sm = patiencediff.PseudoPatienceSequenceMatcher(None, old_lines,
new_lines)
+ sm = difflib.SequenceMatcher(None, old_lines, new_lines)
for tag, i1, i2, j1, j2 in sm.get_opcodes():
yield tag, old_lines[i1:i2], new_lines[j1:j2]

=======================================
--- /codereview/intra_region_diff.py Fri Oct 12 12:34:31 2012
+++ /codereview/intra_region_diff.py Fri Nov 2 12:50:00 2012
@@ -44,7 +44,6 @@

import cgi
import difflib
-import patiencediff
import re

# Tag to begin a diff chunk.
@@ -292,7 +291,7 @@

a = re.findall(exp, line1, re.U)
b = re.findall(exp, line2, re.U)
- s = patiencediff.PseudoPatienceSequenceMatcher(None, a, b)
+ s = difflib.SequenceMatcher(None, a, b)
matching_blocks = s.get_matching_blocks()
ratio = s.ratio()
# Don't show intra region diffs if both lines are too different and
there is

==============================================================================
Revision: 5031f8ba45c4
Branch: chromium
Author: Marc-Antoine Ruel <mar...@chromium.org>
Date: Fri Nov 2 12:50:40 2012
Log: Merge default @ cf2ff50d3c55
http://code.google.com/p/rietveld/source/detail?r=5031f8ba45c4