← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-03-02 10:21:39 UTC
  • mfrom: (4797.2.24 2.1)
  • mto: This revision was merged to the branch mainline in revision 5069.
  • Revision ID: v.ladeuil+lp@free.fr-20100302102139-b5cba7h6xu13mekg
Merge 2.1 into trunk including fixes for #331095, #507557, #185103, #524184 and #369501

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_split.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import bzrdir, tests
 
20
from bzrlib import bzrdir, tests, workingtree
 
21
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit4
 
22
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack4
 
23
 
21
24
 
22
25
 
23
26
class TestSplit(tests.TestCaseWithTransport):
24
27
 
25
28
    def test_split(self):
26
29
        self.build_tree(['a/', 'a/b/', 'a/b/c'])
27
 
        wt = self.make_branch_and_tree('a')
 
30
        wt = self.make_branch_and_tree('a', format='rich-root-pack')
28
31
        wt.add(['b', 'b/c'])
29
32
        wt.commit('rev1')
30
33
        self.run_bzr('split a/b')
31
 
        self.run_bzr_error(('.* is not versioned',), 'split q')
 
34
        self.run_bzr_error(('.* is not versioned',), 'split q', working_dir='a')
32
35
 
33
36
    def test_split_repo_failure(self):
34
37
        repo = self.make_repository('branch', shared=True, format='knit')
38
41
        wt.add(['b', 'b/c', 'b/c/d'], ['b-id', 'c-id', 'd-id'])
39
42
        wt.commit('added files')
40
43
        self.run_bzr_error(('must upgrade your branch at .*a',), 'split a/b')
 
44
 
 
45
    def test_split_tree_failure(self):
 
46
        tree = self.make_branch_and_tree('tree', format='pack-0.92')
 
47
        self.build_tree(['tree/subtree/'])
 
48
        tree.add('subtree')
 
49
        tree.commit('added subtree')
 
50
        self.run_bzr_error(('must upgrade your branch at .*tree','rich roots'),
 
51
                           'split tree/subtree')
 
52
 
 
53
    def split_formats(self, format, repo_format):
 
54
        tree = self.make_branch_and_tree('rich-root', format=format)
 
55
        self.build_tree(['rich-root/a/'])
 
56
        tree.add('a')
 
57
        self.run_bzr(['split', 'rich-root/a'])
 
58
        subtree = workingtree.WorkingTree.open('rich-root/a')
 
59
        self.assertIsInstance(subtree.branch.repository._format,
 
60
                              repo_format)
 
61
 
 
62
    def test_split_rich_root(self):
 
63
        self.split_formats('rich-root', RepositoryFormatKnit4)
 
64
 
 
65
    def test_split_rich_root_pack(self):
 
66
        self.split_formats('rich-root-pack', RepositoryFormatKnitPack4)