Rev 1708: (jam) Updates to PatienceDiff for performance,
and other cleanups. in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue May 30 00:15:17 BST 2006
------------------------------------------------------------
revno: 1708
revision-id: pqm at pqm.ubuntu.com-20060529231516-cad98b5042ea75f3
parent: pqm at pqm.ubuntu.com-20060525225841-625f0ece2f64af43
parent: john at arbash-meinel.com-20060529011743-03c33eb3373932b6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-05-30 00:15:16 +0100
message:
(jam) Updates to PatienceDiff for performance, and other cleanups.
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/patiencediff.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/textmerge.py textmerge.py-20060408064938-a5d5c009e64a3a25
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
patience-test.py patiencetest.py-20060522202704-p82o0dg5f1qf99ry-1
------------------------------------------------------------
merged: john at arbash-meinel.com-20060529011743-03c33eb3373932b6
parent: john at arbash-meinel.com-20060529010030-f3f00c67bbea7e16
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 20:17:43 -0500
message:
Update the merge3 tests, so that they test more realistic data on 'minimal_conflicts'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060529010030-f3f00c67bbea7e16
parent: john at arbash-meinel.com-20060529005836-edcca3f46afe0d07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 20:00:30 -0500
message:
Late bind to PatienceSequenceMatcher to allow plugin to override.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060529005836-edcca3f46afe0d07
parent: john at arbash-meinel.com-20060529005034-87b3376c2f5e6fa9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 19:58:36 -0500
message:
Late bind to PatienceSequenceMatcher in merge3.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060529005034-87b3376c2f5e6fa9
parent: john at arbash-meinel.com-20060528233602-1536ce045ece58a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 19:50:34 -0500
message:
Passing the alo parameter to recurse_matches shaves of 5% of the diff time.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060528233602-1536ce045ece58a2
parent: john at arbash-meinel.com-20060528231641-374e90dcfa9cde5b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 18:36:02 -0500
message:
Cleanup patiencediff, remove the use of difflib.SequenceMatcher.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060528231641-374e90dcfa9cde5b
parent: john at arbash-meinel.com-20060528220033-c5baec1556ac120a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 18:16:41 -0500
message:
Late bind to patiencediff objects to make it easier to plug-in
------------------------------------------------------------
merged: john at arbash-meinel.com-20060528220033-c5baec1556ac120a
parent: john at arbash-meinel.com-20060528214906-6de0cc9e8fa8870d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 17:00:33 -0500
message:
switch patience-test to use PatienceSequenceMatcher.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060528214906-6de0cc9e8fa8870d
parent: john at arbash-meinel.com-20060528140552-4830bfec3c4140aa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 16:49:06 -0500
message:
Optimize common case where unique_lcs returns a set of lines all in a row
------------------------------------------------------------
merged: john at arbash-meinel.com-20060528140552-4830bfec3c4140aa
parent: john at arbash-meinel.com-20060526232244-1f737c20f1886828
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sun 2006-05-28 09:05:52 -0500
message:
Small cleanups to patience_diff code.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060526232244-1f737c20f1886828
parent: john at arbash-meinel.com-20060526232127-62cce7c4145343d2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-05-26 18:22:44 -0500
message:
test_diff needs a copyright statement
------------------------------------------------------------
merged: john at arbash-meinel.com-20060526232127-62cce7c4145343d2
parent: john at arbash-meinel.com-20060526220448-4a07f19f8e2c1fa7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-05-26 18:21:27 -0500
message:
Found a couple CDV left
------------------------------------------------------------
merged: john at arbash-meinel.com-20060526220448-4a07f19f8e2c1fa7
parent: john at arbash-meinel.com-20060526220303-09748df2440619dd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-05-26 17:04:48 -0500
message:
Fix merge2 to use PatienceSequenceMatcher
------------------------------------------------------------
merged: john at arbash-meinel.com-20060526220303-09748df2440619dd
parent: john at arbash-meinel.com-20060526220139-5270bdfcb0e2b636
parent: pqm at pqm.ubuntu.com-20060525225841-625f0ece2f64af43
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-05-26 17:03:03 -0500
message:
[merge] bzr.dev 1732
------------------------------------------------------------
merged: john at arbash-meinel.com-20060526220139-5270bdfcb0e2b636
parent: john at arbash-meinel.com-20060525142524-12593e5c91c5c6e7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-05-26 17:01:39 -0500
message:
Make a mention when the maximum recursion length is reached.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060525142524-12593e5c91c5c6e7
parent: john at arbash-meinel.com-20060525142135-dc0e553ddac1661f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-05-25 09:25:24 -0500
message:
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
------------------------------------------------------------
merged: john at arbash-meinel.com-20060525142135-dc0e553ddac1661f
parent: john at arbash-meinel.com-20060525141224-ac6259f21ef033f6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-05-25 09:21:35 -0500
message:
Clarify the patience tests a little bit.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060525141224-ac6259f21ef033f6
parent: john at arbash-meinel.com-20060525141112-ed145a0091a9210d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-05-25 09:12:24 -0500
message:
Rename cdv => patience
------------------------------------------------------------
merged: john at arbash-meinel.com-20060525141112-ed145a0091a9210d
parent: john at arbash-meinel.com-20060525140223-e89bcb2f396d02f5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-05-25 09:11:12 -0500
message:
rot13 the code snippet to help with clarity.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060525140223-e89bcb2f396d02f5
parent: john at arbash-meinel.com-20060524162115-c1c08a60006ace0d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-05-25 09:02:23 -0500
message:
Override get_matching_blocks
More information about the bazaar-commits
mailing list