~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
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
21
import bzrlib.errors as errors
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
22
from bzrlib.errors import NoSuchRevision, UnlistableBranch, NotBranchError
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
23
from bzrlib.selftest import TestCaseInTempDir
1260 by Martin Pool
- some updates for fetch/update function
24
from bzrlib.trace import mutter
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
25
import bzrlib.transactions as transactions
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
26
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
1092.2.25 by Robert Collins
support ghosts in commits
27
1185.16.56 by Martin Pool
doc
28
# TODO: Make a branch using basis branch, and check that it 
29
# doesn't request any files that could have been avoided, by 
30
# hooking into the Transport.
31
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
32
class TestBranch(TestCaseInTempDir):
33
1102 by Martin Pool
- merge test refactoring from robertc
34
    def test_append_revisions(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
35
        """Test appending more than one revision"""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
36
        br = Branch.initialize(".")
905 by Martin Pool
- merge aaron's append_multiple.patch
37
        br.append_revision("rev1")
38
        self.assertEquals(br.revision_history(), ["rev1",])
39
        br.append_revision("rev2", "rev3")
40
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
1110 by Martin Pool
- merge aaron's merge improvements:
41
1260 by Martin Pool
- some updates for fetch/update function
42
    def test_fetch_revisions(self):
43
        """Test fetch-revision operation."""
44
        from bzrlib.fetch import Fetcher
45
        os.mkdir('b1')
46
        os.mkdir('b2')
1390 by Robert Collins
pair programming worx... merge integration and weave
47
        b1 = Branch.initialize('b1')
48
        b2 = Branch.initialize('b2')
1260 by Martin Pool
- some updates for fetch/update function
49
        file(os.sep.join(['b1', 'foo']), 'w').write('hello')
50
        b1.add(['foo'], ['foo-id'])
51
        b1.commit('lala!', rev_id='revision-1', allow_pointless=False)
52
53
        mutter('start fetch')
54
        f = Fetcher(from_branch=b1, to_branch=b2)
55
        eq = self.assertEquals
56
        eq(f.count_copied, 1)
57
        eq(f.last_revision, 'revision-1')
58
59
        rev = b2.get_revision('revision-1')
60
        tree = b2.revision_tree('revision-1')
61
        eq(tree.get_file_text('foo-id'), 'hello')
62
1391 by Robert Collins
merge from integration
63
    def test_push_stores(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
64
        """Copy the stores from one branch to another"""
65
        os.mkdir('a')
66
        br_a = Branch.initialize("a")
67
        file('a/b', 'wb').write('b')
68
        br_a.add('b')
69
        commit(br_a, "silly commit")
70
71
        os.mkdir('b')
72
        br_b = Branch.initialize("b")
73
        self.assertRaises(NoSuchRevision, br_b.get_revision, 
74
                          br_a.revision_history()[0])
1391 by Robert Collins
merge from integration
75
        br_a.push_stores(br_b)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
76
        rev = br_b.get_revision(br_a.revision_history()[0])
77
        tree = br_b.revision_tree(br_a.revision_history()[0])
78
        for file_id in tree:
79
            if tree.inventory[file_id].kind == "file":
80
                tree.get_file(file_id).read()
81
        return br_a, br_b
82
83
    def test_copy_branch(self):
84
        """Copy the stores from one branch to another"""
1391 by Robert Collins
merge from integration
85
        br_a, br_b = self.test_push_stores()
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
86
        commit(br_b, "silly commit")
87
        os.mkdir('c')
88
        br_c = copy_branch(br_a, 'c', basis_branch=br_b)
89
        self.assertEqual(br_a.revision_history(), br_c.revision_history())
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
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
117
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
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
        
1092.2.27 by Robert Collins
reenable pending merge tests in testbranch.py
122
    def test_pending_merges(self):
123
        """Tracking pending-merged revisions."""
124
        b = Branch.initialize('.')
125
126
        self.assertEquals(b.pending_merges(), [])
127
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
128
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
129
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
130
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
131
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
132
        self.assertEquals(b.pending_merges(),
133
                          ['foo@azkhazan-123123-abcabc',
134
                           'wibble@fofof--20050401--1928390812'])
135
        b.commit("commit from base with two merges")
136
        rev = b.get_revision(b.revision_history()[0])
137
        self.assertEquals(len(rev.parent_ids), 2)
138
        self.assertEquals(rev.parent_ids[0],
139
                          'foo@azkhazan-123123-abcabc')
140
        self.assertEquals(rev.parent_ids[1],
141
                           'wibble@fofof--20050401--1928390812')
142
        # list should be cleared when we do a commit
143
        self.assertEquals(b.pending_merges(), [])
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
144
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
145
    def test_sign_existing_revision(self):
146
        import bzrlib.gpg
147
        branch = Branch.initialize('.')
148
        branch.commit("base", allow_pointless=True, rev_id='A')
149
        from bzrlib.testament import Testament
150
        branch.sign_revision('A', bzrlib.gpg.LoopbackGPGStrategy(None))
151
        self.assertEqual(Testament.from_revision(branch, 'A').as_short_text(),
152
                         branch.revision_store.get('A', 'sig').read())
153
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
154
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
155
class TestRemote(TestCaseWithWebserver):
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
156
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
157
    def test_open_containing(self):
158
        self.assertRaises(NotBranchError, Branch.open_containing,
159
                          self.get_remote_url(''))
160
        self.assertRaises(NotBranchError, Branch.open_containing,
161
                          self.get_remote_url('g/p/q'))
162
        b = Branch.initialize('.')
163
        Branch.open_containing(self.get_remote_url(''))
164
        Branch.open_containing(self.get_remote_url('g/p/q'))
165
        
1110 by Martin Pool
- merge aaron's merge improvements:
166
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
167
#         >>> from bzrlib.commit import commit
168
#         >>> bzrlib.trace.silent = True
169
#         >>> br1 = ScratchBranch(files=['foo', 'bar'])
170
#         >>> br1.add('foo')
171
#         >>> br1.add('bar')
172
#         >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
173
#         >>> br2 = ScratchBranch()
174
#         >>> br2.update_revisions(br1)
175
#         Added 2 texts.
176
#         Added 1 inventories.
177
#         Added 1 revisions.
178
#         >>> br2.revision_history()
179
#         [u'REVISION-ID-1']
180
#         >>> br2.update_revisions(br1)
181
#         Added 0 revisions.
182
#         >>> br1.text_store.total_size() == br2.text_store.total_size()
183
#         True
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
184
185
class InstrumentedTransaction(object):
186
187
    def finish(self):
188
        self.calls.append('finish')
189
190
    def __init__(self):
191
        self.calls = []
192
193
194
class TestBranchTransaction(TestCaseInTempDir):
195
196
    def setUp(self):
197
        super(TestBranchTransaction, self).setUp()
198
        self.branch = Branch.initialize('.')
199
        
200
    def test_default_get_transaction(self):
201
        """branch.get_transaction on a new branch should give a PassThrough."""
202
        self.failUnless(isinstance(self.branch.get_transaction(),
203
                                   transactions.PassThroughTransaction))
204
205
    def test__set_new_transaction(self):
206
        self.branch._set_transaction(transactions.ReadOnlyTransaction())
207
208
    def test__set_over_existing_transaction_raises(self):
209
        self.branch._set_transaction(transactions.ReadOnlyTransaction())
210
        self.assertRaises(errors.LockError,
211
                          self.branch._set_transaction,
212
                          transactions.ReadOnlyTransaction())
213
214
    def test_finish_no_transaction_raises(self):
215
        self.assertRaises(errors.LockError, self.branch._finish_transaction)
216
217
    def test_finish_readonly_transaction_works(self):
218
        self.branch._set_transaction(transactions.ReadOnlyTransaction())
219
        self.branch._finish_transaction()
220
        self.assertEqual(None, self.branch._transaction)
221
222
    def test_unlock_calls_finish(self):
223
        self.branch.lock_read()
224
        transaction = InstrumentedTransaction()
225
        self.branch._transaction = transaction
226
        self.branch.unlock()
227
        self.assertEqual(['finish'], transaction.calls)
228
229
    def test_lock_read_acquires_ro_transaction(self):
230
        self.branch.lock_read()
231
        self.failUnless(isinstance(self.branch.get_transaction(),
232
                                   transactions.ReadOnlyTransaction))
233
        self.branch.unlock()
234
        
235
    def test_lock_write_acquires_passthrough_transaction(self):
236
        self.branch.lock_write()
237
        # cannot use get_transaction as its magic
238
        self.failUnless(isinstance(self.branch._transaction,
239
                                   transactions.PassThroughTransaction))
240
        self.branch.unlock()