1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2005-2013, 2016 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from cStringIO import StringIO
21
import SocketServer as socketserver
31
31
revision as _mod_revision,
35
from bzrlib.bundle import read_mergeable_from_url
36
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
from bzrlib.bundle.bundle_data import BundleTree
38
from bzrlib.bzrdir import BzrDir
39
from bzrlib.directory_service import directories
40
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
41
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
44
from bzrlib.branch import Branch
45
from bzrlib.repofmt import knitrepo
46
from bzrlib.tests import (
35
from ..bundle import read_mergeable_from_url
36
from ..bundle.apply_bundle import install_bundle, merge_bundle
37
from ..bundle.bundle_data import BundleTree
38
from ..directory_service import directories
39
from ..bundle.serializer import write_bundle, read_bundle, v09, v4
40
from ..bundle.serializer.v08 import BundleSerializerV08
41
from ..bundle.serializer.v09 import BundleSerializerV09
42
from ..bundle.serializer.v4 import BundleSerializerV4
43
from ..repofmt import knitrepo
44
from ..sixish import (
50
from bzrlib.transform import TreeTransform
53
from ..transform import TreeTransform
53
56
def get_text(vf, key):
54
57
"""Get the fulltext for a given revision id that is present in the vf"""
55
58
stream = vf.get_record_stream([key], 'unordered', True)
56
record = stream.next()
57
60
return record.get_bytes_as('fulltext')
76
80
self.root = InventoryDirectory(ROOT_ID, '', None)
78
82
inventory = property(lambda x:x)
81
return self.paths.iterkeys()
83
root_inventory = property(lambda x:x)
85
def get_root_id(self):
86
return self.root.file_id
88
def all_file_ids(self):
89
return set(self.paths.keys())
91
def is_executable(self, file_id):
92
# Not all the files are executable.
83
95
def __getitem__(self, file_id):
84
96
if file_id == self.root.file_id:
96
108
for path, file_id in self.ids.iteritems():
97
109
yield path, self[file_id]
99
def get_file_kind(self, file_id):
111
def kind(self, file_id):
100
112
if file_id in self.contents:
106
118
def make_entry(self, file_id, path):
107
from bzrlib.inventory import (InventoryEntry, InventoryFile
108
, InventoryDirectory, InventoryLink)
119
from ..inventory import (InventoryFile , InventoryDirectory,
109
121
name = os.path.basename(path)
110
kind = self.get_file_kind(file_id)
122
kind = self.kind(file_id)
111
123
parent_id = self.parent_id(file_id)
112
124
text_sha_1, text_size = self.contents_stats(file_id)
113
125
if kind == 'directory':
114
126
ie = InventoryDirectory(file_id, name, parent_id)
115
127
elif kind == 'file':
116
128
ie = InventoryFile(file_id, name, parent_id)
129
ie.text_sha1 = text_sha_1
130
ie.text_size = text_size
117
131
elif kind == 'symlink':
118
132
ie = InventoryLink(file_id, name, parent_id)
120
134
raise errors.BzrError('unknown kind %r' % kind)
121
ie.text_sha1 = text_sha_1
122
ie.text_size = text_size
125
137
def add_dir(self, file_id, path):
140
152
return self.id2path(file_id) is not None
142
154
def get_file(self, file_id):
144
156
result.write(self.contents[file_id])
160
def get_file_revision(self, file_id):
161
return self.inventory[file_id].revision
163
def get_file_size(self, file_id):
164
return self.inventory[file_id].text_size
166
def get_file_sha1(self, file_id):
167
return self.inventory[file_id].text_sha1
148
169
def contents_stats(self, file_id):
149
170
if file_id not in self.contents:
150
171
return None, None
235
256
self.assertTrue(btree.path2id("grandparent/parent/file") is None)
237
258
def unified_diff(self, old, new):
239
260
diff.internal_diff("old", old, "new", new, out)
241
262
return out.read()
338
358
serializer = BundleSerializerV08('0.8')
339
359
b = self.make_branch('.', format=format)
340
360
self.assertRaises(errors.IncompatibleBundleFormat, serializer.write,
341
b.repository, [], {}, StringIO())
361
b.repository, [], {}, BytesIO())
343
363
def test_matched_bundle(self):
344
364
"""Don't raise IncompatibleBundleFormat for knit2 and bundle0.9"""
346
366
format.repository_format = knitrepo.RepositoryFormatKnit3()
347
367
serializer = BundleSerializerV09('0.9')
348
368
b = self.make_branch('.', format=format)
349
serializer.write(b.repository, [], {}, StringIO())
369
serializer.write(b.repository, [], {}, BytesIO())
351
371
def test_mismatched_model(self):
352
372
"""Try copying a bundle from knit2 to knit1"""
355
375
source = self.make_branch_and_tree('source', format=format)
356
376
source.commit('one', rev_id='one-id')
357
377
source.commit('two', rev_id='two-id')
359
379
write_bundle(source.branch.repository, 'two-id', 'null:', text,
386
406
return tests.TestCaseWithTransport.make_branch(self, path, format)
388
408
def create_bundle_text(self, base_rev_id, rev_id):
389
bundle_txt = StringIO()
409
bundle_txt = BytesIO()
390
410
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
391
411
bundle_txt, format=self.format)
392
412
bundle_txt.seek(0)
441
461
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
442
462
new_text = bundle_txt.getvalue().replace('executable:no',
443
463
'executable:yes')
444
bundle_txt = StringIO(new_text)
464
bundle_txt = BytesIO(new_text)
445
465
bundle = read_bundle(bundle_txt)
446
466
self.valid_apply_bundle(base_rev_id, bundle)
449
469
def test_non_bundle(self):
450
470
self.assertRaises(errors.NotABundle,
451
read_bundle, StringIO('#!/bin/sh\n'))
471
read_bundle, BytesIO(b'#!/bin/sh\n'))
453
473
def test_malformed(self):
454
474
self.assertRaises(errors.BadBundle, read_bundle,
455
StringIO('# Bazaar revision bundle v'))
475
BytesIO(b'# Bazaar revision bundle v'))
457
477
def test_crlf_bundle(self):
459
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
479
read_bundle(BytesIO(b'# Bazaar revision bundle v0.8\r\n'))
460
480
except errors.BadBundle:
461
481
# It is currently permitted for bundles with crlf line endings to
462
482
# make read_bundle raise a BadBundle, but this should be fixed.
473
493
if not os.path.exists(checkout_dir):
474
494
os.mkdir(checkout_dir)
475
495
tree = self.make_branch_and_tree(checkout_dir)
477
497
ancestors = write_bundle(self.b1.repository, rev_id, 'null:', s,
478
498
format=self.format)
507
527
if not _mod_revision.is_null(rev_id):
508
rh = self.b1.revision_history()
509
tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
528
tree.branch.generate_revision_history(rev_id)
511
530
delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
512
531
self.assertFalse(delta.has_changed(),
530
549
original_parents = to_tree.get_parent_ids()
531
550
self.assertIs(repository.has_revision(base_rev_id), True)
532
551
for rev in info.real_revisions:
533
self.assert_(not repository.has_revision(rev.revision_id),
534
'Revision {%s} present before applying bundle'
552
self.assertTrue(not repository.has_revision(rev.revision_id),
553
'Revision {%s} present before applying bundle'
536
555
merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
538
557
for rev in info.real_revisions:
539
self.assert_(repository.has_revision(rev.revision_id),
540
'Missing revision {%s} after applying bundle'
558
self.assertTrue(repository.has_revision(rev.revision_id),
559
'Missing revision {%s} after applying bundle'
543
self.assert_(to_tree.branch.repository.has_revision(info.target))
562
self.assertTrue(to_tree.branch.repository.has_revision(info.target))
544
563
# Do we also want to verify that all the texts have been added?
546
565
self.assertEqual(original_parents + [info.target],
547
to_tree.get_parent_ids())
566
to_tree.get_parent_ids())
549
568
rev = info.real_revisions[-1]
550
569
base_tree = self.b1.repository.revision_tree(rev.revision_id)
648
667
bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
651
open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
652
open('b1/sub/dir/ pre space', 'ab').write(
670
with open('b1/sub/dir/WithCaps.txt', 'ab') as f: f.write('\nAdding some text\n')
671
with open('b1/sub/dir/ pre space', 'ab') as f: f.write(
653
672
'\r\nAdding some\r\nDOS format lines\r\n')
654
open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
673
with open('b1/sub/dir/nolastnewline.txt', 'ab') as f: f.write('\n')
655
674
self.tree1.rename_one('sub/dir/ pre space',
656
675
'sub/ start space')
657
676
self.tree1.commit('Modified files', rev_id='a@cset-0-5')
679
698
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
680
699
link_id = 'link-1'
682
self.requireFeature(tests.SymlinkFeature)
701
self.requireFeature(features.SymlinkFeature)
683
702
self.tree1 = self.make_branch_and_tree('b1')
684
703
self.b1 = self.tree1.branch
726
745
self._test_symlink_bundle('link', 'bar/foo', 'mars')
728
747
def test_unicode_symlink_bundle(self):
729
self.requireFeature(tests.UnicodeFilenameFeature)
748
self.requireFeature(features.UnicodeFilenameFeature)
730
749
self._test_symlink_bundle(u'\N{Euro Sign}link',
731
750
u'bar/\N{Euro Sign}foo',
732
751
u'mars\N{Euro Sign}')
806
825
self.tree1 = self.make_branch_and_tree('b1')
807
826
self.b1 = self.tree1.branch
809
open('b1/one', 'wb').write('one\n')
828
with open('b1/one', 'wb') as f: f.write('one\n')
810
829
self.tree1.add('one')
811
830
self.tree1.commit('add file', rev_id='a@cset-0-1')
812
open('b1/one', 'wb').write('two\n')
831
with open('b1/one', 'wb') as f: f.write('two\n')
813
832
self.tree1.commit('modify', rev_id='a@cset-0-2')
814
open('b1/one', 'wb').write('three\n')
833
with open('b1/one', 'wb') as f: f.write('three\n')
815
834
self.tree1.commit('modify', rev_id='a@cset-0-3')
816
bundle_file = StringIO()
835
bundle_file = BytesIO()
817
836
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
818
837
'a@cset-0-1', bundle_file, format=self.format)
819
838
self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
824
843
"""Ensure using the basis as the target doesn't cause an error"""
825
844
self.tree1 = self.make_branch_and_tree('b1')
826
845
self.tree1.commit('add file', rev_id='a@cset-0-1')
827
bundle_file = StringIO()
846
bundle_file = BytesIO()
828
847
rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-1',
829
848
'a@cset-0-1', bundle_file)
833
852
return bundle_file.getvalue()
835
854
def test_unicode_bundle(self):
836
self.requireFeature(tests.UnicodeFilenameFeature)
855
self.requireFeature(features.UnicodeFilenameFeature)
837
856
# Handle international characters
839
858
f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
896
915
bundle = self.get_valid_bundle('null:', 'white-1')
899
open('b1/trailing space ', 'ab').write('add some text\n')
918
with open('b1/trailing space ', 'ab') as f: f.write('add some text\n')
900
919
self.tree1.commit('add text', rev_id='white-2')
902
921
bundle = self.get_valid_bundle('white-1', 'white-2')
944
963
self.tree1.commit('message', rev_id='revid1')
945
964
bundle = self.get_valid_bundle('null:', 'revid1')
946
965
tree = self.get_bundle_tree(bundle, 'revid1')
947
self.assertEqual('revid1', tree.inventory.root.revision)
966
root_revision = tree.get_file_revision(tree.get_root_id())
967
self.assertEqual('revid1', root_revision)
949
969
def test_install_revisions(self):
950
970
self.tree1 = self.make_branch_and_tree('b1')
1198
1218
txt = bundle_sio.getvalue()
1199
1219
loc = txt.find('# empty: ') + len('# empty:')
1200
1220
# Create a new bundle, which strips the trailing space after empty
1201
bundle_sio = StringIO(txt[:loc] + txt[loc+1:])
1221
bundle_sio = BytesIO(txt[:loc] + txt[loc+1:])
1203
1223
self.assertContainsRe(bundle_sio.getvalue(),
1204
1224
'# properties:\n'
1319
1339
self.assertEqual(len(branch_rev.parent_ids),
1320
1340
len(bundle_rev.parent_ids))
1321
1341
self.assertEqual(set(rev_ids),
1322
set([r.revision_id for r in bundle.real_revisions]))
1342
{r.revision_id for r in bundle.real_revisions})
1323
1343
self.valid_apply_bundle(base_rev_id, bundle,
1324
1344
checkout_dir=checkout_dir)
1332
1352
:return: The in-memory bundle
1334
from bzrlib.bundle import serializer
1354
from ..bundle import serializer
1335
1355
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1336
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1356
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1337
1357
new_text = new_text.replace('<file file_id="exe-1"',
1338
1358
'<file executable="y" file_id="exe-1"')
1339
1359
new_text = new_text.replace('B260', 'B275')
1340
bundle_txt = StringIO()
1360
bundle_txt = BytesIO()
1341
1361
bundle_txt.write(serializer._get_bundle_header('4'))
1342
1362
bundle_txt.write('\n')
1343
1363
bundle_txt.write(new_text.encode('bz2'))
1349
1369
def create_bundle_text(self, base_rev_id, rev_id):
1350
bundle_txt = StringIO()
1370
bundle_txt = BytesIO()
1351
1371
rev_ids = write_bundle(self.b1.repository, rev_id, base_rev_id,
1352
1372
bundle_txt, format=self.format)
1353
1373
bundle_txt.seek(0)
1370
1390
tree.commit('added file', rev_id='rev1')
1371
1391
self.build_tree_contents([('tree/file', 'contents2\nstatic\n')])
1372
1392
tree.commit('changed file', rev_id='rev2')
1374
1394
serializer = BundleSerializerV4('1.0')
1375
1395
serializer.write(tree.branch.repository, ['rev1', 'rev2'], {}, s)
1407
1427
def test_copy_signatures(self):
1408
1428
tree_a = self.make_branch_and_tree('tree_a')
1410
import bzrlib.commit as commit
1411
oldstrategy = bzrlib.gpg.GPGStrategy
1430
import breezy.commit as commit
1431
oldstrategy = breezy.gpg.GPGStrategy
1412
1432
branch = tree_a.branch
1413
1433
repo_a = branch.repository
1414
1434
tree_a.commit("base", allow_pointless=True, rev_id='A')
1415
self.failIf(branch.repository.has_signature_for_revision_id('A'))
1435
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1417
from bzrlib.testament import Testament
1437
from ..testament import Testament
1418
1438
# monkey patch gpg signing mechanism
1419
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1420
new_config = test_commit.MustSignConfig(branch)
1421
commit.Commit(config=new_config).commit(message="base",
1439
breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
1440
new_config = test_commit.MustSignConfig()
1441
commit.Commit(config_stack=new_config).commit(message="base",
1422
1442
allow_pointless=True,
1424
1444
working_tree=tree_a)
1425
1445
def sign(text):
1426
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
1446
return breezy.gpg.LoopbackGPGStrategy(None).sign(text)
1427
1447
self.assertTrue(repo_a.has_signature_for_revision_id('B'))
1429
bzrlib.gpg.GPGStrategy = oldstrategy
1449
breezy.gpg.GPGStrategy = oldstrategy
1430
1450
tree_b = self.make_branch_and_tree('tree_b')
1431
1451
repo_b = tree_b.branch.repository
1433
1453
serializer = BundleSerializerV4('4')
1434
1454
serializer.write(tree_a.branch.repository, ['A', 'B'], {}, s)
1460
1474
:return: The in-memory bundle
1462
from bzrlib.bundle import serializer
1476
from ..bundle import serializer
1463
1477
bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1464
new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1478
new_text = self.get_raw(BytesIO(b''.join(bundle_txt)))
1465
1479
# We are going to be replacing some text to set the executable bit on a
1466
1480
# file. Make sure the text replacement actually works correctly.
1467
1481
self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1468
1482
new_text = new_text.replace('<file file_id="exe-1"',
1469
1483
'<file executable="y" file_id="exe-1"')
1470
1484
new_text = new_text.replace('B244', 'B259')
1471
bundle_txt = StringIO()
1485
bundle_txt = BytesIO()
1472
1486
bundle_txt.write(serializer._get_bundle_header('4'))
1473
1487
bundle_txt.write('\n')
1474
1488
bundle_txt.write(new_text.encode('bz2'))
1655
1669
wt.commit('add two', rev_id='a@cset-0-2',
1656
1670
revprops={'branch-nick':'test'})
1658
bundle_txt = StringIO()
1672
bundle_txt = BytesIO()
1659
1673
rev_ids = write_bundle(wt.branch.repository, 'a@cset-0-2',
1660
1674
'a@cset-0-1', bundle_txt, self.format)
1661
self.assertEqual(set(['a@cset-0-2']), set(rev_ids))
1675
self.assertEqual({'a@cset-0-2'}, set(rev_ids))
1662
1676
bundle_txt.seek(0, 0)
1663
1677
return bundle_txt
1708
1722
# creates a blank line at the end, and fails if that
1709
1723
# line is stripped
1710
1724
self.assertEqual('\n\n', raw[-2:])
1711
bundle_txt = StringIO(raw[:-1])
1725
bundle_txt = BytesIO(raw[:-1])
1713
1727
bundle = read_bundle(bundle_txt)
1714
1728
self.check_valid(bundle)
1716
1730
def test_opening_text(self):
1717
1731
bundle_txt = self.build_test_bundle()
1719
bundle_txt = StringIO("Some random\nemail comments\n"
1720
+ bundle_txt.getvalue())
1733
bundle_txt = BytesIO(
1734
b"Some random\nemail comments\n" + bundle_txt.getvalue())
1722
1736
bundle = read_bundle(bundle_txt)
1723
1737
self.check_valid(bundle)
1725
1739
def test_trailing_text(self):
1726
1740
bundle_txt = self.build_test_bundle()
1728
bundle_txt = StringIO(bundle_txt.getvalue() +
1729
"Some trailing\nrandom\ntext\n")
1742
bundle_txt = BytesIO(
1743
bundle_txt.getvalue() + b"Some trailing\nrandom\ntext\n")
1731
1745
bundle = read_bundle(bundle_txt)
1732
1746
self.check_valid(bundle)
1750
1764
fileobj.seek(0)
1751
1765
reader = v4.BundleReader(fileobj, stream_input=True)
1752
1766
record_iter = reader.iter_records()
1753
record = record_iter.next()
1767
record = next(record_iter)
1754
1768
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1755
1769
'info', None, None), record)
1756
record = record_iter.next()
1770
record = next(record_iter)
1757
1771
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1758
1772
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1761
1775
def test_roundtrip_record_memory_hungry(self):
1762
fileobj = StringIO()
1763
1777
writer = v4.BundleWriter(fileobj)
1765
1779
writer.add_info_record(foo='bar')
1769
1783
fileobj.seek(0)
1770
1784
reader = v4.BundleReader(fileobj, stream_input=False)
1771
1785
record_iter = reader.iter_records()
1772
record = record_iter.next()
1786
record = next(record_iter)
1773
1787
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1774
1788
'info', None, None), record)
1775
record = record_iter.next()
1789
record = next(record_iter)
1776
1790
self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1777
1791
'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1803
1817
fileobj.seek(0)
1804
1818
record_iter = v4.BundleReader(fileobj).iter_records()
1805
record = record_iter.next()
1819
record = next(record_iter)
1806
1820
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1807
1821
'info', None, None), record)
1808
self.assertRaises(errors.BadBundle, record_iter.next)
1822
self.assertRaises(errors.BadBundle, next, record_iter)
1811
1825
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
1828
1842
def test_infinite_redirects_are_not_a_bundle(self):
1829
1843
"""If a URL causes TooManyRedirections then NotABundle is raised.
1831
from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1845
from .blackbox.test_push import RedirectingMemoryServer
1832
1846
server = RedirectingMemoryServer()
1833
1847
self.start_server(server)
1834
1848
url = server.get_url() + 'infinite-loop'
1839
1853
bundle, then the ConnectionReset error should be propagated.
1841
1855
# Instantiate a server that will provoke a ConnectionReset
1842
sock_server = _DisconnectingTCPServer()
1856
sock_server = DisconnectingServer()
1843
1857
self.start_server(sock_server)
1844
1858
# We don't really care what the url is since the server will close the
1845
1859
# connection without interpreting it
1847
1861
self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1850
class _DisconnectingTCPServer(object):
1851
"""A TCP server that immediately closes any connection made to it."""
1853
def start_server(self):
1854
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1855
self.sock.bind(('127.0.0.1', 0))
1857
self.port = self.sock.getsockname()[1]
1858
self.thread = threading.Thread(
1859
name='%s (port %d)' % (self.__class__.__name__, self.port),
1860
target=self.accept_and_close)
1863
def accept_and_close(self):
1864
conn, addr = self.sock.accept()
1865
conn.shutdown(socket.SHUT_RDWR)
1864
class DisconnectingHandler(socketserver.BaseRequestHandler):
1865
"""A request handler that immediately closes any connection made to it."""
1868
self.request.close()
1871
class DisconnectingServer(test_server.TestingTCPServerInAThread):
1874
super(DisconnectingServer, self).__init__(
1876
test_server.TestingTCPServer,
1877
DisconnectingHandler)
1868
1879
def get_url(self):
1869
return 'bzr://127.0.0.1:%d/' % (self.port,)
1871
def stop_server(self):
1873
# make sure the thread dies by connecting to the listening socket,
1874
# just in case the test failed to do so.
1875
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1876
conn.connect(self.sock.getsockname())
1878
except socket.error:
1880
"""Return the url of the server"""
1881
return "bzr://%s:%d/" % self.server.server_address
added
removed
breezy/tests/test_bundle.py
