~bzr-pqm/bzr/bzr.dev

905 by Martin Pool
- merge aaron's append_multiple.patch
1
# (C) 2005 Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
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
16
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
17
import os
1393.1.5 by Martin Pool
- move copy_branch into bzrlib.clone
18
from bzrlib.branch import Branch
19
from bzrlib.clone import copy_branch
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
20
from bzrlib.commit import commit
21
from bzrlib.errors import NoSuchRevision, UnlistableBranch
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
22
from bzrlib.selftest import TestCaseInTempDir
1260 by Martin Pool
- some updates for fetch/update function
23
from bzrlib.trace import mutter
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
24
25
class TestBranch(TestCaseInTempDir):
26
1102 by Martin Pool
- merge test refactoring from robertc
27
    def test_append_revisions(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
28
        """Test appending more than one revision"""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
29
        br = Branch.initialize(".")
905 by Martin Pool
- merge aaron's append_multiple.patch
30
        br.append_revision("rev1")
31
        self.assertEquals(br.revision_history(), ["rev1",])
32
        br.append_revision("rev2", "rev3")
33
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
1110 by Martin Pool
- merge aaron's merge improvements:
34
35
1260 by Martin Pool
- some updates for fetch/update function
36
class TestFetch(TestCaseInTempDir):
1391 by Robert Collins
merge from integration
37
1260 by Martin Pool
- some updates for fetch/update function
38
    def test_fetch_revisions(self):
39
        """Test fetch-revision operation."""
40
        from bzrlib.fetch import Fetcher
41
        os.mkdir('b1')
42
        os.mkdir('b2')
1390 by Robert Collins
pair programming worx... merge integration and weave
43
        b1 = Branch.initialize('b1')
44
        b2 = Branch.initialize('b2')
1260 by Martin Pool
- some updates for fetch/update function
45
        file(os.sep.join(['b1', 'foo']), 'w').write('hello')
46
        b1.add(['foo'], ['foo-id'])
47
        b1.commit('lala!', rev_id='revision-1', allow_pointless=False)
48
49
        mutter('start fetch')
50
        f = Fetcher(from_branch=b1, to_branch=b2)
51
        eq = self.assertEquals
52
        eq(f.count_copied, 1)
53
        eq(f.last_revision, 'revision-1')
54
55
        rev = b2.get_revision('revision-1')
56
        tree = b2.revision_tree('revision-1')
57
        eq(tree.get_file_text('foo-id'), 'hello')
58
1391 by Robert Collins
merge from integration
59
    def test_push_stores(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
60
        """Copy the stores from one branch to another"""
61
        os.mkdir('a')
62
        br_a = Branch.initialize("a")
63
        file('a/b', 'wb').write('b')
64
        br_a.add('b')
65
        commit(br_a, "silly commit")
66
67
        os.mkdir('b')
68
        br_b = Branch.initialize("b")
69
        self.assertRaises(NoSuchRevision, br_b.get_revision, 
70
                          br_a.revision_history()[0])
1391 by Robert Collins
merge from integration
71
        br_a.push_stores(br_b)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
72
        rev = br_b.get_revision(br_a.revision_history()[0])
73
        tree = br_b.revision_tree(br_a.revision_history()[0])
74
        for file_id in tree:
75
            if tree.inventory[file_id].kind == "file":
76
                tree.get_file(file_id).read()
77
        return br_a, br_b
78
79
    def test_copy_branch(self):
80
        """Copy the stores from one branch to another"""
1391 by Robert Collins
merge from integration
81
        br_a, br_b = self.test_push_stores()
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
82
        commit(br_b, "silly commit")
83
        os.mkdir('c')
84
        br_c = copy_branch(br_a, 'c', basis_branch=br_b)
85
        self.assertEqual(br_a.revision_history(), br_c.revision_history())
1393.1.20 by Martin Pool
- faster branch command that just copies whole weaves without unpacking them
86
        ## # basis branches currently disabled for weave format
87
        ## self.assertFalse(br_b.last_revision() in br_c.revision_history())
88
        ## br_c.get_revision(br_b.last_revision())
1393.1.9 by Martin Pool
- tidy up test assertion
89
        
1110 by Martin Pool
- merge aaron's merge improvements:
90
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
91
#         >>> from bzrlib.commit import commit
92
#         >>> bzrlib.trace.silent = True
93
#         >>> br1 = ScratchBranch(files=['foo', 'bar'])
94
#         >>> br1.add('foo')
95
#         >>> br1.add('bar')
96
#         >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
97
#         >>> br2 = ScratchBranch()
98
#         >>> br2.update_revisions(br1)
99
#         Added 2 texts.
100
#         Added 1 inventories.
101
#         Added 1 revisions.
102
#         >>> br2.revision_history()
103
#         [u'REVISION-ID-1']
104
#         >>> br2.update_revisions(br1)
105
#         Added 0 revisions.
106
#         >>> br1.text_store.total_size() == br2.text_store.total_size()
107
#         True