~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
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
18
import sys
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
19
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
20
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
1393.1.5 by Martin Pool
- move copy_branch into bzrlib.clone
21
from bzrlib.clone import copy_branch
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
22
from bzrlib.commit import commit
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
23
import bzrlib.errors as errors
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
24
from bzrlib.errors import NoSuchRevision, UnlistableBranch, NotBranchError
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
25
import bzrlib.gpg
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
26
from bzrlib.osutils import getcwd
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
27
from bzrlib.tests import TestCase, TestCaseInTempDir
28
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
1260 by Martin Pool
- some updates for fetch/update function
29
from bzrlib.trace import mutter
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
30
import bzrlib.transactions as transactions
1185.12.98 by Aaron Bentley
Support for forcing merges of unrelated trees
31
from bzrlib.revision import NULL_REVISION
1092.2.25 by Robert Collins
support ghosts in commits
32
1185.16.56 by Martin Pool
doc
33
# TODO: Make a branch using basis branch, and check that it 
34
# doesn't request any files that could have been avoided, by 
35
# hooking into the Transport.
36
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
37
class TestBranch(TestCaseInTempDir):
38
1102 by Martin Pool
- merge test refactoring from robertc
39
    def test_append_revisions(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
40
        """Test appending more than one revision"""
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
41
        br = Branch.initialize(u".")
905 by Martin Pool
- merge aaron's append_multiple.patch
42
        br.append_revision("rev1")
43
        self.assertEquals(br.revision_history(), ["rev1",])
44
        br.append_revision("rev2", "rev3")
45
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
1110 by Martin Pool
- merge aaron's merge improvements:
46
1260 by Martin Pool
- some updates for fetch/update function
47
    def test_fetch_revisions(self):
48
        """Test fetch-revision operation."""
49
        from bzrlib.fetch import Fetcher
50
        os.mkdir('b1')
51
        os.mkdir('b2')
1390 by Robert Collins
pair programming worx... merge integration and weave
52
        b1 = Branch.initialize('b1')
53
        b2 = Branch.initialize('b2')
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
54
        file('b1/foo', 'w').write('hello')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
55
        b1.working_tree().add(['foo'], ['foo-id'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
56
        b1.working_tree().commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
57
58
        mutter('start fetch')
59
        f = Fetcher(from_branch=b1, to_branch=b2)
60
        eq = self.assertEquals
61
        eq(f.count_copied, 1)
62
        eq(f.last_revision, 'revision-1')
63
64
        rev = b2.get_revision('revision-1')
65
        tree = b2.revision_tree('revision-1')
66
        eq(tree.get_file_text('foo-id'), 'hello')
67
1185.12.98 by Aaron Bentley
Support for forcing merges of unrelated trees
68
    def test_revision_tree(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
69
        b1 = Branch.initialize(u'.')
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
70
        b1.working_tree().commit('lala!', rev_id='revision-1', allow_pointless=True)
1185.12.98 by Aaron Bentley
Support for forcing merges of unrelated trees
71
        tree = b1.revision_tree('revision-1')
72
        tree = b1.revision_tree(None)
73
        self.assertEqual(len(tree.list_files()), 0)
74
        tree = b1.revision_tree(NULL_REVISION)
75
        self.assertEqual(len(tree.list_files()), 0)
76
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
77
    def get_unbalanced_branch_pair(self):
78
        """Return two branches, a and b, with one file in a."""
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
79
        os.mkdir('a')
80
        br_a = Branch.initialize("a")
81
        file('a/b', 'wb').write('b')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
82
        br_a.working_tree().add('b')
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
83
        commit(br_a, "silly commit", rev_id='A')
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
84
        os.mkdir('b')
85
        br_b = Branch.initialize("b")
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
86
        return br_a, br_b
87
88
    def get_balanced_branch_pair(self):
89
        """Returns br_a, br_b as with one commit in a, and b has a's stores."""
90
        br_a, br_b = self.get_unbalanced_branch_pair()
91
        br_a.push_stores(br_b)
92
        return br_a, br_b
93
94
    def test_push_stores(self):
95
        """Copy the stores from one branch to another"""
96
        br_a, br_b = self.get_unbalanced_branch_pair()
97
        # ensure the revision is missing.
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
98
        self.assertRaises(NoSuchRevision, br_b.get_revision, 
99
                          br_a.revision_history()[0])
1391 by Robert Collins
merge from integration
100
        br_a.push_stores(br_b)
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
101
        # check that b now has all the data from a's first commit.
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
102
        rev = br_b.get_revision(br_a.revision_history()[0])
103
        tree = br_b.revision_tree(br_a.revision_history()[0])
104
        for file_id in tree:
105
            if tree.inventory[file_id].kind == "file":
106
                tree.get_file(file_id).read()
107
        return br_a, br_b
108
109
    def test_copy_branch(self):
110
        """Copy the stores from one branch to another"""
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
111
        br_a, br_b = self.get_balanced_branch_pair()
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
112
        commit(br_b, "silly commit")
113
        os.mkdir('c')
114
        br_c = copy_branch(br_a, 'c', basis_branch=br_b)
115
        self.assertEqual(br_a.revision_history(), br_c.revision_history())
1393.1.23 by Martin Pool
- fix cloning of part of a branch
116
117
    def test_copy_partial(self):
118
        """Copy only part of the history of a branch."""
119
        self.build_tree(['a/', 'a/one'])
120
        br_a = Branch.initialize('a')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
121
        br_a.working_tree().add(['one'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
122
        br_a.working_tree().commit('commit one', rev_id='u@d-1')
1393.1.23 by Martin Pool
- fix cloning of part of a branch
123
        self.build_tree(['a/two'])
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
124
        br_a.working_tree().add(['two'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
125
        br_a.working_tree().commit('commit two', rev_id='u@d-2')
1393.1.23 by Martin Pool
- fix cloning of part of a branch
126
        br_b = copy_branch(br_a, 'b', revision='u@d-1')
127
        self.assertEqual(br_b.last_revision(), 'u@d-1')
128
        self.assertTrue(os.path.exists('b/one'))
129
        self.assertFalse(os.path.exists('b/two'))
130
        
1092.2.25 by Robert Collins
support ghosts in commits
131
    def test_record_initial_ghost_merge(self):
132
        """A pending merge with no revision present is still a merge."""
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
133
        branch = Branch.initialize(u'.')
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
134
        branch.working_tree().add_pending_merge('non:existent@rev--ision--0--2')
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
135
        branch.working_tree().commit('pretend to merge nonexistent-revision', rev_id='first')
1092.2.25 by Robert Collins
support ghosts in commits
136
        rev = branch.get_revision(branch.last_revision())
137
        self.assertEqual(len(rev.parent_ids), 1)
138
        # parent_sha1s is not populated now, WTF. rbc 20051003
139
        self.assertEqual(len(rev.parent_sha1s), 0)
140
        self.assertEqual(rev.parent_ids[0], 'non:existent@rev--ision--0--2')
141
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
142
    def test_bad_revision(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
143
        branch = Branch.initialize(u'.')
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
144
        self.assertRaises(errors.InvalidRevisionId, branch.get_revision, None)
145
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
146
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
147
# compare the gpg-to-sign info for a commit with a ghost and 
148
#     an identical tree without a ghost
149
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
150
        
1092.2.27 by Robert Collins
reenable pending merge tests in testbranch.py
151
    def test_pending_merges(self):
152
        """Tracking pending-merged revisions."""
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
153
        b = Branch.initialize(u'.')
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
154
        wt = b.working_tree()
155
        self.assertEquals(wt.pending_merges(), [])
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
156
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
157
        self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc'])
158
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
159
        self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc'])
160
        wt.add_pending_merge('wibble@fofof--20050401--1928390812')
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
161
        self.assertEquals(wt.pending_merges(),
1092.2.27 by Robert Collins
reenable pending merge tests in testbranch.py
162
                          ['foo@azkhazan-123123-abcabc',
163
                           'wibble@fofof--20050401--1928390812'])
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
164
        b.working_tree().commit("commit from base with two merges")
1092.2.27 by Robert Collins
reenable pending merge tests in testbranch.py
165
        rev = b.get_revision(b.revision_history()[0])
166
        self.assertEquals(len(rev.parent_ids), 2)
167
        self.assertEquals(rev.parent_ids[0],
168
                          'foo@azkhazan-123123-abcabc')
169
        self.assertEquals(rev.parent_ids[1],
170
                           'wibble@fofof--20050401--1928390812')
171
        # list should be cleared when we do a commit
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
172
        self.assertEquals(wt.pending_merges(), [])
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
173
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
174
    def test_sign_existing_revision(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
175
        branch = Branch.initialize(u'.')
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
176
        branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
177
        from bzrlib.testament import Testament
178
        branch.sign_revision('A', bzrlib.gpg.LoopbackGPGStrategy(None))
179
        self.assertEqual(Testament.from_revision(branch, 'A').as_short_text(),
180
                         branch.revision_store.get('A', 'sig').read())
181
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
182
    def test_store_signature(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
183
        branch = Branch.initialize(u'.')
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
184
        branch.store_revision_signature(bzrlib.gpg.LoopbackGPGStrategy(None),
185
                                        'FOO', 'A')
186
        self.assertEqual('FOO', branch.revision_store.get('A', 'sig').read())
187
1469 by Robert Collins
Change Transport.* to work with URL's.
188
    def test__relcontrolfilename(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
189
        branch = Branch.initialize(u'.')
1469 by Robert Collins
Change Transport.* to work with URL's.
190
        self.assertEqual('.bzr/%25', branch._rel_controlfilename('%'))
191
        
192
    def test__relcontrolfilename_empty(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
193
        branch = Branch.initialize(u'.')
1469 by Robert Collins
Change Transport.* to work with URL's.
194
        self.assertEqual('.bzr', branch._rel_controlfilename(''))
195
1185.35.11 by Aaron Bentley
Added support for branch nicks
196
    def test_nicks(self):
197
        """Branch nicknames"""
198
        os.mkdir('bzr.dev')
199
        branch = Branch.initialize('bzr.dev')
200
        self.assertEqual(branch.nick, 'bzr.dev')
201
        os.rename('bzr.dev', 'bzr.ab')
202
        branch = Branch.open('bzr.ab')
203
        self.assertEqual(branch.nick, 'bzr.ab')
204
        branch.nick = "Aaron's branch"
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
205
        branch.nick = "Aaron's branch"
1185.35.11 by Aaron Bentley
Added support for branch nicks
206
        self.failUnless(os.path.exists(branch.controlfilename("branch.conf")))
207
        self.assertEqual(branch.nick, "Aaron's branch")
208
        os.rename('bzr.ab', 'integration')
209
        branch = Branch.open('integration')
210
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
211
        branch.nick = u"\u1234"
212
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
213
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
214
    def test_commit_nicks(self):
215
        """Nicknames are committed to the revision"""
216
        os.mkdir('bzr.dev')
217
        branch = Branch.initialize('bzr.dev')
218
        branch.nick = "My happy branch"
1185.33.27 by Martin Pool
[merge] much integrated work from robert and john
219
        branch.working_tree().commit('My commit respect da nick.')
1185.35.15 by Aaron Bentley
Added branch nicks to revisions
220
        committed = branch.get_revision(branch.last_revision())
221
        self.assertEqual(committed.properties["branch-nick"], 
222
                         "My happy branch")
223
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
224
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
225
class TestRemote(TestCaseWithWebserver):
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
226
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
227
    def test_open_containing(self):
228
        self.assertRaises(NotBranchError, Branch.open_containing,
229
                          self.get_remote_url(''))
230
        self.assertRaises(NotBranchError, Branch.open_containing,
231
                          self.get_remote_url('g/p/q'))
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
232
        b = Branch.initialize(u'.')
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
233
        branch, relpath = Branch.open_containing(self.get_remote_url(''))
234
        self.assertEqual('', relpath)
235
        branch, relpath = Branch.open_containing(self.get_remote_url('g/p/q'))
236
        self.assertEqual('g/p/q', relpath)
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
237
        
1110 by Martin Pool
- merge aaron's merge improvements:
238
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
239
#         >>> from bzrlib.commit import commit
240
#         >>> bzrlib.trace.silent = True
241
#         >>> br1 = ScratchBranch(files=['foo', 'bar'])
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
242
#         >>> br1.working_tree().add('foo')
243
#         >>> br1.working_tree().add('bar')
1110 by Martin Pool
- merge aaron's merge improvements:
244
#         >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
245
#         >>> br2 = ScratchBranch()
246
#         >>> br2.update_revisions(br1)
247
#         Added 2 texts.
248
#         Added 1 inventories.
249
#         Added 1 revisions.
250
#         >>> br2.revision_history()
251
#         [u'REVISION-ID-1']
252
#         >>> br2.update_revisions(br1)
253
#         Added 0 revisions.
254
#         >>> br1.text_store.total_size() == br2.text_store.total_size()
255
#         True
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
256
257
class InstrumentedTransaction(object):
258
259
    def finish(self):
260
        self.calls.append('finish')
261
262
    def __init__(self):
263
        self.calls = []
264
265
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
266
class TestDecorator(object):
267
268
    def __init__(self):
269
        self._calls = []
270
271
    def lock_read(self):
272
        self._calls.append('lr')
273
274
    def lock_write(self):
275
        self._calls.append('lw')
276
277
    def unlock(self):
278
        self._calls.append('ul')
279
280
    @needs_read_lock
281
    def do_with_read(self):
282
        return 1
283
284
    @needs_read_lock
285
    def except_with_read(self):
286
        raise RuntimeError
287
288
    @needs_write_lock
289
    def do_with_write(self):
290
        return 2
291
292
    @needs_write_lock
293
    def except_with_write(self):
294
        raise RuntimeError
295
296
297
class TestDecorators(TestCase):
298
299
    def test_needs_read_lock(self):
300
        branch = TestDecorator()
301
        self.assertEqual(1, branch.do_with_read())
302
        self.assertEqual(['lr', 'ul'], branch._calls)
303
304
    def test_excepts_in_read_lock(self):
305
        branch = TestDecorator()
306
        self.assertRaises(RuntimeError, branch.except_with_read)
307
        self.assertEqual(['lr', 'ul'], branch._calls)
308
309
    def test_needs_write_lock(self):
310
        branch = TestDecorator()
311
        self.assertEqual(2, branch.do_with_write())
312
        self.assertEqual(['lw', 'ul'], branch._calls)
313
314
    def test_excepts_in_write_lock(self):
315
        branch = TestDecorator()
316
        self.assertRaises(RuntimeError, branch.except_with_write)
317
        self.assertEqual(['lw', 'ul'], branch._calls)
318
319
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
320
class TestBranchTransaction(TestCaseInTempDir):
321
322
    def setUp(self):
323
        super(TestBranchTransaction, self).setUp()
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
324
        self.branch = Branch.initialize(u'.')
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
325
        
326
    def test_default_get_transaction(self):
327
        """branch.get_transaction on a new branch should give a PassThrough."""
328
        self.failUnless(isinstance(self.branch.get_transaction(),
329
                                   transactions.PassThroughTransaction))
330
331
    def test__set_new_transaction(self):
332
        self.branch._set_transaction(transactions.ReadOnlyTransaction())
333
334
    def test__set_over_existing_transaction_raises(self):
335
        self.branch._set_transaction(transactions.ReadOnlyTransaction())
336
        self.assertRaises(errors.LockError,
337
                          self.branch._set_transaction,
338
                          transactions.ReadOnlyTransaction())
339
340
    def test_finish_no_transaction_raises(self):
341
        self.assertRaises(errors.LockError, self.branch._finish_transaction)
342
343
    def test_finish_readonly_transaction_works(self):
344
        self.branch._set_transaction(transactions.ReadOnlyTransaction())
345
        self.branch._finish_transaction()
346
        self.assertEqual(None, self.branch._transaction)
347
348
    def test_unlock_calls_finish(self):
349
        self.branch.lock_read()
350
        transaction = InstrumentedTransaction()
351
        self.branch._transaction = transaction
352
        self.branch.unlock()
353
        self.assertEqual(['finish'], transaction.calls)
354
355
    def test_lock_read_acquires_ro_transaction(self):
356
        self.branch.lock_read()
357
        self.failUnless(isinstance(self.branch.get_transaction(),
358
                                   transactions.ReadOnlyTransaction))
359
        self.branch.unlock()
360
        
361
    def test_lock_write_acquires_passthrough_transaction(self):
362
        self.branch.lock_write()
363
        # cannot use get_transaction as its magic
364
        self.failUnless(isinstance(self.branch._transaction,
365
                                   transactions.PassThroughTransaction))
366
        self.branch.unlock()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
367
368
369
class TestBranchPushLocations(TestCaseInTempDir):
370
371
    def setUp(self):
372
        super(TestBranchPushLocations, self).setUp()
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
373
        self.branch = Branch.initialize(u'.')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
374
        
375
    def test_get_push_location_unset(self):
376
        self.assertEqual(None, self.branch.get_push_location())
377
378
    def test_get_push_location_exact(self):
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
379
        from bzrlib.config import (branches_config_filename,
380
                                   ensure_config_dir_exists)
381
        ensure_config_dir_exists()
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
382
        fn = branches_config_filename()
383
        print >> open(fn, 'wt'), ("[%s]\n"
384
                                  "push_location=foo" %
385
                                  getcwd())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
386
        self.assertEqual("foo", self.branch.get_push_location())
387
388
    def test_set_push_location(self):
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
389
        from bzrlib.config import (branches_config_filename,
390
                                   ensure_config_dir_exists)
391
        ensure_config_dir_exists()
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
392
        fn = branches_config_filename()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
393
        self.branch.set_push_location('foo')
394
        self.assertFileEqual("[%s]\n"
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
395
                             "push_location = foo" % getcwd(),
396
                             fn)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
397
398
    # TODO RBC 20051029 test getting a push location from a branch in a 
399
    # recursive section - that is, it appends the branch name.