29
28
revision as _mod_revision,
34
33
from bzrlib.bzrdir import BzrDir
35
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
36
UnversionedParent, ParentLoop, DeletingParent,
34
from bzrlib.conflicts import (
38
43
from bzrlib.diff import show_diff_trees
39
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
40
ReusingTransform, CantMoveRoot,
41
PathsNotVersionedError, ExistingLimbo,
42
ExistingPendingDeletion, ImmortalLimbo,
43
ImmortalPendingDeletion, LockError)
44
from bzrlib.osutils import file_kind, pathjoin
44
from bzrlib.errors import (
47
ExistingPendingDeletion,
49
ImmortalPendingDeletion,
55
from bzrlib.osutils import (
45
59
from bzrlib.merge import Merge3Merger, Merger
46
60
from bzrlib.tests import (
53
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths,
54
resolve_conflicts, cook_conflicts,
55
build_tree, get_backup_name,
56
_FileMover, resolve_checkout,
57
TransformPreview, create_from_tree)
67
from bzrlib.transform import (
60
82
class TestTreeTransform(tests.TestCaseWithTransport):
735
757
' versioned, but has versioned'
736
758
' children. Versioned directory.')
737
759
self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
738
' oz/emeraldcity. Cancelled move.')
760
' oz/emeraldcity. Cancelled move.')
740
762
def prepare_wrong_parent_kind(self):
741
763
tt, root = self.get_transform()
830
852
rename.set_executability(True, myfile)
855
def test_rename_fails(self):
856
# see https://bugs.launchpad.net/bzr/+bug/491763
857
create, root_id = self.get_transform()
858
first_dir = create.new_directory('first-dir', root_id, 'first-id')
859
myfile = create.new_file('myfile', root_id, 'myfile-text',
862
# make the file and directory readonly in the hope this will prevent
864
osutils.make_readonly(self.wt.abspath('first-dir'))
865
osutils.make_readonly(self.wt.abspath('myfile'))
866
# now transform to rename
867
rename_transform, root_id = self.get_transform()
868
file_trans_id = rename_transform.trans_id_file_id('myfile-id')
869
dir_id = rename_transform.trans_id_file_id('first-id')
870
rename_transform.adjust_path('newname', dir_id, file_trans_id)
871
e = self.assertRaises(errors.TransformRenameFailed,
872
rename_transform.apply)
874
# "Failed to rename .../work/.bzr/checkout/limbo/new-1
875
# to .../first-dir/newname: [Errno 13] Permission denied"
876
# so the first filename is not visible in it; we expect a strerror but
877
# it may vary per OS and language so it's not checked here
878
self.assertContainsRe(str(e),
879
"Failed to rename .*first-dir.newname:")
833
881
def test_set_executability_order(self):
834
882
"""Ensure that executability behaves the same, no matter what order.
1923
1971
self.assertTrue(source.is_executable('file1-id'))
1925
1973
def install_rot13_content_filter(self, pattern):
1975
# self.addCleanup(filters._reset_registry, filters._reset_registry())
1976
# below, but that looks a bit... hard to read even if it's exactly
1926
1978
original_registry = filters._reset_registry()
1927
1979
def restore_registry():
1928
1980
filters._reset_registry(original_registry)
2087
2139
self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2142
def test_commit_rich_revision_data(self):
2143
branch, tt = self.get_branch_and_transform()
2144
rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
2145
committer='me <me@example.com>',
2146
revprops={'foo': 'bar'}, revision_id='revid-1',
2147
authors=['Author1 <author1@example.com>',
2148
'Author2 <author2@example.com>',
2150
self.assertEqual('revid-1', rev_id)
2151
revision = branch.repository.get_revision(rev_id)
2152
self.assertEqual(1, revision.timestamp)
2153
self.assertEqual(43201, revision.timezone)
2154
self.assertEqual('me <me@example.com>', revision.committer)
2155
self.assertEqual(['Author1 <author1@example.com>',
2156
'Author2 <author2@example.com>'],
2157
revision.get_apparent_authors())
2158
del revision.properties['authors']
2159
self.assertEqual({'foo': 'bar',
2160
'branch-nick': 'tree'},
2161
revision.properties)
2163
def test_no_explicit_revprops(self):
2164
branch, tt = self.get_branch_and_transform()
2165
rev_id = tt.commit(branch, 'message', authors=[
2166
'Author1 <author1@example.com>',
2167
'Author2 <author2@example.com>', ])
2168
revision = branch.repository.get_revision(rev_id)
2169
self.assertEqual(['Author1 <author1@example.com>',
2170
'Author2 <author2@example.com>'],
2171
revision.get_apparent_authors())
2172
self.assertEqual('tree', revision.properties['branch-nick'])
2091
2175
class MockTransform(object):
2367
2451
def test_ignore_pb(self):
2368
2452
# pb could be supported, but TT.iter_changes doesn't support it.
2369
2453
revision_tree, preview_tree = self.get_tree_and_preview_tree()
2370
preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
2454
preview_tree.iter_changes(revision_tree)
2372
2456
def test_kind(self):
2373
2457
revision_tree = self.create_tree()
2775
2859
file_trans_id = preview.trans_id_file_id('file-id')
2776
2860
preview.delete_contents(file_trans_id)
2777
2861
preview.create_file('a\nb\n', file_trans_id)
2778
pb = progress.DummyProgress()
2779
2862
preview_tree = preview.get_preview_tree()
2780
merger = Merger.from_revision_ids(pb, preview_tree,
2863
merger = Merger.from_revision_ids(None, preview_tree,
2781
2864
child_tree.branch.last_revision(),
2782
2865
other_branch=child_tree.branch,
2783
2866
tree_branch=work_tree.branch)
2795
2878
tt.new_file('name', tt.root, 'content', 'file-id')
2796
2879
tree2 = self.make_branch_and_tree('tree2')
2797
2880
tree2.set_root_id('TREE_ROOT')
2798
pb = progress.DummyProgress()
2799
2881
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2800
pb, tree.basis_tree())
2882
None, tree.basis_tree())
2801
2883
merger.merge_type = Merge3Merger
2802
2884
merger.do_merge()
2813
2895
tt.create_file('baz', trans_id)
2814
2896
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2815
2897
self.build_tree_contents([('tree2/foo', 'qux')])
2816
pb = progress.DummyProgress()
2817
2899
merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2818
2900
pb, tree.basis_tree())
2819
2901
merger.merge_type = Merge3Merger
added
removed
bzrlib/tests/test_transform.py
