/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: Andrew Bennetts
  • Date: 2009-06-17 02:02:44 UTC
  • mfrom: (4449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4452.
  • Revision ID: andrew.bennetts@canonical.com-20090617020244-50aantdf95aakvjx
Merge bzr.dev, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
446
446
 
447
447
    def get_file_with_stat(self, file_id, path=None, filtered=True,
448
448
        _fstat=os.fstat):
449
 
        """See MutableTree.get_file_with_stat."""
 
449
        """See Tree.get_file_with_stat."""
450
450
        if path is None:
451
451
            path = self.id2path(file_id)
452
452
        file_obj = self.get_file_byname(path, filtered=False)
453
453
        stat_value = _fstat(file_obj.fileno())
454
 
        if self.supports_content_filtering() and filtered:
 
454
        if filtered and self.supports_content_filtering():
455
455
            filters = self._content_filter_stack(path)
456
456
            file_obj = filtered_input_file(file_obj, filters)
457
457
        return (file_obj, stat_value)
462
462
    def get_file_byname(self, filename, filtered=True):
463
463
        path = self.abspath(filename)
464
464
        f = file(path, 'rb')
465
 
        if self.supports_content_filtering() and filtered:
 
465
        if filtered and self.supports_content_filtering():
466
466
            filters = self._content_filter_stack(filename)
467
467
            return filtered_input_file(f, filters)
468
468
        else:
749
749
                kind = 'tree-reference'
750
750
            return kind, None, None, None
751
751
        elif kind == 'symlink':
752
 
            return ('symlink', None, None,
753
 
                    os.readlink(abspath.encode(osutils._fs_enc)
754
 
                                ).decode(osutils._fs_enc))
 
752
            target = osutils.readlink(abspath)
 
753
            return ('symlink', None, None, target)
755
754
        else:
756
755
            return (kind, None, None, None)
757
756
 
973
972
        return file_id
974
973
 
975
974
    def get_symlink_target(self, file_id):
976
 
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc)
977
 
            ).decode(osutils._fs_enc)
 
975
        abspath = self.id2abspath(file_id)
 
976
        target = osutils.readlink(abspath)
 
977
        return target
978
978
 
979
979
    @needs_write_lock
980
980
    def subsume(self, other_tree):
1561
1561
 
1562
1562
    @needs_write_lock
1563
1563
    def pull(self, source, overwrite=False, stop_revision=None,
1564
 
             change_reporter=None, possible_transports=None):
 
1564
             change_reporter=None, possible_transports=None, local=False):
1565
1565
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1566
1566
        source.lock_read()
1567
1567
        try:
1570
1570
            old_revision_info = self.branch.last_revision_info()
1571
1571
            basis_tree = self.basis_tree()
1572
1572
            count = self.branch.pull(source, overwrite, stop_revision,
1573
 
                                     possible_transports=possible_transports)
 
1573
                                     possible_transports=possible_transports,
 
1574
                                     local=local)
1574
1575
            new_revision_info = self.branch.last_revision_info()
1575
1576
            if new_revision_info != old_revision_info:
1576
1577
                pp.next_phase()
1641
1642
 
1642
1643
            fl = []
1643
1644
            for subf in os.listdir(dirabs):
1644
 
                if subf == '.bzr':
 
1645
                if self.bzrdir.is_control_filename(subf):
1645
1646
                    continue
1646
1647
                if subf not in dir_entry.children:
1647
1648
                    try:
2373
2374
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2374
2375
                        ('.bzr', '.bzr'))
2375
2376
                    if (bzrdir_loc < len(cur_disk_dir_content)
2376
 
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
 
2377
                        and self.bzrdir.is_control_filename(
 
2378
                            cur_disk_dir_content[bzrdir_loc][0])):
2377
2379
                        # we dont yield the contents of, or, .bzr itself.
2378
2380
                        del cur_disk_dir_content[bzrdir_loc]
2379
2381
            if inv_finished: