/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_join.py

  • Committer: Martin Pool
  • Date: 2009-07-27 06:28:35 UTC
  • mto: This revision was merged to the branch mainline in revision 4587.
  • Revision ID: mbp@sourcefrog.net-20090727062835-o66p8it658tq1sma
Add CountedLock.get_physical_lock_status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
1
 
# Copyright (C) 2006, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
17
17
 
18
18
import os
19
19
 
20
 
from breezy import (
21
 
    osutils,
22
 
    tests,
23
 
    workingtree,
24
 
    )
 
20
from bzrlib import bzrdir, repository, tests, workingtree
25
21
 
26
22
 
27
23
class TestJoin(tests.TestCaseWithTransport):
28
24
 
29
25
    def make_trees(self):
30
26
        base_tree = self.make_branch_and_tree('tree',
31
 
                                              format='development-subtree')
 
27
            format='dirstate-with-subtree')
32
28
        base_tree.commit('empty commit')
33
29
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
34
30
        sub_tree = self.make_branch_and_tree('tree/subtree')
35
 
        sub_tree.add('file1', b'file1-id')
 
31
        sub_tree.set_root_id('subtree-root-id')
 
32
        sub_tree.add('file1', 'file1-id')
36
33
        sub_tree.commit('added file1')
37
34
        return base_tree, sub_tree
38
35
 
39
36
    def check_success(self, path):
40
37
        base_tree = workingtree.WorkingTree.open(path)
41
 
        self.assertEqual(b'file1-id', base_tree.path2id('subtree/file1'))
 
38
        self.assertEqual('file1-id', base_tree.path2id('subtree/file1'))
42
39
 
43
40
    def test_join(self):
44
41
        base_tree, sub_tree = self.make_trees()
53
50
    def test_join_error(self):
54
51
        base_tree, sub_tree = self.make_trees()
55
52
        os.mkdir('tree/subtree2')
56
 
        osutils.rename('tree/subtree', 'tree/subtree2/subtree')
 
53
        os.rename('tree/subtree', 'tree/subtree2/subtree')
57
54
        self.run_bzr_error(
58
55
            ('Cannot join .*subtree.  Parent directory is not versioned',),
59
 
            'join tree/subtree2/subtree')
 
56
             'join tree/subtree2/subtree')
60
57
        # disabled because this gives an ugly error at present -- mbp 20070306
61
 
        # self.run_bzr_error(
 
58
        ## self.run_bzr_error(
62
59
        ##     ('Cannot join .*subtree.  Parent directory is not versioned',),
63
 
        # 'join', '--reference', 'tree/subtree2/subtree')
 
60
        ##      'join', '--reference', 'tree/subtree2/subtree')
64
61
        self.run_bzr_error(('Not a branch:.*subtree2',),
65
62
                           'join tree/subtree2')
66
63
 
67
64
    def test_join_reference(self):
68
65
        """Join can add a reference if --reference is supplied"""
69
66
        base_tree, sub_tree = self.make_trees()
70
 
        subtree_root_id = sub_tree.path2id('')
71
67
        self.run_bzr('join . --reference', working_dir='tree/subtree')
72
68
        sub_tree.lock_read()
73
69
        self.addCleanup(sub_tree.unlock)
74
 
        if sub_tree.supports_setting_file_ids():
75
 
            self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
76
 
            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
77
 
            self.assertEqual(subtree_root_id, sub_tree.path2id(''))
78
 
            self.assertEqual('', sub_tree.id2path(subtree_root_id))
79
 
            self.assertEqual(
80
 
                sub_tree.path2id('file1'), base_tree.path2id('subtree/file1'))
81
 
 
 
70
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
 
71
        self.assertTrue('file1-id' in sub_tree)
 
72
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
 
73
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
 
74
        self.assertIs(None, base_tree.path2id('subtree/file1'))
82
75
        base_tree.lock_read()
83
76
        self.addCleanup(base_tree.unlock)
84
 
        self.assertEqual(['subtree'], list(base_tree.iter_references()))
85
 
        if base_tree.supports_setting_file_ids():
86
 
            self.assertEqual(b'file1-id', sub_tree.path2id('file1'))
87
 
            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
88
 
            self.assertEqual(subtree_root_id, base_tree.path2id('subtree'))
89
 
            self.assertEqual('subtree', base_tree.id2path(subtree_root_id))
 
77
        self.assertTrue('file1-id' not in base_tree)
 
78
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
 
79
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
90
80
 
91
81
    def test_references_check_repository_support(self):
92
82
        """Users are stopped from adding a reference that can't be committed."""
98
88
        out, err = self.run_bzr('join --reference tree/subtree',
99
89
                                retcode=3)
100
90
        self.assertContainsRe(err, r"Can't join trees")
101
 
        self.assertContainsRe(err, r"use brz upgrade")
 
91
        self.assertContainsRe(err, r"use bzr upgrade")
 
92
 
 
93