87
91
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
88
92
"""A Dummy VCS Branch."""
95
def user_transport(self):
96
return self.bzrdir.user_transport
90
98
def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
91
99
self._format = _format
92
100
self._base = a_bzrdir.transport.base
93
101
self._ignore_fallbacks = False
94
102
self.bzrdir = a_bzrdir
95
foreign.ForeignBranch.__init__(self,
103
foreign.ForeignBranch.__init__(self,
96
104
DummyForeignVcsMapping(DummyForeignVcs()))
97
branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
105
branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
101
class InterToDummyVcsBranch(branch.GenericInterBranch,
102
foreign.InterToForeignBranch):
108
def _get_checkout_format(self, lightweight=False):
109
"""Return the most suitable metadir for a checkout of this branch.
110
Weaves are used if this branch's repository uses weaves.
112
return self.bzrdir.checkout_metadir()
114
def import_last_revision_info_and_tags(self, source, revno, revid,
116
interbranch = InterToDummyVcsBranch(source, self)
117
result = interbranch.push(stop_revision=revid, lossy=True)
119
revid = result.revidmap[revid]
120
return (revno, revid)
123
class DummyForeignCommitBuilder(vf_repository.VersionedFileRootCommitBuilder):
125
def _generate_revision_if_needed(self):
126
mapping = DummyForeignVcsMapping(DummyForeignVcs())
128
self._new_revision_id = mapping.revision_id_foreign_to_bzr(
129
(str(self._timestamp), str(self._timezone), "UNKNOWN"))
130
self.random_revid = False
131
elif self._new_revision_id is not None:
132
self.random_revid = False
134
self._new_revision_id = self._gen_revision_id()
135
self.random_revid = True
138
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
139
foreign.ForeignRepository):
140
"""Dummy foreign vcs repository."""
143
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
145
repository_class = DummyForeignVcsRepository
146
_commit_builder_class = DummyForeignCommitBuilder
149
def get_format_string(cls):
150
return "Dummy Foreign Vcs Repository"
152
def get_format_description(self):
153
return "Dummy Foreign Vcs Repository"
156
def branch_history(graph, revid):
157
ret = list(graph.iter_lefthand_ancestry(revid,
158
(revision.NULL_REVISION,)))
163
class InterToDummyVcsBranch(branch.GenericInterBranch):
105
166
def is_compatible(source, target):
106
167
return isinstance(target, DummyForeignVcsBranch)
108
def push(self, overwrite=False, stop_revision=None):
109
raise errors.NoRoundtrippingSupport(self.source, self.target)
111
def lossy_push(self, stop_revision=None):
169
def push(self, overwrite=False, stop_revision=None, lossy=False):
171
raise errors.NoRoundtrippingSupport(self.source, self.target)
112
172
result = branch.BranchPushResult()
113
173
result.source_branch = self.source
114
174
result.target_branch = self.target
115
175
result.old_revno, result.old_revid = self.target.last_revision_info()
116
176
self.source.lock_read()
178
graph = self.source.repository.get_graph()
118
179
# This just handles simple cases, but that's good enough for tests
119
my_history = self.target.revision_history()
120
their_history = self.source.revision_history()
180
my_history = branch_history(self.target.repository.get_graph(),
182
if stop_revision is None:
183
stop_revision = self.source.last_revision()
184
their_history = branch_history(graph, stop_revision)
121
185
if their_history[:min(len(my_history), len(their_history))] != my_history:
122
186
raise errors.DivergedBranches(self.target, self.source)
123
187
todo = their_history[len(my_history):]
138
202
parent_revids = [parent_revid]
139
203
builder = self.target.get_commit_builder(parent_revids,
140
self.target.get_config(), rev.timestamp,
204
self.target.get_config_stack(), rev.timestamp,
141
205
rev.timezone, rev.committer, rev.properties,
144
for path, ie in tree.inventory.iter_entries():
208
parent_tree = self.target.repository.revision_tree(
210
for path, ie in tree.iter_entries_by_dir():
145
211
new_ie = ie.copy()
146
212
new_ie.revision = None
147
213
builder.record_entry_contents(new_ie,
148
[self.target.repository.revision_tree(parent_revid).inventory],
214
[parent_tree.root_inventory],
150
216
(ie.kind, ie.text_size, ie.executable, ie.text_sha1))
151
217
builder.finish_inventory()
167
233
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
169
def get_format_string(self):
236
def get_format_string(cls):
170
237
return "Branch for Testing"
173
super(DummyForeignVcsBranchFormat, self).__init__()
174
self._matchingbzrdir = DummyForeignVcsDirFormat()
240
def _matchingbzrdir(self):
241
return DummyForeignVcsDirFormat()
176
def open(self, a_bzrdir, name=None, _found=False):
243
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
244
found_repository=None):
246
name = a_bzrdir._get_selected_branch()
178
248
raise NotImplementedError
180
250
transport = a_bzrdir.get_branch_transport(None, name=name)
181
251
control_files = lockable_files.LockableFiles(transport, 'lock',
253
if found_repository is None:
254
found_repository = a_bzrdir.find_repository()
183
255
return DummyForeignVcsBranch(_format=self,
184
256
_control_files=control_files,
185
257
a_bzrdir=a_bzrdir,
186
_repository=a_bzrdir.find_repository())
258
_repository=found_repository,
187
260
except errors.NoSuchFile:
188
261
raise errors.NotBranchError(path=transport.base)
238
315
self._control_files = lockable_files.LockableFiles(self.transport,
239
316
"lock", lockable_files.TransportLock)
241
def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
318
def create_workingtree(self):
319
# dirstate requires a ".bzr" entry to exist
320
self.root_transport.put_bytes(".bzr", "foo")
321
return super(DummyForeignVcsDir, self).create_workingtree()
323
def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True,
324
possible_transports=None):
326
name = self._get_selected_branch()
243
328
raise errors.NoColocatedBranchSupport(self)
244
329
return self._format.get_branch_format().open(self, _found=True)
246
331
def cloning_metadir(self, stacked=False):
247
332
"""Produce a metadir suitable for cloning with."""
248
return bzrdir.format_registry.make_bzrdir("default")
333
return controldir.format_registry.make_bzrdir("default")
335
def checkout_metadir(self):
336
return self.cloning_metadir()
250
338
def sprout(self, url, revision_id=None, force_new_repo=False,
251
339
recurse='down', possible_transports=None,
252
340
accelerator_tree=None, hardlink=False, stacked=False,
253
341
source_branch=None):
254
# dirstate doesn't cope with accelerator_trees well
342
# dirstate doesn't cope with accelerator_trees well
255
343
# that have a different control dir
256
return super(DummyForeignVcsDir, self).sprout(url=url,
257
revision_id=revision_id, force_new_repo=force_new_repo,
258
recurse=recurse, possible_transports=possible_transports,
259
hardlink=hardlink, stacked=stacked, source_branch=source_branch)
344
return super(DummyForeignVcsDir, self).sprout(
346
revision_id=revision_id, force_new_repo=force_new_repo,
347
recurse=recurse, possible_transports=possible_transports,
348
hardlink=hardlink, stacked=stacked, source_branch=source_branch)
262
351
def register_dummy_foreign_for_test(testcase):
263
controldir.ControlDirFormat.register_format(DummyForeignVcsDirFormat)
264
testcase.addCleanup(controldir.ControlDirFormat.unregister_format,
265
DummyForeignVcsDirFormat)
266
352
controldir.ControlDirFormat.register_prober(DummyForeignProber)
267
353
testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
355
repository.format_registry.register(DummyForeignVcsRepositoryFormat())
356
testcase.addCleanup(repository.format_registry.remove,
357
DummyForeignVcsRepositoryFormat())
358
branch.format_registry.register(DummyForeignVcsBranchFormat())
359
testcase.addCleanup(branch.format_registry.remove,
360
DummyForeignVcsBranchFormat())
269
361
# We need to register the optimiser to make the dummy appears really
270
362
# different from a regular bzr repository.
271
363
branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
311
408
mapp = DummyForeignVcsMapping(DummyForeignVcs())
312
409
rev = foreign.ForeignRevision(("a", "foreign", "revid"),
313
410
mapp, "roundtripped-revid")
314
self.assertEquals("", rev.inventory_sha1)
315
self.assertEquals(("a", "foreign", "revid"), rev.foreign_revid)
316
self.assertEquals(mapp, rev.mapping)
411
self.assertEqual("", rev.inventory_sha1)
412
self.assertEqual(("a", "foreign", "revid"), rev.foreign_revid)
413
self.assertEqual(mapp, rev.mapping)
319
416
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
359
456
def test_sprout(self):
360
457
"""Test we can clone dummies and that the format is not preserved."""
361
458
self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
362
dir = bzrdir.BzrDir.open("d")
459
dir = controldir.ControlDir.open("d")
363
460
newdir = dir.sprout("e")
364
self.assertNotEquals("A Dummy VCS Dir",
365
newdir._format.get_format_string())
461
self.assertNotEqual("A Dummy VCS Dir",
462
newdir._format.get_format_string())
367
464
def test_push_not_supported(self):
368
465
source_tree = self.make_branch_and_tree("source")
369
target_tree = self.make_branch_and_tree("target",
370
format=DummyForeignVcsDirFormat())
371
self.assertRaises(errors.NoRoundtrippingSupport,
372
source_tree.branch.push, target_tree.branch)
466
target_tree = self.make_branch_and_tree(
467
"target", format=DummyForeignVcsDirFormat())
468
self.assertRaises(errors.NoRoundtrippingSupport,
469
source_tree.branch.push, target_tree.branch)
374
471
def test_lossy_push_empty(self):
375
472
source_tree = self.make_branch_and_tree("source")
376
target_tree = self.make_branch_and_tree("target",
377
format=DummyForeignVcsDirFormat())
378
pushresult = source_tree.branch.lossy_push(target_tree.branch)
379
self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
380
self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
381
self.assertEquals({}, pushresult.revidmap)
473
target_tree = self.make_branch_and_tree(
474
"target", format=DummyForeignVcsDirFormat())
475
pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
476
self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
477
self.assertEqual(revision.NULL_REVISION, pushresult.new_revid)
478
self.assertEqual({}, pushresult.revidmap)
383
480
def test_lossy_push_simple(self):
384
481
source_tree = self.make_branch_and_tree("source")
385
482
self.build_tree(['source/a', 'source/b'])
386
483
source_tree.add(['a', 'b'])
387
484
revid1 = source_tree.commit("msg")
388
target_tree = self.make_branch_and_tree("target",
389
format=DummyForeignVcsDirFormat())
485
target_tree = self.make_branch_and_tree(
486
"target", format=DummyForeignVcsDirFormat())
390
487
target_tree.branch.lock_write()
392
pushresult = source_tree.branch.lossy_push(target_tree.branch)
489
pushresult = source_tree.branch.push(
490
target_tree.branch, lossy=True)
394
492
target_tree.branch.unlock()
395
self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
396
self.assertEquals({revid1:target_tree.branch.last_revision()},
398
self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)
493
self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
494
self.assertEqual({revid1: target_tree.branch.last_revision()},
496
self.assertEqual(pushresult.revidmap[revid1], pushresult.new_revid)