/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
1092.2.25 by Robert Collins
support ghosts in commits
25
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
26
class TestBranch(TestCaseInTempDir):
27
1102 by Martin Pool
- merge test refactoring from robertc
28
    def test_append_revisions(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
29
        """Test appending more than one revision"""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
30
        br = Branch.initialize(".")
905 by Martin Pool
- merge aaron's append_multiple.patch
31
        br.append_revision("rev1")
32
        self.assertEquals(br.revision_history(), ["rev1",])
33
        br.append_revision("rev2", "rev3")
34
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
1110 by Martin Pool
- merge aaron's merge improvements:
35
36
1260 by Martin Pool
- some updates for fetch/update function
37
class TestFetch(TestCaseInTempDir):
1391 by Robert Collins
merge from integration
38
1260 by Martin Pool
- some updates for fetch/update function
39
    def test_fetch_revisions(self):
40
        """Test fetch-revision operation."""
41
        from bzrlib.fetch import Fetcher
42
        os.mkdir('b1')
43
        os.mkdir('b2')
1390 by Robert Collins
pair programming worx... merge integration and weave
44
        b1 = Branch.initialize('b1')
45
        b2 = Branch.initialize('b2')
1260 by Martin Pool
- some updates for fetch/update function
46
        file(os.sep.join(['b1', 'foo']), 'w').write('hello')
47
        b1.add(['foo'], ['foo-id'])
48
        b1.commit('lala!', rev_id='revision-1', allow_pointless=False)
49
50
        mutter('start fetch')
51
        f = Fetcher(from_branch=b1, to_branch=b2)
52
        eq = self.assertEquals
53
        eq(f.count_copied, 1)
54
        eq(f.last_revision, 'revision-1')
55
56
        rev = b2.get_revision('revision-1')
57
        tree = b2.revision_tree('revision-1')
58
        eq(tree.get_file_text('foo-id'), 'hello')
59
1391 by Robert Collins
merge from integration
60
    def test_push_stores(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
61
        """Copy the stores from one branch to another"""
62
        os.mkdir('a')
63
        br_a = Branch.initialize("a")
64
        file('a/b', 'wb').write('b')
65
        br_a.add('b')
66
        commit(br_a, "silly commit")
67
68
        os.mkdir('b')
69
        br_b = Branch.initialize("b")
70
        self.assertRaises(NoSuchRevision, br_b.get_revision, 
71
                          br_a.revision_history()[0])
1391 by Robert Collins
merge from integration
72
        br_a.push_stores(br_b)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
73
        rev = br_b.get_revision(br_a.revision_history()[0])
74
        tree = br_b.revision_tree(br_a.revision_history()[0])
75
        for file_id in tree:
76
            if tree.inventory[file_id].kind == "file":
77
                tree.get_file(file_id).read()
78
        return br_a, br_b
79
80
    def test_copy_branch(self):
81
        """Copy the stores from one branch to another"""
1391 by Robert Collins
merge from integration
82
        br_a, br_b = self.test_push_stores()
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
83
        commit(br_b, "silly commit")
84
        os.mkdir('c')
85
        br_c = copy_branch(br_a, 'c', basis_branch=br_b)
86
        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
87
        ## # basis branches currently disabled for weave format
88
        ## self.assertFalse(br_b.last_revision() in br_c.revision_history())
89
        ## br_c.get_revision(br_b.last_revision())
1393.1.23 by Martin Pool
- fix cloning of part of a branch
90
91
    def test_copy_partial(self):
92
        """Copy only part of the history of a branch."""
93
        self.build_tree(['a/', 'a/one'])
94
        br_a = Branch.initialize('a')
95
        br_a.add(['one'])
96
        br_a.commit('commit one', rev_id='u@d-1')
97
        self.build_tree(['a/two'])
98
        br_a.add(['two'])
99
        br_a.commit('commit two', rev_id='u@d-2')
100
        br_b = copy_branch(br_a, 'b', revision='u@d-1')
101
        self.assertEqual(br_b.last_revision(), 'u@d-1')
102
        self.assertTrue(os.path.exists('b/one'))
103
        self.assertFalse(os.path.exists('b/two'))
104
        
1092.2.25 by Robert Collins
support ghosts in commits
105
106
    def test_record_initial_ghost_merge(self):
107
        """A pending merge with no revision present is still a merge."""
108
        branch = Branch.initialize('.')
109
        branch.add_pending_merge('non:existent@rev--ision--0--2')
110
        branch.commit('pretend to merge nonexistent-revision', rev_id='first')
111
        rev = branch.get_revision(branch.last_revision())
112
        self.assertEqual(len(rev.parent_ids), 1)
113
        # parent_sha1s is not populated now, WTF. rbc 20051003
114
        self.assertEqual(len(rev.parent_sha1s), 0)
115
        self.assertEqual(rev.parent_ids[0], 'non:existent@rev--ision--0--2')
116
117
# TODO:
118
# compare the gpg-to-sign info for a commit with a ghost and 
119
#     an identical tree without a ghost
120
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
121
        
1110 by Martin Pool
- merge aaron's merge improvements:
122
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
123
#         >>> from bzrlib.commit import commit
124
#         >>> bzrlib.trace.silent = True
125
#         >>> br1 = ScratchBranch(files=['foo', 'bar'])
126
#         >>> br1.add('foo')
127
#         >>> br1.add('bar')
128
#         >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
129
#         >>> br2 = ScratchBranch()
130
#         >>> br2.update_revisions(br1)
131
#         Added 2 texts.
132
#         Added 1 inventories.
133
#         Added 1 revisions.
134
#         >>> br2.revision_history()
135
#         [u'REVISION-ID-1']
136
#         >>> br2.update_revisions(br1)
137
#         Added 0 revisions.
138
#         >>> br1.text_store.total_size() == br2.text_store.total_size()
139
#         True