92
60
return { "dummy ding": "%s/%s\\%s" % foreign_revid }
95
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
96
"""A Dummy VCS Branch."""
98
def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
99
self._format = _format
100
self._base = a_bzrdir.transport.base
101
self._ignore_fallbacks = False
102
foreign.ForeignBranch.__init__(self,
103
DummyForeignVcsMapping(DummyForeignVcs()))
104
branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
108
class InterToDummyVcsBranch(branch.GenericInterBranch,
109
foreign.InterToForeignBranch):
112
def is_compatible(source, target):
113
return isinstance(target, DummyForeignVcsBranch)
115
def lossy_push(self, stop_revision=None):
116
result = branch.BranchPushResult()
117
result.source_branch = self.source
118
result.target_branch = self.target
119
result.old_revno, result.old_revid = self.target.last_revision_info()
120
self.source.lock_read()
122
# This just handles simple cases, but that's good enough for tests
123
my_history = self.target.revision_history()
124
their_history = self.source.revision_history()
125
if their_history[:min(len(my_history), len(their_history))] != my_history:
126
raise errors.DivergedBranches(self.target, self.source)
127
todo = their_history[len(my_history):]
130
rev = self.source.repository.get_revision(revid)
131
tree = self.source.repository.revision_tree(revid)
132
def get_file_with_stat(file_id, path=None):
133
return (tree.get_file(file_id), None)
134
tree.get_file_with_stat = get_file_with_stat
135
new_revid = self.target.mapping.revision_id_foreign_to_bzr(
136
(str(rev.timestamp), str(rev.timezone),
137
str(self.target.revno())))
138
parent_revno, parent_revid= self.target.last_revision_info()
139
if parent_revid == NULL_REVISION:
142
parent_revids = [parent_revid]
143
builder = self.target.get_commit_builder(parent_revids,
144
self.target.get_config(), rev.timestamp,
145
rev.timezone, rev.committer, rev.properties,
148
for path, ie in tree.inventory.iter_entries():
150
new_ie.revision = None
151
builder.record_entry_contents(new_ie,
152
[self.target.repository.revision_tree(parent_revid).inventory],
154
(ie.kind, ie.text_size, ie.executable, ie.text_sha1))
155
builder.finish_inventory()
159
revidmap[revid] = builder.commit(rev.message)
160
self.target.set_last_revision_info(parent_revno+1,
162
trace.mutter('lossily pushed revision %s -> %s',
163
revid, revidmap[revid])
166
result.new_revno, result.new_revid = self.target.last_revision_info()
167
result.revidmap = revidmap
171
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
173
def get_format_string(self):
174
return "Branch for Testing"
177
super(DummyForeignVcsBranchFormat, self).__init__()
178
self._matchingbzrdir = DummyForeignVcsDirFormat()
180
def open(self, a_bzrdir, _found=False):
182
raise NotImplementedError
184
transport = a_bzrdir.get_branch_transport(None)
185
control_files = lockable_files.LockableFiles(transport, 'lock',
187
return DummyForeignVcsBranch(_format=self,
188
_control_files=control_files,
190
_repository=a_bzrdir.find_repository())
191
except errors.NoSuchFile:
192
raise errors.NotBranchError(path=transport.base)
195
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
196
"""BzrDirFormat for the dummy foreign VCS."""
199
def get_format_string(cls):
200
return "A Dummy VCS Dir"
203
def get_format_description(cls):
204
return "A Dummy VCS Dir"
207
def is_supported(cls):
210
def get_branch_format(self):
211
return DummyForeignVcsBranchFormat()
214
def probe_transport(klass, transport):
215
"""Return the .bzrdir style format present in a directory."""
216
if not transport.has('.dummy'):
217
raise errors.NotBranchError(path=transport.base)
220
def initialize_on_transport(self, transport):
221
"""Initialize a new bzrdir in the base directory of a Transport."""
222
# Since we don't have a .bzr directory, inherit the
223
# mode from the root directory
224
temp_control = lockable_files.LockableFiles(transport,
225
'', lockable_files.TransportLock)
226
temp_control._transport.mkdir('.dummy',
227
# FIXME: RBC 20060121 don't peek under
229
mode=temp_control._dir_mode)
231
bzrdir_transport = transport.clone('.dummy')
232
# NB: no need to escape relative paths that are url safe.
233
control_files = lockable_files.LockableFiles(bzrdir_transport,
234
self._lock_file_name, self._lock_class)
235
control_files.create_lock()
236
return self.open(transport, _found=True)
238
def _open(self, transport):
239
return DummyForeignVcsDir(transport, self)
242
class DummyForeignVcsDir(BzrDirMeta1):
244
def __init__(self, _transport, _format):
245
self._format = _format
246
self.transport = _transport.clone('.dummy')
247
self.root_transport = _transport
248
self._mode_check_done = False
249
self._control_files = lockable_files.LockableFiles(self.transport,
250
"lock", lockable_files.TransportLock)
252
def open_branch(self, ignore_fallbacks=True):
253
return self._format.get_branch_format().open(self, _found=True)
255
def cloning_metadir(self, stacked=False):
256
"""Produce a metadir suitable for cloning with."""
257
return format_registry.make_bzrdir("default")
259
def sprout(self, url, revision_id=None, force_new_repo=False,
260
recurse='down', possible_transports=None,
261
accelerator_tree=None, hardlink=False, stacked=False,
263
# dirstate doesn't cope with accelerator_trees well
264
# that have a different control dir
265
return super(DummyForeignVcsDir, self).sprout(url=url,
266
revision_id=revision_id, force_new_repo=force_new_repo,
267
recurse=recurse, possible_transports=possible_transports,
268
hardlink=hardlink, stacked=stacked, source_branch=source_branch)
271
64
class ForeignVcsRegistryTests(TestCase):
272
"""Tests for the ForeignVcsRegistry class."""
274
66
def test_parse_revision_id_no_dash(self):
275
67
reg = foreign.ForeignVcsRegistry()
301
93
self.assertEquals(mapp, rev.mapping)
304
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
305
"""Tests for update_workingtree_fileids()."""
307
def test_update_workingtree(self):
308
wt = self.make_branch_and_tree('br1')
309
self.build_tree_contents([('br1/bla', 'original contents\n')])
310
wt.add('bla', 'bla-a')
312
root_id = wt.get_root_id()
313
target = wt.bzrdir.sprout('br2').open_workingtree()
314
target.unversion(['bla-a'])
315
target.add('bla', 'bla-b')
316
target.commit('bla-b')
317
target_basis = target.basis_tree()
318
target_basis.lock_read()
319
self.addCleanup(target_basis.unlock)
320
foreign.update_workingtree_fileids(wt, target_basis)
323
self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
328
class DummyForeignVcsTests(TestCaseWithTransport):
329
"""Very basic test for DummyForeignVcs."""
96
class ShowForeignPropertiesTests(TestCase):
97
"""Tests for the show_foreign_properties() function."""
332
BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
333
branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
334
self.addCleanup(self.unregister)
335
super(DummyForeignVcsTests, self).setUp()
337
def unregister(self):
339
BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
342
branch.InterBranch.unregister_optimiser(InterToDummyVcsBranch)
344
def test_create(self):
345
"""Test we can create dummies."""
346
self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
347
dir = BzrDir.open("d")
348
self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
349
dir.open_repository()
351
dir.open_workingtree()
353
def test_sprout(self):
354
"""Test we can clone dummies and that the format is not preserved."""
355
self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
356
dir = BzrDir.open("d")
357
newdir = dir.sprout("e")
358
self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())
360
def test_lossy_push_empty(self):
361
source_tree = self.make_branch_and_tree("source")
362
target_tree = self.make_branch_and_tree("target",
363
format=DummyForeignVcsDirFormat())
364
pushresult = source_tree.branch.lossy_push(target_tree.branch)
365
self.assertEquals(NULL_REVISION, pushresult.old_revid)
366
self.assertEquals(NULL_REVISION, pushresult.new_revid)
367
self.assertEquals({}, pushresult.revidmap)
369
def test_lossy_push_simple(self):
370
source_tree = self.make_branch_and_tree("source")
371
self.build_tree(['source/a', 'source/b'])
372
source_tree.add(['a', 'b'])
373
revid1 = source_tree.commit("msg")
374
target_tree = self.make_branch_and_tree("target",
375
format=DummyForeignVcsDirFormat())
376
target_tree.branch.lock_write()
378
pushresult = source_tree.branch.lossy_push(target_tree.branch)
380
target_tree.branch.unlock()
381
self.assertEquals(NULL_REVISION, pushresult.old_revid)
382
self.assertEquals({revid1:target_tree.branch.last_revision()},
384
self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)
100
super(ShowForeignPropertiesTests, self).setUp()
101
self.vcs = DummyForeignVcs()
102
foreign.foreign_vcs_registry.register("dummy",
103
self.vcs, "Dummy VCS")
106
super(ShowForeignPropertiesTests, self).tearDown()
107
foreign.foreign_vcs_registry.remove("dummy")
109
def test_show_non_foreign(self):
110
"""Test use with a native (non-foreign) bzr revision."""
111
self.assertEquals({}, foreign.show_foreign_properties(Revision("arevid")))
113
def test_show_imported(self):
114
rev = Revision("dummy-v1:my-foreign-revid")
115
self.assertEquals({ "dummy ding": "my/foreign\\revid" },
116
foreign.show_foreign_properties(rev))
118
def test_show_direct(self):
119
rev = foreign.ForeignRevision(("some", "foreign", "revid"),
120
DummyForeignVcsMapping(self.vcs),
122
self.assertEquals({ "dummy ding": "some/foreign\\revid" },
123
foreign.show_foreign_properties(rev))
added
removed
bzrlib/tests/test_foreign.py
