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

  • Committer: John Arbash Meinel
  • Date: 2009-08-04 14:10:09 UTC
  • mfrom: (4585 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4588.
  • Revision ID: john@arbash-meinel.com-20090804141009-uety2n17v1atk5ok
Merge bzr.dev 4585, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
435
435
        return osutils.lexists(pathjoin(
436
436
                    self.basedir, row[0].decode('utf8'), row[1].decode('utf8')))
437
437
 
 
438
    def has_or_had_id(self, file_id):
 
439
        state = self.current_dirstate()
 
440
        row, parents = self._get_entry(file_id=file_id)
 
441
        return row is not None
 
442
 
438
443
    @needs_read_lock
439
444
    def id2path(self, file_id):
440
445
        "Convert a file-id to a path."
1418
1423
                # applied so we can't safely build the inventory delta from
1419
1424
                # the source tree.
1420
1425
                if wt.supports_content_filtering():
 
1426
                    if hardlink:
 
1427
                        # see https://bugs.edge.launchpad.net/bzr/+bug/408193
 
1428
                        trace.warning("hardlinking working copy files is not currently "
 
1429
                            "supported in %r" % (wt,))
1421
1430
                    accelerator_tree = None
1422
1431
                    delta_from_tree = False
1423
1432
                else: