Rev 1702: Use Patience sequence matcher for diff and merge3 in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue May 23 15:14:56 BST 2006
------------------------------------------------------------
revno: 1702
revision-id: pqm at pqm.ubuntu.com-20060523141455-306c645e0da6d13d
parent: pqm at pqm.ubuntu.com-20060523110622-5ad5c2bf9dee4fc5
parent: abentley at panoramicfeedback.com-20060523140257-352b84f597fb5a3a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-05-23 15:14:55 +0100
message:
Use Patience sequence matcher for diff and merge3
added:
bzrlib/patiencediff.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
patience-test.py patiencetest.py-20060522202704-p82o0dg5f1qf99ry-1
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/weave.py* knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060523140257-352b84f597fb5a3a
parent: aaron.bentley at utoronto.ca-20060523021313-66fc9d3425446c51
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.patience
timestamp: Tue 2006-05-23 10:02:57 -0400
message:
Fix style issues and duplicated tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060523021313-66fc9d3425446c51
parent: aaron.bentley at utoronto.ca-20060523020615-6fd7926bd1798376
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 22:13:13 -0400
message:
Add copyright/GPL to patience-test.py
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060523020615-6fd7926bd1798376
parent: aaron.bentley at utoronto.ca-20060523020313-d6201cb514427ffb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 22:06:15 -0400
message:
Remove unused regex
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060523020313-d6201cb514427ffb
parent: aaron.bentley at utoronto.ca-20060523011833-43cf7eaa21074aaf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 22:03:13 -0400
message:
Fix patience torture test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060523011833-43cf7eaa21074aaf
parent: aaron.bentley at utoronto.ca-20060523010731-8ffa480f08c46c21
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 21:18:33 -0400
message:
Clean up test_diff
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060523010731-8ffa480f08c46c21
parent: aaron.bentley at utoronto.ca-20060522212707-1e6184c56bc30798
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 21:07:31 -0400
message:
Reoganize patience-related code
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060522212707-1e6184c56bc30798
parent: aaron.bentley at utoronto.ca-20060522211206-8e8533faa8fde96c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 17:27:07 -0400
message:
Restore nofrillsprecisemerge, for functionality used in the diff stuff
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060522211206-8e8533faa8fde96c
parent: aaron.bentley at utoronto.ca-20060522210110-e3ecea61ff50e358
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 17:12:06 -0400
message:
Removed unused Codeville merge files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060522210110-e3ecea61ff50e358
parent: aaron.bentley at utoronto.ca-20060522204941-513e34dc69710a00
parent: pqm at pqm.ubuntu.com-20060522145312-94c3c934d7cbd9ff
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 17:01:10 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060522204941-513e34dc69710a00
parent: aaron.bentley at utoronto.ca-20060522202934-9ec8a908734d8e29
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 16:49:41 -0400
message:
Add length counting to patience test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060522202934-9ec8a908734d8e29
parent: aaron.bentley at utoronto.ca-20060520175113-4549e0023f9210bf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Mon 2006-05-22 16:29:34 -0400
message:
Add test of Patience sequence matcher
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520175113-4549e0023f9210bf
parent: aaron.bentley at utoronto.ca-20060407224652-4925bc3735b926f8
parent: pqm at pqm.ubuntu.com-20060519081516-cd19bd125a53a4d2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Sat 2006-05-20 13:51:13 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060407224652-4925bc3735b926f8
parent: john at arbash-meinel.com-20051214183222-3295ae8765a52643
parent: pqm at pqm.ubuntu.com-20060407062030-1277bbf3d808f04f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.patience
timestamp: Fri 2006-04-07 18:46:52 -0400
message:
Merged latest bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051214183222-3295ae8765a52643
parent: john at arbash-meinel.com-20051212172916-5947ca374e356673
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-cdv-diff
timestamp: Wed 2005-12-14 12:32:22 -0600
message:
Added tests, and an assert check to make sure ranges are always increasing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051212172916-5947ca374e356673
parent: john at arbash-meinel.com-20051212171640-ff7b0d595a160a97
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-cdv-diff
timestamp: Mon 2005-12-12 11:29:16 -0600
message:
Forgot to make one of the tests TestCaseInTempDir
------------------------------------------------------------
merged: john at arbash-meinel.com-20051212171640-ff7b0d595a160a97
parent: john at arbash-meinel.com-20051212163646-6ad3ea064abf6fdf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: cdv-diff
timestamp: Mon 2005-12-12 11:16:40 -0600
message:
Added a main function for running cdvdifflib manually, included tests for unified_diff interfaces
------------------------------------------------------------
merged: john at arbash-meinel.com-20051212163646-6ad3ea064abf6fdf
parent: john at arbash-meinel.com-20051203045714-1253ff7b375ab2a6
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: cdv-diff
timestamp: Mon 2005-12-12 10:36:46 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051203045714-1253ff7b375ab2a6
parent: john at arbash-meinel.com-20051110183538-80788dec92cd91c1
parent: john at arbash-meinel.com-20051202171817-0ac180714e18a125
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-cdv-diff
timestamp: Fri 2005-12-02 22:57:14 -0600
message:
[merge] jam-integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110183538-80788dec92cd91c1
parent: john at arbash-meinel.com-20051110035926-e391fd93199f0537
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-10 12:35:38 -0600
message:
Found some edge cases that weren't being matched.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110035926-e391fd93199f0537
parent: john at arbash-meinel.com-20051110033819-a2a0829773b88f80
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 21:59:26 -0600
message:
Added some more test cases.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051110033819-a2a0829773b88f80
parent: john at arbash-meinel.com-20051108183626-71f8414338043265
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-11-09 21:38:19 -0600
message:
Added (failing) tests for cdv.recurse_matches with common sections,
moved codeville code into separate directory.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051108183626-71f8414338043265
parent: john at arbash-meinel.com-20051107065611-96659a2a55f03947
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-11-08 13:36:26 -0500
message:
Updating unified_diff to take a factory, using the new diff algorithm in the code.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051107065611-96659a2a55f03947
parent: john at arbash-meinel.com-20051107032805-ac94e2b7d160d72f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-07 01:56:11 -0500
message:
Fixed a small bug when adding an entry with no new parents
(should only mark newly added lines as part of the entry)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051107032805-ac94e2b7d160d72f
parent: john at arbash-meinel.com-20051106200642-c9e58cd038b65515
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-06 22:28:05 -0500
message:
Adding an optional matcher class, which allows to use cdvdifflib matcher.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051106200642-c9e58cd038b65515
parent: john at arbash-meinel.com-20051106193341-7217fdd529b3853c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-06 15:06:42 -0500
message:
Fix up SequenceMatcher, add comments to nofrillsprecisemerge
------------------------------------------------------------
merged: john at arbash-meinel.com-20051106193341-7217fdd529b3853c
parent: john at arbash-meinel.com-20051106170113-30021a6623ab082b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-06 14:33:41 -0500
message:
moved the logic deeper into difflib.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051106170113-30021a6623ab082b
parent: john at arbash-meinel.com-20051106065200-70f93aedbf1ea1da
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-06 12:01:13 -0500
message:
Adding tests for checking opcodes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051106065200-70f93aedbf1ea1da
parent: john at arbash-meinel.com-20051106064625-bb31d4e6fb25930a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-06 01:52:00 -0500
message:
A couple small tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051106064625-bb31d4e6fb25930a
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-06 01:46:25 -0500
message:
Adding nofrillsprecisemerge's diff algorithm, wrapped in difflib.
More information about the bazaar-commits
mailing list