91
96
self._base = a_bzrdir.transport.base
92
97
self._ignore_fallbacks = False
93
98
self.bzrdir = a_bzrdir
94
foreign.ForeignBranch.__init__(self,
99
foreign.ForeignBranch.__init__(self,
95
100
DummyForeignVcsMapping(DummyForeignVcs()))
96
branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
101
branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
100
class InterToDummyVcsBranch(branch.GenericInterBranch,
101
foreign.InterToForeignBranch):
104
def _get_checkout_format(self, lightweight=False):
105
"""Return the most suitable metadir for a checkout of this branch.
106
Weaves are used if this branch's repository uses weaves.
108
return self.bzrdir.checkout_metadir()
110
def import_last_revision_info_and_tags(self, source, revno, revid,
112
interbranch = InterToDummyVcsBranch(source, self)
113
result = interbranch.push(stop_revision=revid, lossy=True)
115
revid = result.revidmap[revid]
116
return (revno, revid)
119
class DummyForeignCommitBuilder(vf_repository.VersionedFileRootCommitBuilder):
121
def _generate_revision_if_needed(self):
122
mapping = DummyForeignVcsMapping(DummyForeignVcs())
124
self._new_revision_id = mapping.revision_id_foreign_to_bzr(
125
(str(self._timestamp), str(self._timezone), "UNKNOWN"))
126
self.random_revid = False
127
elif self._new_revision_id is not None:
128
self.random_revid = False
130
self._new_revision_id = self._gen_revision_id()
131
self.random_revid = True
134
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
135
foreign.ForeignRepository):
136
"""Dummy foreign vcs repository."""
139
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
141
repository_class = DummyForeignVcsRepository
142
_commit_builder_class = DummyForeignCommitBuilder
144
def get_format_string(self):
145
return "Dummy Foreign Vcs Repository"
147
def get_format_description(self):
148
return "Dummy Foreign Vcs Repository"
151
def branch_history(graph, revid):
152
ret = list(graph.iter_lefthand_ancestry(revid,
153
(revision.NULL_REVISION,)))
158
class InterToDummyVcsBranch(branch.GenericInterBranch):
104
161
def is_compatible(source, target):
105
162
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):
164
def push(self, overwrite=False, stop_revision=None, lossy=False):
166
raise errors.NoRoundtrippingSupport(self.source, self.target)
111
167
result = branch.BranchPushResult()
112
168
result.source_branch = self.source
113
169
result.target_branch = self.target
114
170
result.old_revno, result.old_revid = self.target.last_revision_info()
115
171
self.source.lock_read()
173
graph = self.source.repository.get_graph()
117
174
# 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()
175
my_history = branch_history(self.target.repository.get_graph(),
177
if stop_revision is None:
178
stop_revision = self.source.last_revision()
179
their_history = branch_history(graph, stop_revision)
120
180
if their_history[:min(len(my_history), len(their_history))] != my_history:
121
181
raise errors.DivergedBranches(self.target, self.source)
122
182
todo = their_history[len(my_history):]
168
228
def get_format_string(self):
169
229
return "Branch for Testing"
172
super(DummyForeignVcsBranchFormat, self).__init__()
173
self._matchingbzrdir = DummyForeignVcsDirFormat()
232
def _matchingbzrdir(self):
233
return DummyForeignVcsDirFormat()
175
def open(self, a_bzrdir, name=None, _found=False):
235
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
236
found_repository=None):
177
238
raise NotImplementedError
179
240
transport = a_bzrdir.get_branch_transport(None, name=name)
180
241
control_files = lockable_files.LockableFiles(transport, 'lock',
243
if found_repository is None:
244
found_repository = a_bzrdir.find_repository()
182
245
return DummyForeignVcsBranch(_format=self,
183
246
_control_files=control_files,
184
247
a_bzrdir=a_bzrdir,
185
_repository=a_bzrdir.find_repository())
248
_repository=found_repository)
186
249
except errors.NoSuchFile:
187
250
raise errors.NotBranchError(path=transport.base)
268
336
def register_dummy_foreign_for_test(testcase):
269
bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
270
testcase.addCleanup(bzrdir.BzrDirFormat.unregister_control_format,
271
DummyForeignVcsDirFormat)
337
controldir.ControlDirFormat.register_prober(DummyForeignProber)
338
testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
340
repository.format_registry.register(DummyForeignVcsRepositoryFormat())
341
testcase.addCleanup(repository.format_registry.remove,
342
DummyForeignVcsRepositoryFormat())
343
branch.format_registry.register(DummyForeignVcsBranchFormat())
344
testcase.addCleanup(branch.format_registry.remove,
345
DummyForeignVcsBranchFormat())
272
346
# We need to register the optimiser to make the dummy appears really
273
347
# different from a regular bzr repository.
274
348
branch.InterBranch.register_optimiser(InterToDummyVcsBranch)