/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/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2011-03-14 10:11:58 UTC
  • mfrom: (5609.24.1 2.3)
  • mto: (5609.24.2 2.3)
  • mto: This revision was merged to the branch mainline in revision 5723.
  • Revision ID: v.ladeuil+lp@free.fr-20110314101158-9ojis0ftsljg3c3t
Merge bzr/2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
209
209
        else:
210
210
            self._branch = self.bzrdir.open_branch()
211
211
        self.basedir = realpath(basedir)
212
 
        # if branch is at our basedir and is a format 6 or less
213
 
        if isinstance(self._format, WorkingTreeFormat2):
214
 
            # share control object
215
 
            self._control_files = self.branch.control_files
216
 
        else:
217
 
            # assume all other formats have their own control files.
218
 
            self._control_files = _control_files
 
212
        self._control_files = _control_files
219
213
        self._transport = self._control_files._transport
220
214
        # update the whole cache up front and write to disk if anything changed;
221
215
        # in the future we might want to do this more selectively
2974
2968
                         inv,
2975
2969
                         _internal=True,
2976
2970
                         _format=self,
2977
 
                         _bzrdir=a_bzrdir)
 
2971
                         _bzrdir=a_bzrdir,
 
2972
                         _control_files=branch.control_files)
2978
2973
        basis_tree = branch.repository.revision_tree(revision_id)
2979
2974
        if basis_tree.inventory.root is not None:
2980
2975
            wt.set_root_id(basis_tree.get_root_id())
3005
3000
        wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
3006
3001
                           _internal=True,
3007
3002
                           _format=self,
3008
 
                           _bzrdir=a_bzrdir)
 
3003
                           _bzrdir=a_bzrdir,
 
3004
                           _control_files=a_bzrdir.open_branch().control_files)
3009
3005
        return wt
3010
3006
 
3011
3007
class WorkingTreeFormat3(WorkingTreeFormat):