/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: Martin Pool
  • Date: 2007-03-23 07:58:54 UTC
  • mfrom: (2374 +trunk)
  • mto: (2323.5.2 0.15)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: mbp@sourcefrog.net-20070323075854-5o2n6k8a8kuejges
merge jam's integrated changes from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
279
279
            hc.write()
280
280
 
281
281
        if _inventory is None:
 
282
            # This will be acquired on lock_read() or lock_write()
282
283
            self._inventory_is_modified = False
283
 
            self.read_working_inventory()
 
284
            self._inventory = None
284
285
        else:
285
286
            # the caller of __init__ has provided an inventory,
286
287
            # we assume they know what they are doing - as its only
2298
2299
     - uses the branch last-revision.
2299
2300
    """
2300
2301
 
 
2302
    def __init__(self, *args, **kwargs):
 
2303
        super(WorkingTree2, self).__init__(*args, **kwargs)
 
2304
        # WorkingTree2 has more of a constraint that self._inventory must
 
2305
        # exist. Because this is an older format, we don't mind the overhead
 
2306
        # caused by the extra computation here.
 
2307
 
 
2308
        # Newer WorkingTree's should only have self._inventory set when they
 
2309
        # have a read lock.
 
2310
        if self._inventory is None:
 
2311
            self.read_working_inventory()
 
2312
 
2301
2313
    def lock_tree_write(self):
2302
2314
        """See WorkingTree.lock_tree_write().
2303
2315