~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 4597.7.18

Rev	Summary	Authors	Date
4597.7.18	Start addressing Andrew's concerns. Start addressing Andrew's concerns. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts): Add a docstring. (TestResolvePathConflictBefore531967.assertPathConflict): Really inject the old fashioned conflict object. * bzrlib/merge.py: (Merge3Merger._merge_names): Better explain why we shouldn't generate helpers at this point. (Merge3Merger.cook_conflicts): Be more verbose when failing. * bzrlib/conflicts.py: (PathConflict._resolve): Be more verbose when failing.	Vincent Ladeuil	15 years ago
4597.7.17	Add a scenario and activate the compatibility tests. Add a scenario and activate the compatibility tests. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts.mirror_scenarios): The common parameters needs to be specific for each scenario (but still common for the mirrors). (TestParametrizedResolveConflicts.assertConflict): Provides the working tree as a parameter. (TestParametrizedResolveConflicts.do_rename_file, TestParametrizedResolveConflicts.check_file_renamed): More helpers. (TestResolvePathConflict.scenarios): Add one more scenario. (TestResolvePathConflict.do_delete_file) (TestResolvePathConflict.scenarios): Oops, really activate the compatibility tests. (TestResolvePathConflict.assertPathConflict): Inject the conflict object as it was built before the fix.	Vincent Ladeuil	15 years ago
4597.7.16	Some cleanup. Some cleanup. * bzrlib/tests/test_conflicts.py: (TestResolveContentsConflict, TestResolvePathConflict): Cleanup scenarios and sme method names. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts): Cleanup common parameter which are really test class attributes. * bzrlib/conflicts.py: (PathConflict._infer_file_id): Cleaned up.	Vincent Ladeuil	15 years ago
4597.7.15	Workaround bug #533547. Workaround bug #533547. * bzrlib/conflicts.py: (PathConflict._resolve, PathConflict._get_or_infer_file_id, PathConflict._revision_tree): Workaround bug #533547 by getting revision trees directly from the repo.	Vincent Ladeuil	15 years ago
4597.7.14	Tweak the fix to not use helpers but let resolve restore the... Tweak the fix to not use helpers but let resolve restore the old version. * bzrlib/merge.py: (Merge3Merger._merge_names): Don't create helpers as it may conflict with a related 'contents conflit'. * bzrlib/conflicts.py: (PathConflict.associated_filenames): No more helpers. (PathConflict._resolve): Restore the item if needed (based on the paths involved).	Vincent Ladeuil	15 years ago
4597.7.13	Remove some duplication. Remove some duplication.	Vincent Ladeuil	15 years ago
4597.7.12	Creating helpers for 'name conflicts' may conflict with the ... Creating helpers for 'name conflicts' may conflict with the helpers created bfor ContentConflicts, bzrlib.tests.test_transform.TestTransformMerge.test_filename_merge_conflicts fails with this fix.	Vincent Ladeuil	15 years ago
4597.7.11	Fix #531967 by creating helpers for PathConflicts when a del... Fix #531967 by creating helpers for PathConflicts when a deletion is involved. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts.mirror_scenarios): Renamed from multiply_scenarios to make the intent clearer. Turned into a classmethod too for the same reason. (TestParametrizedResolveConflicts.scenarios): Now a classmethod. * bzrlib/merge.py: (Merge3Merger._merge_names): 'name conflict' and 'parent conflict' can (and must) be handled in the same way. If a deletion is involved we create an unversioned copy of the rejected item so the user can restore that easily. (Merge3Merger.cook_conflicts): Get rid of 'name conflict', 'parent conflict' distinction and just create PathConflicts with a file_id to address bug #531967. * bzrlib/conflicts.py: (PathConflict.associated_filenames): Helpers exist only when a deletion is involved. (PathConflict._resolve): We may have to version one path again. This may happen when a deletion have occurred. (PathConflict.action_take_this, PathConflict.action_take_other): As a special case, we may have an helper to use when deletion was involved.	Vincent Ladeuil	15 years ago
4597.7.10	Define scenarios by test classes. Define scenarios by test classes. * bzrlib/tests/test_conflicts.py: (load_tests): Allows test classes to define their own scenarios. (TestParametrizedResolveConflicts.multiply_scenarios): Mirror tests inverting 'this' and 'other' actions. (TestResolveContentsConflict, TestResolvePathConflict, TestResolvePathConflictBefore531967): Specific classes defining their own scenarios. (OldTestResolvePathConflict): Renamed from TestResolvePathConflict until deletion.	Vincent Ladeuil	15 years ago
4597.7.9	Resolve the PathConflict when the file-id has been lost due ... Resolve the PathConflict when the file-id has been lost due to bug #531967. * bzrlib/conflicts.py: (PathConflict._resolve): Fix comment. (PathConflict._get_or_infer_file_id): Get back the file-id by searching in the ancestry. (PathConflict.action_take_this, PathConflict.action_take_other): When file-id is not None, we need to find it back before being able to resolve the conflict.	Vincent Ladeuil	15 years ago
4597.7.8	Some refactoring to help address bug #531967. Some refactoring to help address bug #531967. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts.check_resolved): Use 'path' as the parameter name as it's clearer than 'item'. * bzrlib/conflicts.py: (PathConflict._resolve): Implement the rename with a proper TreeTransform. This doesn't address bug #531967 yet. (PathConflict._get_or_infer_file_id): First (unsuccesful) try to infer the file-id. (ContentsConflict._resolve): Renamed from _take_it.	Vincent Ladeuil	15 years ago
4597.7.7	Reproduce bug #531967 on various aspects. Reproduce bug #531967 on various aspects. * bzrlib/tests/test_conflicts.py: (resolve_conflict_scenarios): Add another PathConflict test to reproduce bug #531967 and specialize assertConflict as different conflicts requires different checks. (TestParametrizedResolveConflicts.setUp): Actions now also provide more info on changed item. (TestParametrizedResolveConflicts.assert_PathConflict, TestParametrizedResolveConflicts.assert_ContentsConflict): New helpers. (TestParametrizedResolveConflicts.assertConflict): Delegate some checks to a specialized method. (TestParametrizedResolveConflicts): Update the action helpers to provide more info. * bzrlib/merge.py: (Merge3Merger.cook_conflicts): path/conflict_path attributes seem to be reversed for PathConflict objects.	Vincent Ladeuil	15 years ago
4597.7.6	Cleanup TestParametrizedResolveConflicts some more. Cleanup TestParametrizedResolveConflicts some more. * bzrlib/tests/test_conflicts.py: (resolve_conflict_scenarios): Add a _base_action parameter to avoid creating useless items. (TestParametrizedResolveConflicts.do_create_file, TestParametrizedResolveConflicts.do_create_file): New helpers.	Vincent Ladeuil	15 years ago
4597.7.5	Simplify resolve_conflict_scenarios. Simplify resolve_conflict_scenarios. * bzrlib/tests/test_conflicts.py: (resolve_conflict_scenarios): Enhance readability.	Vincent Ladeuil	15 years ago
4597.7.4	Abstract the test class some more to address more conflict Abstract the test class some more to address more conflict types. This currently fails test_resolve_taking_other(dir_renamed,dir_deleted) because the conflict object doesn't record the file-id involved. * bzrlib/tests/test_conflicts.py: (resolve_conflict_scenarios): Renamed from content_conflict_scenarios because we basically want to use the same tests for various conflict types. (TestParametrizedResolveConflicts): Add more attributes. (TestParametrizedResolveConflicts.setUp): Create a dir for other types of conflicts. (TestParametrizedResolveConflicts.assertConflict): Use the conflict type parameter instead of requiring the method parameter. (TestParametrizedResolveConflicts.do_rename_dir, TestParametrizedResolveConflicts.check_dir_renamed, TestParametrizedResolveConflicts.do_delete_dir, TestParametrizedResolveConflicts.check_dir_doesnt_exist): More helpers.	Vincent Ladeuil	15 years ago
4597.7.3	Fix typos, tests passing. Fix typos, tests passing.	Vincent Ladeuil	15 years ago
4597.7.2	Each base scenario should be mirrored. Each base scenario should be mirrored. * bzrlib/tests/test_conflicts.py: (content_conflict_scenarios): Generate derived scenarios from base.	Vincent Ladeuil	15 years ago
4597.7.1	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
4597.2.26	Fix bug #529968 by renaming the kept file on content conflic... Fix bug #529968 by renaming the kept file on content conflicts. * bzrlib/conflicts.py: (ContentsConflict._take_it): Helper to resolve the conflict, factored out of the two symmetric cases. Use a tree transform to transparently handle more cases. (ContentsConflict.action_take_this, ContentsConflict.action_take_other): * bzrlib/tests/test_conflicts.py: (load_tests): Start parametrizing tests. (content_conflict_scenarios): First scenarios for ContenConflict. (TestResolveContentConflicts.setUp): Actions are parameters. (TestResolveContentConflicts.test_resolve_taking_this, TestResolveContentConflicts.test_resolve_taking_other): Finer checks are parameters. (TestResolveContentConflicts._get_actions) (TestResolveContentConflicts._get_check): Helpers. (TestResolveContentConflicts.do_modify_file, TestResolveContentConflicts.do_delete_file): Specific actions. (TestResolveContentConflicts.check_file_has_more_content, TestResolveContentConflicts.check_file_doesnt_exist): Specific checks.	Vincent Ladeuil	15 years ago
4597.2.25	Reproduce bug #529968. Reproduce bug #529968. * bzrlib/tests/test_conflicts.py: (OldTestResolveContentConflicts): Remove blackbox tests. (TestResolveContentConflicts.test_resolve_taking_this): Ensure we end up with the right path for the file when the conflict is resolved. (TestResolveContentConflicts.test_resolve_taking_other): Ensure we end up with no file after the conflict is resolved.	Vincent Ladeuil	15 years ago

Older »