1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
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.
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.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""Tests for the Branch facility that are not interface tests.
19
For interface tests see `tests/per_branch/*.py`.
21
For concrete class tests see this file, and for meta-branch tests
26
branch as _mod_branch,
35
branch as _mod_bzrbranch,
38
from ..bzr.fullhistory import (
42
from ..sixish import (
47
class TestDefaultFormat(tests.TestCase):
49
def test_default_format(self):
50
# update this if you change the default branch format
51
self.assertIsInstance(_mod_branch.format_registry.get_default(),
52
_mod_bzrbranch.BzrBranchFormat7)
54
def test_default_format_is_same_as_bzrdir_default(self):
55
# XXX: it might be nice if there was only one place the default was
56
# set, but at the moment that's not true -- mbp 20070814 --
57
# https://bugs.launchpad.net/bzr/+bug/132376
59
_mod_branch.format_registry.get_default(),
60
bzrdir.BzrDirFormat.get_default_format().get_branch_format())
62
def test_get_set_default_format(self):
63
# set the format and then set it back again
64
old_format = _mod_branch.format_registry.get_default()
65
_mod_branch.format_registry.set_default(
68
# the default branch format is used by the meta dir format
69
# which is not the default bzrdir format at this point
70
dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
71
result = dir.create_branch()
72
self.assertEqual(result, 'A branch')
74
_mod_branch.format_registry.set_default(old_format)
75
self.assertEqual(old_format,
76
_mod_branch.format_registry.get_default())
79
class TestBranchFormat5(tests.TestCaseWithTransport):
80
"""Tests specific to branch format 5"""
82
def test_branch_format_5_uses_lockdir(self):
84
bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
85
bdir.create_repository()
86
branch = BzrBranchFormat5().initialize(bdir)
87
t = self.get_transport()
88
self.log("branch instance is %r" % branch)
89
self.assertTrue(isinstance(branch, BzrBranch5))
90
self.assertIsDirectory('.', t)
91
self.assertIsDirectory('.bzr/branch', t)
92
self.assertIsDirectory('.bzr/branch/lock', t)
94
self.addCleanup(branch.unlock)
95
self.assertIsDirectory('.bzr/branch/lock/held', t)
97
def test_set_push_location(self):
98
conf = config.LocationConfig.from_string('# comment\n', '.', save=True)
100
branch = self.make_branch('.', format='knit')
101
branch.set_push_location('foo')
102
local_path = urlutils.local_path_from_url(branch.base[:-1])
103
self.assertFileEqual("# comment\n"
105
"push_location = foo\n"
106
"push_location:policy = norecurse\n" % local_path,
107
config.locations_config_filename())
109
# TODO RBC 20051029 test getting a push location from a branch in a
110
# recursive section - that is, it appends the branch name.
113
class SampleBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
116
this format is initializable, unsupported to aid in testing the
117
open and open_downlevel routines.
121
def get_format_string(cls):
122
"""See BzrBranchFormat.get_format_string()."""
123
return "Sample branch format."
125
def initialize(self, a_bzrdir, name=None, repository=None,
126
append_revisions_only=None):
127
"""Format 4 branches cannot be created."""
128
t = a_bzrdir.get_branch_transport(self, name=name)
129
t.put_bytes('format', self.get_format_string())
132
def is_supported(self):
135
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
136
possible_transports=None):
137
return "opened branch."
140
# Demonstrating how lazy loading is often implemented:
141
# A constant string is created.
142
SampleSupportedBranchFormatString = "Sample supported branch format."
144
# And the format class can then reference the constant to avoid skew.
145
class SampleSupportedBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
146
"""A sample supported format."""
149
def get_format_string(cls):
150
"""See BzrBranchFormat.get_format_string()."""
151
return SampleSupportedBranchFormatString
153
def initialize(self, a_bzrdir, name=None, append_revisions_only=None):
154
t = a_bzrdir.get_branch_transport(self, name=name)
155
t.put_bytes('format', self.get_format_string())
158
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
159
possible_transports=None):
160
return "opened supported branch."
163
class SampleExtraBranchFormat(_mod_branch.BranchFormat):
164
"""A sample format that is not usable in a metadir."""
166
def get_format_string(self):
167
# This format is not usable in a metadir.
170
def network_name(self):
171
# Network name always has to be provided.
174
def initialize(self, a_bzrdir, name=None):
175
raise NotImplementedError(self.initialize)
177
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
178
possible_transports=None):
179
raise NotImplementedError(self.open)
182
class TestBzrBranchFormat(tests.TestCaseWithTransport):
183
"""Tests for the BzrBranchFormat facility."""
185
def test_find_format(self):
186
# is the right format object found for a branch?
187
# create a branch with a few known format objects.
188
# this is not quite the same as
189
self.build_tree(["foo/", "bar/"])
190
def check_format(format, url):
191
dir = format._matchingbzrdir.initialize(url)
192
dir.create_repository()
193
format.initialize(dir)
194
found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(dir)
195
self.assertIsInstance(found_format, format.__class__)
196
check_format(BzrBranchFormat5(), "bar")
198
def test_from_string(self):
199
self.assertIsInstance(
200
SampleBranchFormat.from_string("Sample branch format."),
202
self.assertRaises(AssertionError,
203
SampleBranchFormat.from_string, "Different branch format.")
205
def test_find_format_not_branch(self):
206
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
207
self.assertRaises(errors.NotBranchError,
208
_mod_bzrbranch.BranchFormatMetadir.find_format,
211
def test_find_format_unknown_format(self):
212
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
213
SampleBranchFormat().initialize(dir)
214
self.assertRaises(errors.UnknownFormatError,
215
_mod_bzrbranch.BranchFormatMetadir.find_format,
218
def test_find_format_with_features(self):
219
tree = self.make_branch_and_tree('.', format='2a')
220
tree.branch.update_feature_flags({"name": "optional"})
221
found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(tree.bzrdir)
222
self.assertIsInstance(found_format, _mod_bzrbranch.BranchFormatMetadir)
223
self.assertEqual(found_format.features.get("name"), "optional")
224
tree.branch.update_feature_flags({"name": None})
225
branch = _mod_branch.Branch.open('.')
226
self.assertEqual(branch._format.features, {})
229
class TestBranchFormatRegistry(tests.TestCase):
232
super(TestBranchFormatRegistry, self).setUp()
233
self.registry = _mod_branch.BranchFormatRegistry()
235
def test_default(self):
236
self.assertIs(None, self.registry.get_default())
237
format = SampleBranchFormat()
238
self.registry.set_default(format)
239
self.assertEqual(format, self.registry.get_default())
241
def test_register_unregister_format(self):
242
format = SampleBranchFormat()
243
self.registry.register(format)
244
self.assertEqual(format,
245
self.registry.get("Sample branch format."))
246
self.registry.remove(format)
247
self.assertRaises(KeyError, self.registry.get,
248
"Sample branch format.")
250
def test_get_all(self):
251
format = SampleBranchFormat()
252
self.assertEqual([], self.registry._get_all())
253
self.registry.register(format)
254
self.assertEqual([format], self.registry._get_all())
256
def test_register_extra(self):
257
format = SampleExtraBranchFormat()
258
self.assertEqual([], self.registry._get_all())
259
self.registry.register_extra(format)
260
self.assertEqual([format], self.registry._get_all())
262
def test_register_extra_lazy(self):
263
self.assertEqual([], self.registry._get_all())
264
self.registry.register_extra_lazy("breezy.tests.test_branch",
265
"SampleExtraBranchFormat")
266
formats = self.registry._get_all()
267
self.assertEqual(1, len(formats))
268
self.assertIsInstance(formats[0], SampleExtraBranchFormat)
271
class TestBranch67(object):
272
"""Common tests for both branch 6 and 7 which are mostly the same."""
274
def get_format_name(self):
275
raise NotImplementedError(self.get_format_name)
277
def get_format_name_subtree(self):
278
raise NotImplementedError(self.get_format_name)
281
raise NotImplementedError(self.get_class)
283
def test_creation(self):
284
format = bzrdir.BzrDirMetaFormat1()
285
format.set_branch_format(_mod_bzrbranch.BzrBranchFormat6())
286
branch = self.make_branch('a', format=format)
287
self.assertIsInstance(branch, self.get_class())
288
branch = self.make_branch('b', format=self.get_format_name())
289
self.assertIsInstance(branch, self.get_class())
290
branch = _mod_branch.Branch.open('a')
291
self.assertIsInstance(branch, self.get_class())
293
def test_layout(self):
294
branch = self.make_branch('a', format=self.get_format_name())
295
self.assertPathExists('a/.bzr/branch/last-revision')
296
self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
297
self.assertPathDoesNotExist('a/.bzr/branch/references')
299
def test_config(self):
300
"""Ensure that all configuration data is stored in the branch"""
301
branch = self.make_branch('a', format=self.get_format_name())
302
branch.set_parent('http://example.com')
303
self.assertPathDoesNotExist('a/.bzr/branch/parent')
304
self.assertEqual('http://example.com', branch.get_parent())
305
branch.set_push_location('sftp://example.com')
306
conf = branch.get_config_stack()
307
self.assertEqual('sftp://example.com', conf.get('push_location'))
308
branch.set_bound_location('ftp://example.com')
309
self.assertPathDoesNotExist('a/.bzr/branch/bound')
310
self.assertEqual('ftp://example.com', branch.get_bound_location())
312
def do_checkout_test(self, lightweight=False):
313
tree = self.make_branch_and_tree('source',
314
format=self.get_format_name_subtree())
315
subtree = self.make_branch_and_tree('source/subtree',
316
format=self.get_format_name_subtree())
317
subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
318
format=self.get_format_name_subtree())
319
self.build_tree(['source/subtree/file',
320
'source/subtree/subsubtree/file'])
321
subsubtree.add('file')
323
subtree.add_reference(subsubtree)
324
tree.add_reference(subtree)
325
tree.commit('a revision')
326
subtree.commit('a subtree file')
327
subsubtree.commit('a subsubtree file')
328
tree.branch.create_checkout('target', lightweight=lightweight)
329
self.assertPathExists('target')
330
self.assertPathExists('target/subtree')
331
self.assertPathExists('target/subtree/file')
332
self.assertPathExists('target/subtree/subsubtree/file')
333
subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
335
self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
337
self.assertEndsWith(subbranch.base, 'target/subtree/subsubtree/')
339
def test_checkout_with_references(self):
340
self.do_checkout_test()
342
def test_light_checkout_with_references(self):
343
self.do_checkout_test(lightweight=True)
346
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
349
return _mod_bzrbranch.BzrBranch6
351
def get_format_name(self):
352
return "dirstate-tags"
354
def get_format_name_subtree(self):
355
return "dirstate-with-subtree"
357
def test_set_stacked_on_url_errors(self):
358
branch = self.make_branch('a', format=self.get_format_name())
359
self.assertRaises(errors.UnstackableBranchFormat,
360
branch.set_stacked_on_url, None)
362
def test_default_stacked_location(self):
363
branch = self.make_branch('a', format=self.get_format_name())
364
self.assertRaises(errors.UnstackableBranchFormat, branch.get_stacked_on_url)
367
class TestBranch7(TestBranch67, tests.TestCaseWithTransport):
370
return _mod_bzrbranch.BzrBranch7
372
def get_format_name(self):
375
def get_format_name_subtree(self):
376
return "development-subtree"
378
def test_set_stacked_on_url_unstackable_repo(self):
379
repo = self.make_repository('a', format='dirstate-tags')
380
control = repo.bzrdir
381
branch = _mod_bzrbranch.BzrBranchFormat7().initialize(control)
382
target = self.make_branch('b')
383
self.assertRaises(errors.UnstackableRepositoryFormat,
384
branch.set_stacked_on_url, target.base)
386
def test_clone_stacked_on_unstackable_repo(self):
387
repo = self.make_repository('a', format='dirstate-tags')
388
control = repo.bzrdir
389
branch = _mod_bzrbranch.BzrBranchFormat7().initialize(control)
390
# Calling clone should not raise UnstackableRepositoryFormat.
391
cloned_bzrdir = control.clone('cloned')
393
def _test_default_stacked_location(self):
394
branch = self.make_branch('a', format=self.get_format_name())
395
self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
397
def test_stack_and_unstack(self):
398
branch = self.make_branch('a', format=self.get_format_name())
399
target = self.make_branch_and_tree('b', format=self.get_format_name())
400
branch.set_stacked_on_url(target.branch.base)
401
self.assertEqual(target.branch.base, branch.get_stacked_on_url())
402
revid = target.commit('foo')
403
self.assertTrue(branch.repository.has_revision(revid))
404
branch.set_stacked_on_url(None)
405
self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
406
self.assertFalse(branch.repository.has_revision(revid))
408
def test_open_opens_stacked_reference(self):
409
branch = self.make_branch('a', format=self.get_format_name())
410
target = self.make_branch_and_tree('b', format=self.get_format_name())
411
branch.set_stacked_on_url(target.branch.base)
412
branch = branch.bzrdir.open_branch()
413
revid = target.commit('foo')
414
self.assertTrue(branch.repository.has_revision(revid))
417
class BzrBranch8(tests.TestCaseWithTransport):
419
def make_branch(self, location, format=None):
421
format = controldir.format_registry.make_bzrdir('1.9')
422
format.set_branch_format(_mod_bzrbranch.BzrBranchFormat8())
423
return tests.TestCaseWithTransport.make_branch(
424
self, location, format=format)
426
def create_branch_with_reference(self):
427
branch = self.make_branch('branch')
428
branch._set_all_reference_info({'file-id': ('path', 'location')})
432
def instrument_branch(branch, gets):
433
old_get = branch._transport.get
434
def get(*args, **kwargs):
435
gets.append((args, kwargs))
436
return old_get(*args, **kwargs)
437
branch._transport.get = get
439
def test_reference_info_caching_read_locked(self):
441
branch = self.create_branch_with_reference()
443
self.addCleanup(branch.unlock)
444
self.instrument_branch(branch, gets)
445
branch.get_reference_info('file-id')
446
branch.get_reference_info('file-id')
447
self.assertEqual(1, len(gets))
449
def test_reference_info_caching_read_unlocked(self):
451
branch = self.create_branch_with_reference()
452
self.instrument_branch(branch, gets)
453
branch.get_reference_info('file-id')
454
branch.get_reference_info('file-id')
455
self.assertEqual(2, len(gets))
457
def test_reference_info_caching_write_locked(self):
459
branch = self.make_branch('branch')
461
self.instrument_branch(branch, gets)
462
self.addCleanup(branch.unlock)
463
branch._set_all_reference_info({'file-id': ('path2', 'location2')})
464
path, location = branch.get_reference_info('file-id')
465
self.assertEqual(0, len(gets))
466
self.assertEqual('path2', path)
467
self.assertEqual('location2', location)
469
def test_reference_info_caches_cleared(self):
470
branch = self.make_branch('branch')
472
branch.set_reference_info('file-id', 'path2', 'location2')
474
doppelganger = _mod_branch.Branch.open('branch')
475
doppelganger.set_reference_info('file-id', 'path3', 'location3')
476
self.assertEqual(('path3', 'location3'),
477
branch.get_reference_info('file-id'))
479
def _recordParentMapCalls(self, repo):
480
self._parent_map_calls = []
481
orig_get_parent_map = repo.revisions.get_parent_map
482
def get_parent_map(q):
484
self._parent_map_calls.extend([e[0] for e in q])
485
return orig_get_parent_map(q)
486
repo.revisions.get_parent_map = get_parent_map
489
class TestBranchReference(tests.TestCaseWithTransport):
490
"""Tests for the branch reference facility."""
492
def test_create_open_reference(self):
493
bzrdirformat = bzrdir.BzrDirMetaFormat1()
494
t = self.get_transport()
496
dir = bzrdirformat.initialize(self.get_url('repo'))
497
dir.create_repository()
498
target_branch = dir.create_branch()
500
branch_dir = bzrdirformat.initialize(self.get_url('branch'))
501
made_branch = _mod_bzrbranch.BranchReferenceFormat().initialize(
502
branch_dir, target_branch=target_branch)
503
self.assertEqual(made_branch.base, target_branch.base)
504
opened_branch = branch_dir.open_branch()
505
self.assertEqual(opened_branch.base, target_branch.base)
507
def test_get_reference(self):
508
"""For a BranchReference, get_reference should return the location."""
509
branch = self.make_branch('target')
510
checkout = branch.create_checkout('checkout', lightweight=True)
511
reference_url = branch.bzrdir.root_transport.abspath('') + '/'
512
# if the api for create_checkout changes to return different checkout types
513
# then this file read will fail.
514
self.assertFileEqual(reference_url, 'checkout/.bzr/branch/location')
515
self.assertEqual(reference_url,
516
_mod_bzrbranch.BranchReferenceFormat().get_reference(checkout.bzrdir))
519
class TestHooks(tests.TestCaseWithTransport):
521
def test_constructor(self):
522
"""Check that creating a BranchHooks instance has the right defaults."""
523
hooks = _mod_branch.BranchHooks()
524
self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
525
self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
526
self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
527
self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
528
self.assertTrue("post_uncommit" in hooks,
529
"post_uncommit not in %s" % hooks)
530
self.assertTrue("post_change_branch_tip" in hooks,
531
"post_change_branch_tip not in %s" % hooks)
532
self.assertTrue("post_branch_init" in hooks,
533
"post_branch_init not in %s" % hooks)
534
self.assertTrue("post_switch" in hooks,
535
"post_switch not in %s" % hooks)
537
def test_installed_hooks_are_BranchHooks(self):
538
"""The installed hooks object should be a BranchHooks."""
539
# the installed hooks are saved in self._preserved_hooks.
540
self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
541
_mod_branch.BranchHooks)
543
def test_post_branch_init_hook(self):
545
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
547
self.assertLength(0, calls)
548
branch = self.make_branch('a')
549
self.assertLength(1, calls)
551
self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
552
self.assertTrue(hasattr(params, 'bzrdir'))
553
self.assertTrue(hasattr(params, 'branch'))
555
def test_post_branch_init_hook_repr(self):
557
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
558
lambda params: param_reprs.append(repr(params)), None)
559
branch = self.make_branch('a')
560
self.assertLength(1, param_reprs)
561
param_repr = param_reprs[0]
562
self.assertStartsWith(param_repr, '<BranchInitHookParams of ')
564
def test_post_switch_hook(self):
565
from .. import switch
567
_mod_branch.Branch.hooks.install_named_hook('post_switch',
569
tree = self.make_branch_and_tree('branch-1')
570
self.build_tree(['branch-1/file-1'])
573
to_branch = tree.bzrdir.sprout('branch-2').open_branch()
574
self.build_tree(['branch-1/file-2'])
576
tree.remove('file-1')
578
checkout = tree.branch.create_checkout('checkout')
579
self.assertLength(0, calls)
580
switch.switch(checkout.bzrdir, to_branch)
581
self.assertLength(1, calls)
583
self.assertIsInstance(params, _mod_branch.SwitchHookParams)
584
self.assertTrue(hasattr(params, 'to_branch'))
585
self.assertTrue(hasattr(params, 'revision_id'))
588
class TestBranchOptions(tests.TestCaseWithTransport):
591
super(TestBranchOptions, self).setUp()
592
self.branch = self.make_branch('.')
593
self.config_stack = self.branch.get_config_stack()
595
def check_append_revisions_only(self, expected_value, value=None):
596
"""Set append_revisions_only in config and check its interpretation."""
597
if value is not None:
598
self.config_stack.set('append_revisions_only', value)
599
self.assertEqual(expected_value,
600
self.branch.get_append_revisions_only())
602
def test_valid_append_revisions_only(self):
603
self.assertEqual(None,
604
self.config_stack.get('append_revisions_only'))
605
self.check_append_revisions_only(None)
606
self.check_append_revisions_only(False, 'False')
607
self.check_append_revisions_only(True, 'True')
608
# The following values will cause compatibility problems on projects
609
# using older bzr versions (<2.2) but are accepted
610
self.check_append_revisions_only(False, 'false')
611
self.check_append_revisions_only(True, 'true')
613
def test_invalid_append_revisions_only(self):
614
"""Ensure warning is noted on invalid settings"""
617
self.warnings.append(args[0] % args[1:])
618
self.overrideAttr(trace, 'warning', warning)
619
self.check_append_revisions_only(None, 'not-a-bool')
620
self.assertLength(1, self.warnings)
622
'Value "not-a-bool" is not valid for "append_revisions_only"',
625
def test_use_fresh_values(self):
626
copy = _mod_branch.Branch.open(self.branch.base)
629
copy.get_config_stack().set('foo', 'bar')
632
self.assertFalse(self.branch.is_locked())
633
# Since the branch is locked, the option value won't be saved on disk
634
# so trying to access the config of locked branch via another older
635
# non-locked branch object pointing to the same branch is not supported
636
self.assertEqual(None, self.branch.get_config_stack().get('foo'))
637
# Using a newly created branch object works as expected
638
fresh = _mod_branch.Branch.open(self.branch.base)
639
self.assertEqual('bar', fresh.get_config_stack().get('foo'))
641
def test_set_from_config_get_from_config_stack(self):
642
self.branch.lock_write()
643
self.addCleanup(self.branch.unlock)
644
self.branch.get_config().set_user_option('foo', 'bar')
645
result = self.branch.get_config_stack().get('foo')
646
# https://bugs.launchpad.net/bzr/+bug/948344
647
self.expectFailure('BranchStack uses cache after set_user_option',
648
self.assertEqual, 'bar', result)
650
def test_set_from_config_stack_get_from_config(self):
651
self.branch.lock_write()
652
self.addCleanup(self.branch.unlock)
653
self.branch.get_config_stack().set('foo', 'bar')
654
# Since the branch is locked, the option value won't be saved on disk
655
# so mixing get() and get_user_option() is broken by design.
656
self.assertEqual(None,
657
self.branch.get_config().get_user_option('foo'))
659
def test_set_delays_write_when_branch_is_locked(self):
660
self.branch.lock_write()
661
self.addCleanup(self.branch.unlock)
662
self.branch.get_config_stack().set('foo', 'bar')
663
copy = _mod_branch.Branch.open(self.branch.base)
664
result = copy.get_config_stack().get('foo')
665
# Accessing from a different branch object is like accessing from a
666
# different process: the option has not been saved yet and the new
667
# value cannot be seen.
668
self.assertIs(None, result)
671
class TestPullResult(tests.TestCase):
673
def test_report_changed(self):
674
r = _mod_branch.PullResult()
675
r.old_revid = "old-revid"
677
r.new_revid = "new-revid"
681
self.assertEqual("Now on revision 20.\n", f.getvalue())
682
self.assertEqual("Now on revision 20.\n", f.getvalue())
684
def test_report_unchanged(self):
685
r = _mod_branch.PullResult()
686
r.old_revid = "same-revid"
687
r.new_revid = "same-revid"
690
self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
added
removed
breezy/tests/test_branch.py
