← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-14 16:16:53 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1919.
  • Revision ID: john@arbash-meinel.com-20060814161653-54cdcdadcd4e9003
Remove bogus entry from BRANCH.TODO

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
460
460
        _unsupported is a private parameter to the BzrDir class.
461
461
        """
462
462
        t = get_transport(base)
463
 
        # mutter("trying to open %r with transport %r", base, t)
 
463
        mutter("trying to open %r with transport %r", base, t)
464
464
        format = BzrDirFormat.find_format(t)
465
465
        BzrDir._check_supported(format, _unsupported)
466
466
        return format.open(t, _found=True)
615
615
                # XXX FIXME RBC 20060214 need tests for this when the basis
616
616
                # is incomplete
617
617
                result_repo.fetch(basis_repo, revision_id=revision_id)
618
 
            if source_repository is not None:
619
 
                result_repo.fetch(source_repository, revision_id=revision_id)
 
618
            result_repo.fetch(source_repository, revision_id=revision_id)
620
619
        if source_branch is not None:
621
620
            source_branch.sprout(result, revision_id=revision_id)
622
621
        else:
734
733
        self._check_supported(format, unsupported)
735
734
        return format.open(self, _found=True)
736
735
 
737
 
    def sprout(self, url, revision_id=None, basis=None, force_new_repo=False):
 
736
    def sprout(self, url, revision_id=None, basis=None):
738
737
        """See BzrDir.sprout()."""
739
738
        from bzrlib.workingtree import WorkingTreeFormat2
740
739
        self._make_tail(url)
1218
1217
        result = (super(BzrDirFormat5, self).initialize_on_transport(transport))
1219
1218
        RepositoryFormat5().initialize(result, _internal=True)
1220
1219
        if not _cloning:
1221
 
            branch = BzrBranchFormat4().initialize(result)
1222
 
            try:
1223
 
                WorkingTreeFormat2().initialize(result)
1224
 
            except errors.NotLocalUrl:
1225
 
                # Even though we can't access the working tree, we need to
1226
 
                # create its control files.
1227
 
                WorkingTreeFormat2().stub_initialize_remote(branch.control_files)
 
1220
            BzrBranchFormat4().initialize(result)
 
1221
            WorkingTreeFormat2().initialize(result)
1228
1222
        return result
1229
1223
 
1230
1224
    def _open(self, transport):
1277
1271
        result = super(BzrDirFormat6, self).initialize_on_transport(transport)
1278
1272
        RepositoryFormat6().initialize(result, _internal=True)
1279
1273
        if not _cloning:
1280
 
            branch = BzrBranchFormat4().initialize(result)
 
1274
            BzrBranchFormat4().initialize(result)
1281
1275
            try:
1282
1276
                WorkingTreeFormat2().initialize(result)
1283
1277
            except errors.NotLocalUrl:
1284
 
                # Even though we can't access the working tree, we need to
1285
 
                # create its control files.
1286
 
                WorkingTreeFormat2().stub_initialize_remote(branch.control_files)
 
1278
                # emulate pre-check behaviour for working tree and silently 
 
1279
                # fail.
 
1280
                pass
1287
1281
        return result
1288
1282
 
1289
1283
    def _open(self, transport):