Rev 4909: (andrew) Add bzrlib.tests.per_merger, and tidy some nits. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Dec 18 10:52:14 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4909 [merge]
revision-id: pqm at pqm.ubuntu.com-20091218105213-3amdsy9oq337u387
parent: pqm at pqm.ubuntu.com-20091218100949-2c1ityvnbqjtdf3g
parent: andrew.bennetts at canonical.com-20091218082242-f7wy9tlk0yxvkkju
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-12-18 10:52:13 +0000
message:
(andrew) Add bzrlib.tests.per_merger, and tidy some nits.
added:
bzrlib/tests/per_merger.py per_merger.py-20091216002111-bzeo6wx2tcfpuj67-1
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py 2009-12-10 17:16:19 +0000
+++ b/bzrlib/merge.py 2009-12-18 08:22:42 +0000
@@ -25,7 +25,6 @@
osutils,
patiencediff,
progress,
- registry,
revision as _mod_revision,
textfile,
trace,
@@ -240,7 +239,7 @@
if self.other_rev_id is None:
other_basis_tree = self.revision_tree(self.other_basis)
if other_basis_tree.has_changes(self.other_tree):
- raise WorkingTreeNotRevision(self.this_tree)
+ raise errors.WorkingTreeNotRevision(self.this_tree)
other_rev_id = self.other_basis
self.other_tree = other_basis_tree
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2009-12-08 21:46:07 +0000
+++ b/bzrlib/tests/__init__.py 2009-12-18 08:22:42 +0000
@@ -3746,6 +3746,7 @@
'bzrlib.tests.per_inventory',
'bzrlib.tests.per_interbranch',
'bzrlib.tests.per_lock',
+ 'bzrlib.tests.per_merger',
'bzrlib.tests.per_transport',
'bzrlib.tests.per_tree',
'bzrlib.tests.per_pack_repository',
=== added file 'bzrlib/tests/per_merger.py'
--- a/bzrlib/tests/per_merger.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/per_merger.py 2009-12-18 06:54:20 +0000
@@ -0,0 +1,191 @@
+# Copyright (C) 2009 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Implementation tests for bzrlib.merge.Merger."""
+
+import os
+
+from bzrlib import (
+ errors,
+ merge as _mod_merge,
+ option,
+ progress,
+ )
+from bzrlib.tests import (
+ multiply_tests,
+ TestCaseWithTransport,
+ )
+from bzrlib.transform import TreeTransform
+
+
+
+def load_tests(standard_tests, module, loader):
+ """Multiply tests for tranport implementations."""
+ result = loader.suiteClass()
+ scenarios = [
+ (name, {'merge_type': merger})
+ for name, merger in option._merge_type_registry.items()]
+ return multiply_tests(standard_tests, scenarios, result)
+
+
+class TestMergeImplementation(TestCaseWithTransport):
+
+ def do_merge(self, target_tree, source_tree, **kwargs):
+ merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
+ target_tree, source_tree.last_revision(),
+ other_branch=source_tree.branch)
+ merger.merge_type=self.merge_type
+ for name, value in kwargs.items():
+ setattr(merger, name, value)
+ merger.do_merge()
+
+ def test_merge_specific_file(self):
+ this_tree = self.make_branch_and_tree('this')
+ this_tree.lock_write()
+ self.addCleanup(this_tree.unlock)
+ self.build_tree_contents([
+ ('this/file1', 'a\nb\n'),
+ ('this/file2', 'a\nb\n')
+ ])
+ this_tree.add(['file1', 'file2'])
+ this_tree.commit('Added files')
+ other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
+ self.build_tree_contents([
+ ('other/file1', 'a\nb\nc\n'),
+ ('other/file2', 'a\nb\nc\n')
+ ])
+ other_tree.commit('modified both')
+ self.build_tree_contents([
+ ('this/file1', 'd\na\nb\n'),
+ ('this/file2', 'd\na\nb\n')
+ ])
+ this_tree.commit('modified both')
+ self.do_merge(this_tree, other_tree, interesting_files=['file1'])
+ self.assertFileEqual('d\na\nb\nc\n', 'this/file1')
+ self.assertFileEqual('d\na\nb\n', 'this/file2')
+
+ def test_merge_move_and_change(self):
+ this_tree = self.make_branch_and_tree('this')
+ this_tree.lock_write()
+ self.addCleanup(this_tree.unlock)
+ self.build_tree_contents([
+ ('this/file1', 'line 1\nline 2\nline 3\nline 4\n'),
+ ])
+ this_tree.add('file1',)
+ this_tree.commit('Added file')
+ other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
+ self.build_tree_contents([
+ ('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
+ ])
+ other_tree.commit('Changed 2 to 2.1')
+ self.build_tree_contents([
+ ('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
+ ])
+ this_tree.commit('Swapped 2 & 3')
+ self.do_merge(this_tree, other_tree)
+ if self.merge_type is _mod_merge.LCAMerger:
+ self.expectFailure(
+ "lca merge doesn't conflict for move and change",
+ self.assertFileEqual,
+ 'line 1\n'
+ '<<<<<<< TREE\n'
+ 'line 3\n'
+ 'line 2\n'
+ '=======\n'
+ 'line 2 to 2.1\n'
+ 'line 3\n'
+ '>>>>>>> MERGE-SOURCE\n'
+ 'line 4\n', 'this/file1')
+ else:
+ self.assertFileEqual('line 1\n'
+ '<<<<<<< TREE\n'
+ 'line 3\n'
+ 'line 2\n'
+ '=======\n'
+ 'line 2 to 2.1\n'
+ 'line 3\n'
+ '>>>>>>> MERGE-SOURCE\n'
+ 'line 4\n', 'this/file1')
+
+ def test_modify_conflicts_with_delete(self):
+ # If one side deletes a line, and the other modifies that line, then
+ # the modification should be considered a conflict
+ builder = self.make_branch_builder('test')
+ builder.start_series()
+ builder.build_snapshot('BASE-id', None,
+ [('add', ('', None, 'directory', None)),
+ ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
+ ])
+ # Delete 'b\n'
+ builder.build_snapshot('OTHER-id', ['BASE-id'],
+ [('modify', ('foo-id', 'a\nc\nd\ne\n'))])
+ # Modify 'b\n', add 'X\n'
+ builder.build_snapshot('THIS-id', ['BASE-id'],
+ [('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))])
+ builder.finish_series()
+ branch = builder.get_branch()
+ this_tree = branch.bzrdir.create_workingtree()
+ this_tree.lock_write()
+ self.addCleanup(this_tree.unlock)
+ other_tree = this_tree.bzrdir.sprout('other', 'OTHER-id').open_workingtree()
+ self.do_merge(this_tree, other_tree)
+ if self.merge_type is _mod_merge.LCAMerger:
+ self.expectFailure("lca merge doesn't track deleted lines",
+ self.assertFileEqual,
+ 'a\n'
+ '<<<<<<< TREE\n'
+ 'b2\n'
+ '=======\n'
+ '>>>>>>> MERGE-SOURCE\n'
+ 'c\n'
+ 'd\n'
+ 'X\n'
+ 'e\n', 'test/foo')
+ else:
+ self.assertFileEqual(
+ 'a\n'
+ '<<<<<<< TREE\n'
+ 'b2\n'
+ '=======\n'
+ '>>>>>>> MERGE-SOURCE\n'
+ 'c\n'
+ 'd\n'
+ 'X\n'
+ 'e\n', 'test/foo')
+
+ def get_limbodir_deletiondir(self, wt):
+ transform = TreeTransform(wt)
+ limbodir = transform._limbodir
+ deletiondir = transform._deletiondir
+ transform.finalize()
+ return (limbodir, deletiondir)
+
+ def test_merge_with_existing_limbo(self):
+ wt = self.make_branch_and_tree('this')
+ (limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
+ os.mkdir(limbodir)
+ self.assertRaises(errors.ExistingLimbo, self.do_merge, wt, wt)
+ self.assertRaises(errors.LockError, wt.unlock)
+
+ def test_merge_with_pending_deletion(self):
+ wt = self.make_branch_and_tree('this')
+ (limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
+ os.mkdir(deletiondir)
+ self.assertRaises(errors.ExistingPendingDeletion, self.do_merge, wt, wt)
+ self.assertRaises(errors.LockError, wt.unlock)
+
+
+
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py 2009-12-10 17:16:19 +0000
+++ b/bzrlib/tests/test_merge.py 2009-12-18 08:22:42 +0000
@@ -29,14 +29,12 @@
transform,
versionedfile,
)
-from bzrlib.branch import Branch
from bzrlib.conflicts import ConflictList, TextConflict
-from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
+from bzrlib.errors import UnrelatedBranches, NoCommits
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
from bzrlib.osutils import pathjoin, file_kind
from bzrlib.tests import TestCaseWithTransport, TestCaseWithMemoryTransport
from bzrlib.workingtree import WorkingTree
-from bzrlib.transform import TreeTransform
class TestMerge(TestCaseWithTransport):
@@ -1144,158 +1142,6 @@
], list(plan))
-class TestMergeImplementation(object):
-
- def do_merge(self, target_tree, source_tree, **kwargs):
- merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
- target_tree, source_tree.last_revision(),
- other_branch=source_tree.branch)
- merger.merge_type=self.merge_type
- for name, value in kwargs.items():
- setattr(merger, name, value)
- merger.do_merge()
-
- def test_merge_specific_file(self):
- this_tree = self.make_branch_and_tree('this')
- this_tree.lock_write()
- self.addCleanup(this_tree.unlock)
- self.build_tree_contents([
- ('this/file1', 'a\nb\n'),
- ('this/file2', 'a\nb\n')
- ])
- this_tree.add(['file1', 'file2'])
- this_tree.commit('Added files')
- other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
- self.build_tree_contents([
- ('other/file1', 'a\nb\nc\n'),
- ('other/file2', 'a\nb\nc\n')
- ])
- other_tree.commit('modified both')
- self.build_tree_contents([
- ('this/file1', 'd\na\nb\n'),
- ('this/file2', 'd\na\nb\n')
- ])
- this_tree.commit('modified both')
- self.do_merge(this_tree, other_tree, interesting_files=['file1'])
- self.assertFileEqual('d\na\nb\nc\n', 'this/file1')
- self.assertFileEqual('d\na\nb\n', 'this/file2')
-
- def test_merge_move_and_change(self):
- this_tree = self.make_branch_and_tree('this')
- this_tree.lock_write()
- self.addCleanup(this_tree.unlock)
- self.build_tree_contents([
- ('this/file1', 'line 1\nline 2\nline 3\nline 4\n'),
- ])
- this_tree.add('file1',)
- this_tree.commit('Added file')
- other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
- self.build_tree_contents([
- ('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
- ])
- other_tree.commit('Changed 2 to 2.1')
- self.build_tree_contents([
- ('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
- ])
- this_tree.commit('Swapped 2 & 3')
- self.do_merge(this_tree, other_tree)
- self.assertFileEqual('line 1\n'
- '<<<<<<< TREE\n'
- 'line 3\n'
- 'line 2\n'
- '=======\n'
- 'line 2 to 2.1\n'
- 'line 3\n'
- '>>>>>>> MERGE-SOURCE\n'
- 'line 4\n', 'this/file1')
-
- def test_modify_conflicts_with_delete(self):
- # If one side deletes a line, and the other modifies that line, then
- # the modification should be considered a conflict
- builder = self.make_branch_builder('test')
- builder.start_series()
- builder.build_snapshot('BASE-id', None,
- [('add', ('', None, 'directory', None)),
- ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
- ])
- # Delete 'b\n'
- builder.build_snapshot('OTHER-id', ['BASE-id'],
- [('modify', ('foo-id', 'a\nc\nd\ne\n'))])
- # Modify 'b\n', add 'X\n'
- builder.build_snapshot('THIS-id', ['BASE-id'],
- [('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))])
- builder.finish_series()
- branch = builder.get_branch()
- this_tree = branch.bzrdir.create_workingtree()
- this_tree.lock_write()
- self.addCleanup(this_tree.unlock)
- other_tree = this_tree.bzrdir.sprout('other', 'OTHER-id').open_workingtree()
- self.do_merge(this_tree, other_tree)
- if self.merge_type is _mod_merge.LCAMerger:
- self.expectFailure("lca merge doesn't track deleted lines",
- self.assertFileEqual,
- 'a\n'
- '<<<<<<< TREE\n'
- 'b2\n'
- '=======\n'
- '>>>>>>> MERGE-SOURCE\n'
- 'c\n'
- 'd\n'
- 'X\n'
- 'e\n', 'test/foo')
- else:
- self.assertFileEqual(
- 'a\n'
- '<<<<<<< TREE\n'
- 'b2\n'
- '=======\n'
- '>>>>>>> MERGE-SOURCE\n'
- 'c\n'
- 'd\n'
- 'X\n'
- 'e\n', 'test/foo')
-
- def get_limbodir_deletiondir(self, wt):
- transform = TreeTransform(wt)
- limbodir = transform._limbodir
- deletiondir = transform._deletiondir
- transform.finalize()
- return (limbodir, deletiondir)
-
- def test_merge_with_existing_limbo(self):
- wt = self.make_branch_and_tree('this')
- (limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
- os.mkdir(limbodir)
- self.assertRaises(errors.ExistingLimbo, self.do_merge, wt, wt)
- self.assertRaises(errors.LockError, wt.unlock)
-
- def test_merge_with_pending_deletion(self):
- wt = self.make_branch_and_tree('this')
- (limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
- os.mkdir(deletiondir)
- self.assertRaises(errors.ExistingPendingDeletion, self.do_merge, wt, wt)
- self.assertRaises(errors.LockError, wt.unlock)
-
-
-class TestMerge3Merge(TestCaseWithTransport, TestMergeImplementation):
-
- merge_type = _mod_merge.Merge3Merger
-
-
-class TestWeaveMerge(TestCaseWithTransport, TestMergeImplementation):
-
- merge_type = _mod_merge.WeaveMerger
-
-
-class TestLCAMerge(TestCaseWithTransport, TestMergeImplementation):
-
- merge_type = _mod_merge.LCAMerger
-
- def test_merge_move_and_change(self):
- self.expectFailure("lca merge doesn't conflict for move and change",
- super(TestLCAMerge, self).test_merge_move_and_change)
-
-
class LoggingMerger(object):
# These seem to be the required attributes
requires_base = False
=== modified file 'bzrlib/tests/test_merge_core.py'
--- a/bzrlib/tests/test_merge_core.py 2009-12-08 21:04:07 +0000
+++ b/bzrlib/tests/test_merge_core.py 2009-12-18 08:22:42 +0000
@@ -15,32 +15,26 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import os
-import stat
import sys
import bzrlib
from bzrlib import (
+ errors,
generate_ids,
merge_directive,
osutils,
)
from bzrlib.conflicts import ContentsConflict, TextConflict, PathConflict
-from bzrlib import errors
-from bzrlib.errors import (NotBranchError, NotVersionedError,
- WorkingTreeNotRevision, BzrCommandError, NoDiff3)
-from bzrlib import inventory
from bzrlib.merge import (
Merge3Merger,
Diff3Merger,
WeaveMerger,
Merger,
)
-from bzrlib.osutils import (file_kind, getcwd, pathjoin, rename,
- sha_file,
- )
+from bzrlib.osutils import getcwd, pathjoin
from bzrlib import progress
from bzrlib.transform import TreeTransform
-from bzrlib.tests import TestCaseWithTransport, TestCase, TestSkipped
+from bzrlib.tests import TestCaseWithTransport, TestSkipped
from bzrlib.workingtree import WorkingTree
@@ -277,7 +271,7 @@
" and therefore always fails on win32")
try:
self.do_contents_test(Diff3Merger)
- except NoDiff3:
+ except errors.NoDiff3:
raise TestSkipped("diff3 not available")
def test_contents_merge3(self):
More information about the bazaar-commits
mailing list