# Copyright (C) 2005-2010 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 import os from bzrlib import ( branchbuilder, bzrdir, conflicts, errors, option, tests, workingtree, ) from bzrlib.tests import script def load_tests(standard_tests, module, loader): result = loader.suiteClass() sp_tests, remaining_tests = tests.split_suite_by_condition( standard_tests, tests.condition_isinstance(( TestParametrizedResolveConflicts, ))) # Each test class defines its own scenarios. This is needed for # TestResolvePathConflictBefore531967 that verifies that the same tests as # TestResolvePathConflict still pass. for test in tests.iter_suite_tests(sp_tests): tests.apply_scenarios(test, test.scenarios(), result) # No parametrization for the remaining tests result.addTests(remaining_tests) return result # TODO: Test commit with some added, and added-but-missing files # RBC 20060124 is that not tested in test_commit.py ? # The order of 'path' here is important - do not let it # be a sorted list. # u'\xe5' == a with circle # '\xc3\xae' == u'\xee' == i with hat # So these are u'path' and 'id' only with a circle and a hat. (shappo?) example_conflicts = conflicts.ConflictList( [conflicts.MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'), conflicts.ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'), conflicts.TextConflict(u'p\xe5tha'), conflicts.PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'), conflicts.DuplicateID('Unversioned existing file', u'p\xe5thc', u'p\xe5thc2', '\xc3\xaedc', '\xc3\xaedc'), conflicts.DuplicateEntry('Moved existing file to', u'p\xe5thdd.moved', u'p\xe5thd', '\xc3\xaedd', None), conflicts.ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e', None, '\xc3\xaed2e'), conflicts.UnversionedParent('Versioned directory', u'p\xe5thf', '\xc3\xaedf'), conflicts.NonDirectoryParent('Created directory', u'p\xe5thg', '\xc3\xaedg'), ]) class TestConflicts(tests.TestCaseWithTransport): def test_conflicts(self): """Conflicts are detected properly""" # Use BzrDirFormat6 so we can fake conflicts tree = self.make_branch_and_tree('.', format=bzrdir.BzrDirFormat6()) self.build_tree_contents([('hello', 'hello world4'), ('hello.THIS', 'hello world2'), ('hello.BASE', 'hello world1'), ('hello.OTHER', 'hello world3'), ('hello.sploo.BASE', 'yellowworld'), ('hello.sploo.OTHER', 'yellowworld2'), ]) tree.lock_read() self.assertLength(6, list(tree.list_files())) tree.unlock() tree_conflicts = tree.conflicts() self.assertLength(2, tree_conflicts) self.assertTrue('hello' in tree_conflicts[0].path) self.assertTrue('hello.sploo' in tree_conflicts[1].path) conflicts.restore('hello') conflicts.restore('hello.sploo') self.assertLength(0, tree.conflicts()) self.assertFileEqual('hello world2', 'hello') self.assertFalse(os.path.lexists('hello.sploo')) self.assertRaises(errors.NotConflicted, conflicts.restore, 'hello') self.assertRaises(errors.NotConflicted, conflicts.restore, 'hello.sploo') def test_resolve_conflict_dir(self): tree = self.make_branch_and_tree('.') self.build_tree_contents([('hello', 'hello world4'), ('hello.THIS', 'hello world2'), ('hello.BASE', 'hello world1'), ]) os.mkdir('hello.OTHER') tree.add('hello', 'q') l = conflicts.ConflictList([conflicts.TextConflict('hello')]) l.remove_files(tree) def test_select_conflicts(self): tree = self.make_branch_and_tree('.') clist = conflicts.ConflictList def check_select(not_selected, selected, paths, **kwargs): self.assertEqual( (not_selected, selected), tree_conflicts.select_conflicts(tree, paths, **kwargs)) foo = conflicts.ContentsConflict('foo') bar = conflicts.ContentsConflict('bar') tree_conflicts = clist([foo, bar]) check_select(clist([bar]), clist([foo]), ['foo']) check_select(clist(), tree_conflicts, [''], ignore_misses=True, recurse=True) foobaz = conflicts.ContentsConflict('foo/baz') tree_conflicts = clist([foobaz, bar]) check_select(clist([bar]), clist([foobaz]), ['foo'], ignore_misses=True, recurse=True) qux = conflicts.PathConflict('qux', 'foo/baz') tree_conflicts = clist([qux]) check_select(clist(), tree_conflicts, ['foo'], ignore_misses=True, recurse=True) check_select (tree_conflicts, clist(), ['foo'], ignore_misses=True) def test_resolve_conflicts_recursive(self): tree = self.make_branch_and_tree('.') self.build_tree(['dir/', 'dir/hello']) tree.add(['dir', 'dir/hello']) dirhello = conflicts.ConflictList([conflicts.TextConflict('dir/hello')]) tree.set_conflicts(dirhello) conflicts.resolve(tree, ['dir'], recursive=False, ignore_misses=True) self.assertEqual(dirhello, tree.conflicts()) conflicts.resolve(tree, ['dir'], recursive=True, ignore_misses=True) self.assertEqual(conflicts.ConflictList([]), tree.conflicts()) class TestConflictStanzas(tests.TestCase): def test_stanza_roundtrip(self): # write and read our example stanza. stanza_iter = example_conflicts.to_stanzas() processed = conflicts.ConflictList.from_stanzas(stanza_iter) for o, p in zip(processed, example_conflicts): self.assertEqual(o, p) self.assertIsInstance(o.path, unicode) if o.file_id is not None: self.assertIsInstance(o.file_id, str) conflict_path = getattr(o, 'conflict_path', None) if conflict_path is not None: self.assertIsInstance(conflict_path, unicode) conflict_file_id = getattr(o, 'conflict_file_id', None) if conflict_file_id is not None: self.assertIsInstance(conflict_file_id, str) def test_stanzification(self): for stanza in example_conflicts.to_stanzas(): if 'file_id' in stanza: # In Stanza form, the file_id has to be unicode. self.assertStartsWith(stanza['file_id'], u'\xeed') self.assertStartsWith(stanza['path'], u'p\xe5th') if 'conflict_path' in stanza: self.assertStartsWith(stanza['conflict_path'], u'p\xe5th') if 'conflict_file_id' in stanza: self.assertStartsWith(stanza['conflict_file_id'], u'\xeed') # FIXME: The shell-like tests should be converted to real whitebox tests... or # moved to a blackbox module -- vila 20100205 # FIXME: test missing for multiple conflicts # FIXME: Tests missing for DuplicateID conflict type class TestResolveConflicts(script.TestCaseWithTransportAndScript): preamble = None # The setup script set by daughter classes def setUp(self): super(TestResolveConflicts, self).setUp() self.run_script(self.preamble) class TestResolveTextConflicts(TestResolveConflicts): # TBC pass # FIXME: Get rid of parametrized (in the class name) once we delete # TestResolveConflicts -- vila 20100308 class TestParametrizedResolveConflicts(tests.TestCaseWithTransport): """This class provides a base to test single conflict resolution. The aim is to define scenarios in daughter classes (one for each conflict type) that create a single conflict object when one branch is merged in another (and vice versa). Each class can define as many scenarios as needed. Each scenario should define a couple of actions that will be swapped to define the sibling scenarios. From there, both resolutions are tested (--take-this and --take-other). Each conflict type use its attributes in a specific way, so each class should define a specific _assert_conflict method. Since the resolution change the working tree state, each action should define an associated check. """ # Set by daughter classes _conflict_type = None _assert_conflict = None # Set by load_tests _base_actions = None _this_actions = None _other_actions = None _item_path = None _item_id = None # Set by _this_actions and other_actions # FIXME: rename them this_args and other_args so the tests can use them # more freely _this_path = None _this_id = None _other_path = None _other_id = None @classmethod def mirror_scenarios(klass, base_scenarios): scenarios = [] def adapt(d, side): """Modify dict to apply to the given side. 'actions' key is turned into '_actions_this' if side is 'this' for example. """ t = {} # Turn each key into _side_key for k,v in d.iteritems(): t['_%s_%s' % (k, side)] = v return t # Each base scenario is duplicated switching the roles of 'this' and # 'other' left = [l for l, r, c in base_scenarios] right = [r for l, r, c in base_scenarios] common = [c for l, r, c in base_scenarios] for (lname, ldict), (rname, rdict), common in zip(left, right, common): a = tests.multiply_scenarios([(lname, adapt(ldict, 'this'))], [(rname, adapt(rdict, 'other'))]) b = tests.multiply_scenarios( [(rname, adapt(rdict, 'this'))], [(lname, adapt(ldict, 'other'))]) # Inject the common parameters in all scenarios for name, d in a + b: d.update(common) scenarios.extend(a + b) return scenarios @classmethod def scenarios(klass): # Only concrete classes return actual scenarios return [] def setUp(self): super(TestParametrizedResolveConflicts, self).setUp() builder = self.make_branch_builder('trunk') builder.start_series() # Create an empty trunk builder.build_snapshot('start', None, [ ('add', ('', 'root-id', 'directory', ''))]) # Add a minimal base content _, _, actions_base = self._get_actions(self._actions_base)() builder.build_snapshot('base', ['start'], actions_base) # Modify the base content in branch (self._other_path, self._other_id, actions_other) = self._get_actions(self._actions_other)() builder.build_snapshot('other', ['base'], actions_other) # Modify the base content in trunk (self._this_path, self._this_id, actions_this) = self._get_actions(self._actions_this)() builder.build_snapshot('this', ['base'], actions_this) # builder.get_branch() tip is now 'this' builder.finish_series() self.builder = builder def _get_actions(self, name): return getattr(self, 'do_%s' % name) def _get_check(self, name): return getattr(self, 'check_%s' % name) def do_nothing(self): return (None, None, []) def do_create_file(self): return ('file', 'file-id', [('add', ('file', 'file-id', 'file', 'trunk content\n'))]) def do_create_file_a(self): return ('file', 'file-a-id', [('add', ('file', 'file-a-id', 'file', 'file a content\n'))]) def check_file_content_a(self): self.assertFileEqual('file a content\n', 'branch/file') def do_create_file_b(self): return ('file', 'file-b-id', [('add', ('file', 'file-b-id', 'file', 'file b content\n'))]) def check_file_content_b(self): self.assertFileEqual('file b content\n', 'branch/file') def do_create_dir(self): return ('dir', 'dir-id', [('add', ('dir', 'dir-id', 'directory', ''))]) def do_modify_file(self): return ('file', 'file-id', [('modify', ('file-id', 'trunk content\nmore content\n'))]) def check_file_has_more_content(self): self.assertFileEqual('trunk content\nmore content\n', 'branch/file') def do_delete_file(self): return ('file', 'file-id', [('unversion', 'file-id')]) def check_file_doesnt_exist(self): self.failIfExists('branch/file') def do_rename_file(self): return ('new-file', 'file-id', [('rename', ('file', 'new-file'))]) def check_file_renamed(self): self.failIfExists('branch/file') self.failUnlessExists('branch/new-file') def do_rename_file2(self): return ('new-file2', 'file-id', [('rename', ('file', 'new-file2'))]) def check_file_renamed2(self): self.failIfExists('branch/file') self.failUnlessExists('branch/new-file2') def do_rename_dir(self): return ('new-dir', 'dir-id', [('rename', ('dir', 'new-dir'))]) def check_dir_renamed(self): self.failIfExists('branch/dir') self.failUnlessExists('branch/new-dir') def do_rename_dir2(self): return ('new-dir2', 'dir-id', [('rename', ('dir', 'new-dir2'))]) def check_dir_renamed2(self): self.failIfExists('branch/dir') self.failUnlessExists('branch/new-dir2') def do_delete_dir(self): return ('', 'dir-id', [('unversion', 'dir-id')]) def check_dir_doesnt_exist(self): self.failIfExists('branch/dir') def _merge_other_into_this(self): b = self.builder.get_branch() wt = b.bzrdir.sprout('branch').open_workingtree() wt.merge_from_branch(b, 'other') return wt def assertConflict(self, wt): confs = wt.conflicts() self.assertLength(1, confs) c = confs[0] self.assertIsInstance(c, self._conflict_type) self._assert_conflict(wt, c) def _get_resolve_path_arg(self, wt, action): return self._item_path def check_resolved(self, wt, action): path = self._get_resolve_path_arg(wt, action) conflicts.resolve(wt, [path], action=action) # Check that we don't have any conflicts nor unknown left self.assertLength(0, wt.conflicts()) self.assertLength(0, list(wt.unknowns())) def test_resolve_taking_this(self): wt = self._merge_other_into_this() self.assertConflict(wt) self.check_resolved(wt, 'take_this') check_this = self._get_check(self._check_this) check_this() def test_resolve_taking_other(self): wt = self._merge_other_into_this() self.assertConflict(wt) self.check_resolved(wt, 'take_other') check_other = self._get_check(self._check_other) check_other() class TestResolveContentsConflict(TestParametrizedResolveConflicts): _conflict_type = conflicts.ContentsConflict, @classmethod def scenarios(klass): base_scenarios = [ (('file_modified', dict(actions='modify_file', check='file_has_more_content')), ('file_deleted', dict(actions='delete_file', check='file_doesnt_exist')), dict(_actions_base='create_file', _item_path='file')), ] return klass.mirror_scenarios(base_scenarios) def assertContentsConflict(self, wt, c): self.assertEqual(self._other_id, c.file_id) self.assertEqual(self._other_path, c.path) _assert_conflict = assertContentsConflict class TestResolvePathConflict(TestParametrizedResolveConflicts): _conflict_type = conflicts.PathConflict, @classmethod def scenarios(klass): for_file = dict(_actions_base='create_file', _item_path='new-file', _item_id='file-id',) for_dir = dict(_actions_base='create_dir', _item_path='new-dir', _item_id='dir-id',) base_scenarios = [ (('file_renamed', dict(actions='rename_file', check='file_renamed')), ('file_deleted', dict(actions='delete_file', check='file_doesnt_exist')), for_file), (('file_renamed', dict(actions='rename_file', check='file_renamed')), ('file_renamed2', dict(actions='rename_file2', check='file_renamed2')), for_file), (('dir_renamed', dict(actions='rename_dir', check='dir_renamed')), ('dir_deleted', dict(actions='delete_dir', check='dir_doesnt_exist')), for_dir), (('dir_renamed', dict(actions='rename_dir', check='dir_renamed')), ('dir_renamed2', dict(actions='rename_dir2', check='dir_renamed2')), for_dir), ] return klass.mirror_scenarios(base_scenarios) def do_delete_file(self): sup = super(TestResolvePathConflict, self).do_delete_file() # PathConflicts handle deletion differently and requires a special # hard-coded value return ('',) + sup[1:] def assertPathConflict(self, wt, c): self.assertEqual(self._item_id, c.file_id) self.assertEqual(self._this_path, c.path) self.assertEqual(self._other_path, c.conflict_path) _assert_conflict = assertPathConflict class TestResolvePathConflictBefore531967(TestResolvePathConflict): """Same as TestResolvePathConflict but a specific conflict object. """ def assertPathConflict(self, c): # We create a conflict object as it was created before the fix and # inject it into the working tree, the test will exercise the # compatibility code. old_c = conflicts.PathConflict('', self._item_path, file_id=None) wt.set_conflicts(conflicts.ConflictList([old_c])) class TestResolveDuplicateEntry(TestParametrizedResolveConflicts): _conflict_type = conflicts.DuplicateEntry, @classmethod def scenarios(klass): base_scenarios = [ (('filea_created', dict(actions='create_file_a', check='file_content_a')), ('fileb_created', dict(actions='create_file_b', check='file_content_b')), dict(_actions_base='nothing', _item_path='file')), ] return klass.mirror_scenarios(base_scenarios) def assertDuplicateEntry(self, wt, c): self.assertEqual(self._this_id, c.file_id) self.assertEqual(self._item_path + '.moved', c.path) self.assertEqual(self._item_path, c.conflict_path) _assert_conflict = assertDuplicateEntry class TestResolveUnversionedParent(TestResolveConflicts): # FIXME: Add the reverse tests: dir deleted in trunk, file added in branch # FIXME: While this *creates* UnversionedParent conflicts, this really only # tests MissingParent resolution :-/ preamble = """ $ bzr init trunk $ cd trunk $ mkdir dir $ bzr add dir $ bzr commit -m 'Create trunk' $ echo 'trunk content' >dir/file $ bzr add dir/file $ bzr commit -m 'Add dir/file in trunk' $ bzr branch . -r 1 ../branch $ cd ../branch $ bzr rm dir $ bzr commit -m 'Remove dir in branch' $ bzr merge ../trunk 2>+N dir/ 2>+N dir/file 2>Conflict adding files to dir. Created directory. 2>Conflict because dir is not versioned, but has versioned children. Versioned directory. 2>2 conflicts encountered. """ def test_take_this(self): self.run_script(""" $ bzr rm dir --force $ bzr resolve dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_take_other(self): self.run_script(""" $ bzr resolve dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) class TestResolveMissingParent(TestResolveConflicts): preamble = """ $ bzr init trunk $ cd trunk $ mkdir dir $ echo 'trunk content' >dir/file $ bzr add $ bzr commit -m 'Create trunk' $ echo 'trunk content' >dir/file2 $ bzr add dir/file2 $ bzr commit -m 'Add dir/file2 in branch' $ bzr branch . -r 1 ../branch $ cd ../branch $ bzr rm dir/file --force $ bzr rm dir $ bzr commit -m 'Remove dir/file' $ bzr merge ../trunk 2>+N dir/ 2>+N dir/file2 2>Conflict adding files to dir. Created directory. 2>Conflict because dir is not versioned, but has versioned children. Versioned directory. 2>2 conflicts encountered. """ def test_keep_them_all(self): self.run_script(""" $ bzr resolve dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_adopt_child(self): self.run_script(""" $ bzr mv dir/file2 file2 $ bzr rm dir --force $ bzr resolve dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_kill_them_all(self): self.run_script(""" $ bzr rm dir --force $ bzr resolve dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_resolve_taking_this(self): self.run_script(""" $ bzr resolve --take-this dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_resolve_taking_other(self): self.run_script(""" $ bzr resolve --take-other dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) class TestResolveDeletingParent(TestResolveConflicts): preamble = """ $ bzr init trunk $ cd trunk $ mkdir dir $ echo 'trunk content' >dir/file $ bzr add $ bzr commit -m 'Create trunk' $ bzr rm dir/file --force $ bzr rm dir --force $ bzr commit -m 'Remove dir/file' $ bzr branch . -r 1 ../branch $ cd ../branch $ echo 'branch content' >dir/file2 $ bzr add dir/file2 $ bzr commit -m 'Add dir/file2 in branch' $ bzr merge ../trunk 2>-D dir/file 2>Conflict: can't delete dir because it is not empty. Not deleting. 2>Conflict because dir is not versioned, but has versioned children. Versioned directory. 2>2 conflicts encountered. """ def test_keep_them_all(self): self.run_script(""" $ bzr resolve dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_adopt_child(self): self.run_script(""" $ bzr mv dir/file2 file2 $ bzr rm dir --force $ bzr resolve dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_kill_them_all(self): self.run_script(""" $ bzr rm dir --force $ bzr resolve dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_resolve_taking_this(self): self.run_script(""" $ bzr resolve --take-this dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_resolve_taking_other(self): self.run_script(""" $ bzr resolve --take-other dir $ bzr commit --strict -m 'No more conflicts nor unknown files' """) class TestResolveParentLoop(TestParametrizedResolveConflicts): _conflict_type = conflicts.ParentLoop, @classmethod def scenarios(klass): base_scenarios = [ (('dir1_into_dir2', dict(actions='move_dir1_into_dir2', check='dir1_moved')), ('dir2_into_dir1', dict(actions='move_dir2_into_dir1', check='dir2_moved')), dict(_actions_base='create_dir1_dir2')), (('dir1_into_dir4', dict(actions='move_dir1_into_dir4', check='dir1_2_moved')), ('dir3_into_dir2', dict(actions='move_dir3_into_dir2', check='dir3_4_moved')), dict(_actions_base='create_dir1_4')), ] return klass.mirror_scenarios(base_scenarios) def do_create_dir1_dir2(self): return (None, None, [('add', ('dir1', 'dir1-id', 'directory', '')), ('add', ('dir2', 'dir2-id', 'directory', '')), ]) def do_move_dir1_into_dir2(self): # The arguments are the file-id to move and the targeted file-id dir. return ('dir1-id', 'dir2-id', [('rename', ('dir1', 'dir2/dir1'))]) def check_dir1_moved(self): self.failIfExists('branch/dir1') self.failUnlessExists('branch/dir2/dir1') def do_move_dir2_into_dir1(self): # The arguments are the file-id to move and the targeted file-id dir. return ('dir2-id', 'dir1-id', [('rename', ('dir2', 'dir1/dir2'))]) def check_dir2_moved(self): self.failIfExists('branch/dir2') self.failUnlessExists('branch/dir1/dir2') def do_create_dir1_4(self): return (None, None, [('add', ('dir1', 'dir1-id', 'directory', '')), ('add', ('dir1/dir2', 'dir2-id', 'directory', '')), ('add', ('dir3', 'dir3-id', 'directory', '')), ('add', ('dir3/dir4', 'dir4-id', 'directory', '')), ]) def do_move_dir1_into_dir4(self): # The arguments are the file-id to move and the targeted file-id dir. return ('dir1-id', 'dir4-id', [('rename', ('dir1', 'dir3/dir4/dir1'))]) def check_dir1_2_moved(self): self.failIfExists('branch/dir1') self.failUnlessExists('branch/dir3/dir4/dir1') self.failUnlessExists('branch/dir3/dir4/dir1/dir2') def do_move_dir3_into_dir2(self): # The arguments are the file-id to move and the targeted file-id dir. return ('dir3-id', 'dir2-id', [('rename', ('dir3', 'dir1/dir2/dir3'))]) def check_dir3_4_moved(self): self.failIfExists('branch/dir3') self.failUnlessExists('branch/dir1/dir2/dir3') self.failUnlessExists('branch/dir1/dir2/dir3/dir4') def _get_resolve_path_arg(self, wt, action): # ParentLoop is unsual as it says: # moving into . Cancelled move. # But since doesn't exist in the working tree, we need to use # instead path = wt.id2path(self._other_id) return path def assertParentLoop(self, wt, c): if 'taking_other(' in self.id() and 'dir4' in self.id(): raise tests.KnownFailure( "ParentLoop doesn't carry enough info to resolve") # The relevant file-ids are other_args swapped (which is the main # reason why they should be renamed other_args instead of Other_path # and other_id). In the conflict object, they represent: # c.file_id: the directory being moved # c.conflict_id_id: The target directory self.assertEqual(self._other_path, c.file_id) self.assertEqual(self._other_id, c.conflict_file_id) # The conflict paths are irrelevant (they are deterministic but not # worth checking since they don't provide the needed information # anyway) _assert_conflict = assertParentLoop class OldTestResolveParentLoop(TestResolveConflicts): preamble = """ $ bzr init trunk $ cd trunk $ bzr mkdir dir1 $ bzr mkdir dir2 $ bzr commit -m 'Create trunk' $ bzr mv dir2 dir1 $ bzr commit -m 'Moved dir2 into dir1' $ bzr branch . -r 1 ../branch $ cd ../branch $ bzr mv dir1 dir2 $ bzr commit -m 'Moved dir1 into dir2' $ bzr merge ../trunk 2>Conflict moving dir2 into dir2/dir1. Cancelled move. 2>1 conflicts encountered. """ def test_take_this(self): self.run_script(""" $ bzr resolve dir2 $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_take_other(self): self.run_script(""" $ bzr mv dir2/dir1 dir1 $ bzr mv dir2 dir1 $ bzr resolve dir2 $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_resolve_taking_this(self): self.run_script(""" $ bzr resolve --take-this dir2 $ bzr commit --strict -m 'No more conflicts nor unknown files' """) self.failUnlessExists('dir2') def test_resolve_taking_other(self): self.run_script(""" $ bzr resolve --take-other dir2 $ bzr commit --strict -m 'No more conflicts nor unknown files' """) self.failUnlessExists('dir1') class TestResolveNonDirectoryParent(TestResolveConflicts): preamble = """ $ bzr init trunk $ cd trunk $ bzr mkdir foo $ bzr commit -m 'Create trunk' $ echo "Boing" >foo/bar $ bzr add foo/bar $ bzr commit -m 'Add foo/bar' $ bzr branch . -r 1 ../branch $ cd ../branch $ rm -r foo $ echo "Boo!" >foo $ bzr commit -m 'foo is now a file' $ bzr merge ../trunk 2>+N foo.new/bar 2>RK foo => foo.new/ # FIXME: The message is misleading, foo.new *is* a directory when the message # is displayed -- vila 090916 2>Conflict: foo.new is not a directory, but has files in it. Created directory. 2>1 conflicts encountered. """ def test_take_this(self): self.run_script(""" $ bzr rm foo.new --force # FIXME: Isn't it weird that foo is now unkown even if foo.new has been put # aside ? -- vila 090916 $ bzr add foo $ bzr resolve foo.new $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_take_other(self): self.run_script(""" $ bzr rm foo --force $ bzr mv foo.new foo $ bzr resolve foo $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_resolve_taking_this(self): self.run_script(""" $ bzr resolve --take-this foo.new $ bzr commit --strict -m 'No more conflicts nor unknown files' """) def test_resolve_taking_other(self): self.run_script(""" $ bzr resolve --take-other foo.new $ bzr commit --strict -m 'No more conflicts nor unknown files' """) class TestMalformedTransform(script.TestCaseWithTransportAndScript): def test_bug_430129(self): # This is nearly like TestResolveNonDirectoryParent but with branch and # trunk switched. As such it should certainly produce the same # conflict. self.run_script(""" $ bzr init trunk $ cd trunk $ bzr mkdir foo $ bzr commit -m 'Create trunk' $ rm -r foo $ echo "Boo!" >foo $ bzr commit -m 'foo is now a file' $ bzr branch . -r 1 ../branch $ cd ../branch $ echo "Boing" >foo/bar $ bzr add foo/bar $ bzr commit -m 'Add foo/bar' $ bzr merge ../trunk 2>bzr: ERROR: Tree transform is malformed [('unversioned executability', 'new-1')] """) class TestResolveActionOption(tests.TestCase): def setUp(self): super(TestResolveActionOption, self).setUp() self.options = [conflicts.ResolveActionOption()] self.parser = option.get_optparser(dict((o.name, o) for o in self.options)) def parse(self, args): return self.parser.parse_args(args) def test_unknown_action(self): self.assertRaises(errors.BadOptionValue, self.parse, ['--action', 'take-me-to-the-moon']) def test_done(self): opts, args = self.parse(['--action', 'done']) self.assertEqual({'action':'done'}, opts) def test_take_this(self): opts, args = self.parse(['--action', 'take-this']) self.assertEqual({'action': 'take_this'}, opts) opts, args = self.parse(['--take-this']) self.assertEqual({'action': 'take_this'}, opts) def test_take_other(self): opts, args = self.parse(['--action', 'take-other']) self.assertEqual({'action': 'take_other'}, opts) opts, args = self.parse(['--take-other']) self.assertEqual({'action': 'take_other'}, opts)