/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-02 14:27:58 UTC
  • mfrom: (6410 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@samba.org-20120102142758-hl7xrn7m5hjhecdv
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
91
91
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
92
92
    """A Dummy VCS Branch."""
93
93
 
 
94
    @property
 
95
    def user_transport(self):
 
96
        return self.bzrdir.user_transport
 
97
 
94
98
    def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
95
99
        self._format = _format
96
100
        self._base = a_bzrdir.transport.base
141
145
    repository_class = DummyForeignVcsRepository
142
146
    _commit_builder_class = DummyForeignCommitBuilder
143
147
 
144
 
    def get_format_string(self):
 
148
    @classmethod
 
149
    def get_format_string(cls):
145
150
        return "Dummy Foreign Vcs Repository"
146
151
 
147
152
    def get_format_description(self):
196
201
                else:
197
202
                    parent_revids = [parent_revid]
198
203
                builder = self.target.get_commit_builder(parent_revids, 
199
 
                        self.target.get_config(), rev.timestamp,
 
204
                        self.target.get_config_stack(), rev.timestamp,
200
205
                        rev.timezone, rev.committer, rev.properties,
201
206
                        new_revid)
202
207
                try:
225
230
 
226
231
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
227
232
 
228
 
    def get_format_string(self):
 
233
    @classmethod
 
234
    def get_format_string(cls):
229
235
        return "Branch for Testing"
230
236
 
231
237
    @property
309
315
        self.root_transport.put_bytes(".bzr", "foo")
310
316
        return super(DummyForeignVcsDir, self).create_workingtree()
311
317
 
312
 
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
 
318
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True,
 
319
            possible_transports=None):
313
320
        if name is not None:
314
321
            raise errors.NoColocatedBranchSupport(self)
315
322
        return self._format.get_branch_format().open(self, _found=True)