83
91
return "%s|%s|%s" % foreign_revid
86
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
94
class DummyForeignVcsBranch(bzrbranch.BzrBranch6, foreign.ForeignBranch):
87
95
"""A Dummy VCS Branch."""
89
def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
98
def user_transport(self):
99
return self.controldir.user_transport
101
def __init__(self, _format, _control_files, a_controldir, *args, **kwargs):
90
102
self._format = _format
91
self._base = a_bzrdir.transport.base
103
self._base = a_controldir.transport.base
92
104
self._ignore_fallbacks = False
93
self.bzrdir = a_bzrdir
94
foreign.ForeignBranch.__init__(self,
105
self.controldir = a_controldir
106
foreign.ForeignBranch.__init__(self,
95
107
DummyForeignVcsMapping(DummyForeignVcs()))
96
branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
108
bzrbranch.BzrBranch6.__init__(self, _format, _control_files, a_controldir,
100
class InterToDummyVcsBranch(branch.GenericInterBranch,
101
foreign.InterToForeignBranch):
111
def _get_checkout_format(self, lightweight=False):
112
"""Return the most suitable metadir for a checkout of this branch.
113
Weaves are used if this branch's repository uses weaves.
115
return self.controldir.checkout_metadir()
117
def import_last_revision_info_and_tags(self, source, revno, revid,
119
interbranch = InterToDummyVcsBranch(source, self)
120
result = interbranch.push(stop_revision=revid, lossy=True)
122
revid = result.revidmap[revid]
123
return (revno, revid)
126
class DummyForeignCommitBuilder(vf_repository.VersionedFileCommitBuilder):
128
def _generate_revision_if_needed(self, revid):
129
mapping = DummyForeignVcsMapping(DummyForeignVcs())
131
self._new_revision_id = mapping.revision_id_foreign_to_bzr(
132
(str(self._timestamp), str(self._timezone), "UNKNOWN"))
133
self.random_revid = False
134
elif revid is not None:
135
self._new_revision_id = revid
136
self.random_revid = False
138
self._new_revision_id = self._gen_revision_id()
139
self.random_revid = True
142
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
143
foreign.ForeignRepository):
144
"""Dummy foreign vcs repository."""
147
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
149
repository_class = DummyForeignVcsRepository
150
_commit_builder_class = DummyForeignCommitBuilder
153
def get_format_string(cls):
154
return b"Dummy Foreign Vcs Repository"
156
def get_format_description(self):
157
return "Dummy Foreign Vcs Repository"
160
def branch_history(graph, revid):
161
ret = list(graph.iter_lefthand_ancestry(revid,
162
(revision.NULL_REVISION,)))
167
class InterToDummyVcsBranch(branch.GenericInterBranch):
104
170
def is_compatible(source, target):
105
171
return isinstance(target, DummyForeignVcsBranch)
107
def push(self, overwrite=False, stop_revision=None):
108
raise errors.NoRoundtrippingSupport(self.source, self.target)
110
def lossy_push(self, stop_revision=None):
173
def push(self, overwrite=False, stop_revision=None, lossy=False):
175
raise errors.NoRoundtrippingSupport(self.source, self.target)
111
176
result = branch.BranchPushResult()
112
177
result.source_branch = self.source
113
178
result.target_branch = self.target
114
179
result.old_revno, result.old_revid = self.target.last_revision_info()
115
180
self.source.lock_read()
182
graph = self.source.repository.get_graph()
117
183
# This just handles simple cases, but that's good enough for tests
118
my_history = self.target.revision_history()
119
their_history = self.source.revision_history()
184
my_history = branch_history(self.target.repository.get_graph(),
186
if stop_revision is None:
187
stop_revision = self.source.last_revision()
188
their_history = branch_history(graph, stop_revision)
120
189
if their_history[:min(len(my_history), len(their_history))] != my_history:
121
190
raise errors.DivergedBranches(self.target, self.source)
122
191
todo = their_history[len(my_history):]
124
193
for revid in todo:
125
194
rev = self.source.repository.get_revision(revid)
126
195
tree = self.source.repository.revision_tree(revid)
127
def get_file_with_stat(file_id, path=None):
128
return (tree.get_file(file_id), None)
196
def get_file_with_stat(path, file_id=None):
197
return (tree.get_file(path, file_id), None)
129
198
tree.get_file_with_stat = get_file_with_stat
130
199
new_revid = self.target.mapping.revision_id_foreign_to_bzr(
131
(str(rev.timestamp), str(rev.timezone),
200
(str(rev.timestamp), str(rev.timezone),
132
201
str(self.target.revno())))
133
202
parent_revno, parent_revid= self.target.last_revision_info()
134
203
if parent_revid == revision.NULL_REVISION:
135
204
parent_revids = []
137
206
parent_revids = [parent_revid]
138
builder = self.target.get_commit_builder(parent_revids,
139
self.target.get_config(), rev.timestamp,
207
builder = self.target.get_commit_builder(parent_revids,
208
self.target.get_config_stack(), rev.timestamp,
140
209
rev.timezone, rev.committer, rev.properties,
143
for path, ie in tree.inventory.iter_entries():
145
new_ie.revision = None
146
builder.record_entry_contents(new_ie,
147
[self.target.repository.revision_tree(parent_revid).inventory],
149
(ie.kind, ie.text_size, ie.executable, ie.text_sha1))
212
parent_tree = self.target.repository.revision_tree(
214
iter_changes = tree.iter_changes(parent_tree)
215
list(builder.record_iter_changes(
216
tree, parent_revid, iter_changes))
150
217
builder.finish_inventory()
154
221
revidmap[revid] = builder.commit(rev.message)
155
self.target.set_last_revision_info(parent_revno+1,
222
self.target.set_last_revision_info(parent_revno+1,
157
trace.mutter('lossily pushed revision %s -> %s',
224
trace.mutter('lossily pushed revision %s -> %s',
158
225
revid, revidmap[revid])
160
227
self.source.unlock()
166
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
168
def get_format_string(self):
169
return "Branch for Testing"
172
super(DummyForeignVcsBranchFormat, self).__init__()
173
self._matchingbzrdir = DummyForeignVcsDirFormat()
175
def open(self, a_bzrdir, name=None, _found=False):
233
class DummyForeignVcsBranchFormat(bzrbranch.BzrBranchFormat6):
236
def get_format_string(cls):
237
return b"Branch for Testing"
240
def _matchingcontroldir(self):
241
return DummyForeignVcsDirFormat()
243
def open(self, a_controldir, name=None, _found=False, ignore_fallbacks=False,
244
found_repository=None):
246
name = a_controldir._get_selected_branch()
177
248
raise NotImplementedError
179
transport = a_bzrdir.get_branch_transport(None, name=name)
250
transport = a_controldir.get_branch_transport(None, name=name)
180
251
control_files = lockable_files.LockableFiles(transport, 'lock',
253
if found_repository is None:
254
found_repository = a_controldir.find_repository()
182
255
return DummyForeignVcsBranch(_format=self,
183
256
_control_files=control_files,
185
_repository=a_bzrdir.find_repository())
257
a_controldir=a_controldir,
258
_repository=found_repository,
186
260
except errors.NoSuchFile:
187
261
raise errors.NotBranchError(path=transport.base)
244
315
self._control_files = lockable_files.LockableFiles(self.transport,
245
316
"lock", lockable_files.TransportLock)
247
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", b"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()
249
328
raise errors.NoColocatedBranchSupport(self)
250
329
return self._format.get_branch_format().open(self, _found=True)
252
331
def cloning_metadir(self, stacked=False):
253
332
"""Produce a metadir suitable for cloning with."""
254
return bzrdir.format_registry.make_bzrdir("default")
333
return controldir.format_registry.make_controldir("default")
335
def checkout_metadir(self):
336
return self.cloning_metadir()
256
338
def sprout(self, url, revision_id=None, force_new_repo=False,
257
339
recurse='down', possible_transports=None,
258
340
accelerator_tree=None, hardlink=False, stacked=False,
259
341
source_branch=None):
260
# dirstate doesn't cope with accelerator_trees well
342
# dirstate doesn't cope with accelerator_trees well
261
343
# that have a different control dir
262
return super(DummyForeignVcsDir, self).sprout(url=url,
263
revision_id=revision_id, force_new_repo=force_new_repo,
264
recurse=recurse, possible_transports=possible_transports,
265
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)
268
351
def register_dummy_foreign_for_test(testcase):
269
bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
270
testcase.addCleanup(bzrdir.BzrDirFormat.unregister_control_format,
271
DummyForeignVcsDirFormat)
352
controldir.ControlDirFormat.register_prober(DummyForeignProber)
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())
272
361
# We need to register the optimiser to make the dummy appears really
273
362
# different from a regular bzr repository.
274
363
branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
304
408
mapp = DummyForeignVcsMapping(DummyForeignVcs())
305
409
rev = foreign.ForeignRevision(("a", "foreign", "revid"),
306
410
mapp, "roundtripped-revid")
307
self.assertEquals("", rev.inventory_sha1)
308
self.assertEquals(("a", "foreign", "revid"), rev.foreign_revid)
309
self.assertEquals(mapp, rev.mapping)
312
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
313
"""Tests for update_workingtree_fileids()."""
315
def test_update_workingtree(self):
316
wt = self.make_branch_and_tree('br1')
317
self.build_tree_contents([('br1/bla', 'original contents\n')])
318
wt.add('bla', 'bla-a')
320
root_id = wt.get_root_id()
321
target = wt.bzrdir.sprout('br2').open_workingtree()
322
target.unversion(['bla-a'])
323
target.add('bla', 'bla-b')
324
target.commit('bla-b')
325
target_basis = target.basis_tree()
326
target_basis.lock_read()
327
self.addCleanup(target_basis.unlock)
328
foreign.update_workingtree_fileids(wt, target_basis)
331
self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
411
self.assertEqual("", rev.inventory_sha1)
412
self.assertEqual(("a", "foreign", "revid"), rev.foreign_revid)
413
self.assertEqual(mapp, rev.mapping)
336
416
class DummyForeignVcsTests(tests.TestCaseWithTransport):
352
432
def test_sprout(self):
353
433
"""Test we can clone dummies and that the format is not preserved."""
354
434
self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
355
dir = bzrdir.BzrDir.open("d")
435
dir = controldir.ControlDir.open("d")
356
436
newdir = dir.sprout("e")
357
self.assertNotEquals("A Dummy VCS Dir",
358
newdir._format.get_format_string())
437
self.assertNotEqual("A Dummy VCS Dir",
438
newdir._format.get_format_string())
360
440
def test_push_not_supported(self):
361
441
source_tree = self.make_branch_and_tree("source")
362
target_tree = self.make_branch_and_tree("target",
363
format=DummyForeignVcsDirFormat())
364
self.assertRaises(errors.NoRoundtrippingSupport,
365
source_tree.branch.push, target_tree.branch)
442
target_tree = self.make_branch_and_tree(
443
"target", format=DummyForeignVcsDirFormat())
444
self.assertRaises(errors.NoRoundtrippingSupport,
445
source_tree.branch.push, target_tree.branch)
367
447
def test_lossy_push_empty(self):
368
448
source_tree = self.make_branch_and_tree("source")
369
target_tree = self.make_branch_and_tree("target",
370
format=DummyForeignVcsDirFormat())
371
pushresult = source_tree.branch.lossy_push(target_tree.branch)
372
self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
373
self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
374
self.assertEquals({}, pushresult.revidmap)
449
target_tree = self.make_branch_and_tree(
450
"target", format=DummyForeignVcsDirFormat())
451
pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
452
self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
453
self.assertEqual(revision.NULL_REVISION, pushresult.new_revid)
454
self.assertEqual({}, pushresult.revidmap)
376
456
def test_lossy_push_simple(self):
377
457
source_tree = self.make_branch_and_tree("source")
378
458
self.build_tree(['source/a', 'source/b'])
379
459
source_tree.add(['a', 'b'])
380
460
revid1 = source_tree.commit("msg")
381
target_tree = self.make_branch_and_tree("target",
382
format=DummyForeignVcsDirFormat())
461
target_tree = self.make_branch_and_tree(
462
"target", format=DummyForeignVcsDirFormat())
383
463
target_tree.branch.lock_write()
385
pushresult = source_tree.branch.lossy_push(target_tree.branch)
465
pushresult = source_tree.branch.push(
466
target_tree.branch, lossy=True)
387
468
target_tree.branch.unlock()
388
self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
389
self.assertEquals({revid1:target_tree.branch.last_revision()},
391
self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)
469
self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
470
self.assertEqual({revid1: target_tree.branch.last_revision()},
472
self.assertEqual(pushresult.revidmap[revid1], pushresult.new_revid)