← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
import errno
17
18
import os
18
19
from StringIO import StringIO
19
20
import sys
27
28
    osutils,
28
29
    revision as _mod_revision,
29
30
    rules,
 
31
    symbol_versioning,
30
32
    tests,
 
33
    trace,
 
34
    transform,
31
35
    urlutils,
32
36
    )
33
37
from bzrlib.bzrdir import BzrDir
49
53
    ImmortalPendingDeletion,
50
54
    LockError,
51
55
    MalformedTransform,
52
 
    NoSuchFile,
53
56
    ReusingTransform,
54
57
)
55
58
from bzrlib.osutils import (
58
61
)
59
62
from bzrlib.merge import Merge3Merger, Merger
60
63
from bzrlib.tests import (
 
64
    features,
61
65
    HardlinkFeature,
62
66
    SymlinkFeature,
63
 
    TestCase,
64
67
    TestCaseInTempDir,
65
68
    TestSkipped,
66
69
)
70
73
    cook_conflicts,
71
74
    _FileMover,
72
75
    FinalPaths,
73
 
    get_backup_name,
74
76
    resolve_conflicts,
75
77
    resolve_checkout,
76
78
    ROOT_PARENT,
814
816
        self.assertIs(None, self.wt.path2id('parent'))
815
817
        self.assertIs(None, self.wt.path2id('parent.new'))
816
818
 
 
819
    def test_resolve_conflicts_missing_parent(self):
 
820
        wt = self.make_branch_and_tree('.')
 
821
        tt = TreeTransform(wt)
 
822
        self.addCleanup(tt.finalize)
 
823
        parent = tt.trans_id_file_id('parent-id')
 
824
        tt.new_file('file', parent, 'Contents')
 
825
        raw_conflicts = resolve_conflicts(tt)
 
826
        # Since the directory doesn't exist it's seen as 'missing'.  So
 
827
        # 'resolve_conflicts' create a conflict asking for it to be created.
 
828
        self.assertLength(1, raw_conflicts)
 
829
        self.assertEqual(('missing parent', 'Created directory', 'new-1'),
 
830
                         raw_conflicts.pop())
 
831
        # apply fail since the missing directory doesn't exist
 
832
        self.assertRaises(errors.NoFinalPath, tt.apply)
 
833
 
817
834
    def test_moving_versioned_directories(self):
818
835
        create, root = self.get_transform()
819
836
        kansas = create.new_directory('kansas', root, 'kansas-id')
853
870
        rename.apply()
854
871
 
855
872
    def test_rename_fails(self):
 
873
        self.requireFeature(features.not_running_as_root)
856
874
        # see https://bugs.launchpad.net/bzr/+bug/491763
857
875
        create, root_id = self.get_transform()
858
876
        first_dir = create.new_directory('first-dir', root_id, 'first-id')
880
898
        # On windows looks like:
881
899
        # "Failed to rename .../work/myfile to 
882
900
        # .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
883
 
        # The strerror will vary per OS and language so it's not checked here
884
 
        self.assertContainsRe(str(e),
885
 
            "Failed to rename .*(first-dir.newname:|myfile)")
 
901
        # This test isn't concerned with exactly what the error looks like,
 
902
        # and the strerror will vary across OS and locales, but the assert
 
903
        # that the exeception attributes are what we expect
 
904
        self.assertEqual(e.errno, errno.EACCES)
 
905
        if os.name == "posix":
 
906
            self.assertEndsWith(e.to_path, "/first-dir/newname")
 
907
        else:
 
908
            self.assertEqual(os.path.basename(e.from_path), "myfile")
886
909
 
887
910
    def test_set_executability_order(self):
888
911
        """Ensure that executability behaves the same, no matter what order.
2178
2201
        self.assertEqual('tree', revision.properties['branch-nick'])
2179
2202
 
2180
2203
 
2181
 
class MockTransform(object):
2182
 
 
2183
 
    def has_named_child(self, by_parent, parent_id, name):
2184
 
        for child_id in by_parent[parent_id]:
2185
 
            if child_id == '0':
2186
 
                if name == "name~":
2187
 
                    return True
2188
 
            elif name == "name.~%s~" % child_id:
2189
 
                return True
2190
 
        return False
2191
 
 
2192
 
 
2193
 
class MockEntry(object):
2194
 
    def __init__(self):
2195
 
        object.__init__(self)
2196
 
        self.name = "name"
2197
 
 
2198
 
 
2199
 
class TestGetBackupName(TestCase):
2200
 
    def test_get_backup_name(self):
 
2204
class TestBackupName(tests.TestCase):
 
2205
 
 
2206
    def test_deprecations(self):
 
2207
        class MockTransform(object):
 
2208
 
 
2209
            def has_named_child(self, by_parent, parent_id, name):
 
2210
                return name in by_parent.get(parent_id, [])
 
2211
 
 
2212
        class MockEntry(object):
 
2213
 
 
2214
            def __init__(self):
 
2215
                object.__init__(self)
 
2216
                self.name = "name"
 
2217
 
2201
2218
        tt = MockTransform()
2202
 
        name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2203
 
        self.assertEqual(name, 'name.~1~')
2204
 
        name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2205
 
        self.assertEqual(name, 'name.~2~')
2206
 
        name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2207
 
        self.assertEqual(name, 'name.~1~')
2208
 
        name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2209
 
        self.assertEqual(name, 'name.~1~')
2210
 
        name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2211
 
        self.assertEqual(name, 'name.~4~')
 
2219
        name1 = self.applyDeprecated(
 
2220
            symbol_versioning.deprecated_in((2, 3, 0)),
 
2221
            transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
 
2222
        self.assertEqual('name.~1~', name1)
 
2223
        name2 = self.applyDeprecated(
 
2224
            symbol_versioning.deprecated_in((2, 3, 0)),
 
2225
            transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
 
2226
        self.assertEqual('name.~2~', name2)
2212
2227
 
2213
2228
 
2214
2229
class TestFileMover(tests.TestCaseWithTransport):
2329
2344
        self.failUnlessExists('a')
2330
2345
        self.failUnlessExists('a/b')
2331
2346
 
2332
 
    def test_resolve_no_parent(self):
 
2347
 
 
2348
class TestTransformMissingParent(tests.TestCaseWithTransport):
 
2349
 
 
2350
    def make_tt_with_versioned_dir(self):
2333
2351
        wt = self.make_branch_and_tree('.')
 
2352
        self.build_tree(['dir/',])
 
2353
        wt.add(['dir'], ['dir-id'])
 
2354
        wt.commit('Create dir')
2334
2355
        tt = TreeTransform(wt)
2335
2356
        self.addCleanup(tt.finalize)
2336
 
        parent = tt.trans_id_file_id('parent-id')
2337
 
        tt.new_file('file', parent, 'Contents')
2338
 
        resolve_conflicts(tt)
 
2357
        return wt, tt
 
2358
 
 
2359
    def test_resolve_create_parent_for_versioned_file(self):
 
2360
        wt, tt = self.make_tt_with_versioned_dir()
 
2361
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2362
        file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
 
2363
        tt.delete_contents(dir_tid)
 
2364
        tt.unversion_file(dir_tid)
 
2365
        conflicts = resolve_conflicts(tt)
 
2366
        # one conflict for the missing directory, one for the unversioned
 
2367
        # parent
 
2368
        self.assertLength(2, conflicts)
 
2369
 
 
2370
    def test_non_versioned_file_create_conflict(self):
 
2371
        wt, tt = self.make_tt_with_versioned_dir()
 
2372
        dir_tid = tt.trans_id_tree_file_id('dir-id')
 
2373
        tt.new_file('file', dir_tid, 'Contents')
 
2374
        tt.delete_contents(dir_tid)
 
2375
        tt.unversion_file(dir_tid)
 
2376
        conflicts = resolve_conflicts(tt)
 
2377
        # no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
 
2378
        self.assertLength(1, conflicts)
 
2379
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
2380
                         conflicts.pop())
2339
2381
 
2340
2382
 
2341
2383
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2342
2384
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2343
2385
                  (False, False))
2344
2386
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2345
 
              ('', ''), ('directory', 'directory'), (False, None))
 
2387
              ('', ''), ('directory', 'directory'), (False, False))
2346
2388
 
2347
2389
 
2348
2390
class TestTransformPreview(tests.TestCaseWithTransport):
2435
2477
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2436
2478
        changes = preview_tree.iter_changes(revision_tree,
2437
2479
                                            specific_files=[''])
2438
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2480
        self.assertEqual([A_ENTRY], list(changes))
2439
2481
 
2440
2482
    def test_want_unversioned(self):
2441
2483
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2442
2484
        changes = preview_tree.iter_changes(revision_tree,
2443
2485
                                            want_unversioned=True)
2444
 
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
 
2486
        self.assertEqual([A_ENTRY], list(changes))
2445
2487
 
2446
2488
    def test_ignore_extra_trees_no_specific_files(self):
2447
2489
        # extra_trees is harmless without specific_files, so we'll silently
3218
3260
        trans_id = tt.trans_id_tree_path('file')
3219
3261
        self.assertEqual((LINES_ONE,),
3220
3262
            tt._get_parents_texts(trans_id))
 
3263
 
 
3264
 
 
3265
class TestOrphan(tests.TestCaseWithTransport):
 
3266
 
 
3267
    def test_no_orphan_for_transform_preview(self):
 
3268
        tree = self.make_branch_and_tree('tree')
 
3269
        tt = transform.TransformPreview(tree)
 
3270
        self.addCleanup(tt.finalize)
 
3271
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
3272
 
 
3273
    def _set_orphan_policy(self, wt, policy):
 
3274
        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
 
3275
                                               policy)
 
3276
 
 
3277
    def _prepare_orphan(self, wt):
 
3278
        self.build_tree(['dir/', 'dir/file', 'dir/foo'])
 
3279
        wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
 
3280
        wt.commit('add dir and file ignoring foo')
 
3281
        tt = transform.TreeTransform(wt)
 
3282
        self.addCleanup(tt.finalize)
 
3283
        # dir and bar are deleted
 
3284
        dir_tid = tt.trans_id_tree_path('dir')
 
3285
        file_tid = tt.trans_id_tree_path('dir/file')
 
3286
        orphan_tid = tt.trans_id_tree_path('dir/foo')
 
3287
        tt.delete_contents(file_tid)
 
3288
        tt.unversion_file(file_tid)
 
3289
        tt.delete_contents(dir_tid)
 
3290
        tt.unversion_file(dir_tid)
 
3291
        # There should be a conflict because dir still contain foo
 
3292
        raw_conflicts = tt.find_conflicts()
 
3293
        self.assertLength(1, raw_conflicts)
 
3294
        self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
 
3295
        return tt, orphan_tid
 
3296
 
 
3297
    def test_new_orphan_created(self):
 
3298
        wt = self.make_branch_and_tree('.')
 
3299
        self._set_orphan_policy(wt, 'move')
 
3300
        tt, orphan_tid = self._prepare_orphan(wt)
 
3301
        warnings = []
 
3302
        def warning(*args):
 
3303
            warnings.append(args[0] % args[1:])
 
3304
        self.overrideAttr(trace, 'warning', warning)
 
3305
        remaining_conflicts = resolve_conflicts(tt)
 
3306
        self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
 
3307
                          warnings)
 
3308
        # Yeah for resolved conflicts !
 
3309
        self.assertLength(0, remaining_conflicts)
 
3310
        # We have a new orphan
 
3311
        self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
 
3312
        self.assertEquals('bzr-orphans',
 
3313
                          tt.final_name(tt.final_parent(orphan_tid)))
 
3314
 
 
3315
    def test_never_orphan(self):
 
3316
        wt = self.make_branch_and_tree('.')
 
3317
        self._set_orphan_policy(wt, 'conflict')
 
3318
        tt, orphan_tid = self._prepare_orphan(wt)
 
3319
        remaining_conflicts = resolve_conflicts(tt)
 
3320
        self.assertLength(1, remaining_conflicts)
 
3321
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3322
                         remaining_conflicts.pop())
 
3323
 
 
3324
    def test_orphan_error(self):
 
3325
        def bogus_orphan(tt, orphan_id, parent_id):
 
3326
            raise transform.OrphaningError(tt.final_name(orphan_id),
 
3327
                                           tt.final_name(parent_id))
 
3328
        transform.orphaning_registry.register('bogus', bogus_orphan,
 
3329
                                              'Raise an error when orphaning')
 
3330
        wt = self.make_branch_and_tree('.')
 
3331
        self._set_orphan_policy(wt, 'bogus')
 
3332
        tt, orphan_tid = self._prepare_orphan(wt)
 
3333
        remaining_conflicts = resolve_conflicts(tt)
 
3334
        self.assertLength(1, remaining_conflicts)
 
3335
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3336
                         remaining_conflicts.pop())
 
3337
 
 
3338
    def test_unknown_orphan_policy(self):
 
3339
        wt = self.make_branch_and_tree('.')
 
3340
        # Set a fictional policy nobody ever implemented
 
3341
        self._set_orphan_policy(wt, 'donttouchmypreciouuus')
 
3342
        tt, orphan_tid = self._prepare_orphan(wt)
 
3343
        warnings = []
 
3344
        def warning(*args):
 
3345
            warnings.append(args[0] % args[1:])
 
3346
        self.overrideAttr(trace, 'warning', warning)
 
3347
        remaining_conflicts = resolve_conflicts(tt)
 
3348
        # We fallback to the default policy which create a conflict
 
3349
        self.assertLength(1, remaining_conflicts)
 
3350
        self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
 
3351
                         remaining_conflicts.pop())
 
3352
        self.assertLength(1, warnings)
 
3353
        self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')