/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: 2010-07-16 13:29:07 UTC
  • mto: This revision was merged to the branch mainline in revision 5351.
  • Revision ID: mbp@canonical.com-20100716132907-0iffip1m4qt5vvif
Move internal_tree_files and safe_relpath_files onto WorkingTree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
61
61
    revisiontree,
62
62
    trace,
63
63
    transform,
 
64
    transport,
64
65
    ui,
65
66
    views,
66
67
    xml5,
67
68
    xml7,
68
69
    )
69
 
import bzrlib.branch
70
 
from bzrlib.transport import get_transport
71
70
from bzrlib.workingtree_4 import (
72
71
    WorkingTreeFormat4,
73
72
    WorkingTreeFormat5,
77
76
 
78
77
from bzrlib import symbol_versioning
79
78
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
79
from bzrlib.lock import LogicalLockResult
80
80
from bzrlib.lockable_files import LockableFiles
81
81
from bzrlib.lockdir import LockDir
82
82
import bzrlib.mutabletree
176
176
 
177
177
    It is possible for a `WorkingTree` to have a filename which is
178
178
    not listed in the Inventory and vice versa.
 
179
 
 
180
    :ivar basedir: The root of the tree on disk. This is a unicode path object
 
181
        (as opposed to a URL).
179
182
    """
180
183
 
181
184
    # override this to set the strategy for storing views
346
349
        if path is None:
347
350
            path = osutils.getcwd()
348
351
        control, relpath = bzrdir.BzrDir.open_containing(path)
349
 
 
350
352
        return control.open_workingtree(), relpath
351
353
 
352
354
    @staticmethod
 
355
    def open_containing_paths(file_list, default_directory='.',
 
356
        canonicalize=True, apply_view=True):
 
357
        """Open the WorkingTree that contains a set of paths.
 
358
 
 
359
        Fail if the paths given are not all in a single tree.
 
360
 
 
361
        This is used for the many command-line interfaces that take a list of
 
362
        any number of files and that require they all be in the same tree.
 
363
        """
 
364
        # recommended replacement for builtins.internal_tree_files
 
365
        if file_list is None or len(file_list) == 0:
 
366
            tree = WorkingTree.open_containing(default_directory)[0]
 
367
            if tree.supports_views() and apply_view:
 
368
                view_files = tree.views.lookup_view()
 
369
                if view_files:
 
370
                    file_list = view_files
 
371
                    view_str = views.view_display_str(view_files)
 
372
                    note("Ignoring files outside view. View is %s" % view_str)
 
373
            return tree, file_list
 
374
        tree = WorkingTree.open_containing(file_list[0])[0]
 
375
        return tree, tree.safe_relpath_files(file_list, canonicalize,
 
376
            apply_view=apply_view)
 
377
 
 
378
    def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
 
379
        """Convert file_list into a list of relpaths in tree.
 
380
 
 
381
        :param self: A tree to operate on.
 
382
        :param file_list: A list of user provided paths or None.
 
383
        :param apply_view: if True and a view is set, apply it or check that
 
384
            specified files are within it
 
385
        :return: A list of relative paths.
 
386
        :raises errors.PathNotChild: When a provided path is in a different self
 
387
            than self.
 
388
        """
 
389
        if file_list is None:
 
390
            return None
 
391
        if self.supports_views() and apply_view:
 
392
            view_files = self.views.lookup_view()
 
393
        else:
 
394
            view_files = []
 
395
        new_list = []
 
396
        # self.relpath exists as a "thunk" to osutils, but canonical_relpath
 
397
        # doesn't - fix that up here before we enter the loop.
 
398
        if canonicalize:
 
399
            fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
 
400
        else:
 
401
            fixer = self.relpath
 
402
        for filename in file_list:
 
403
            try:
 
404
                relpath = fixer(osutils.dereference_path(filename))
 
405
                if view_files and not osutils.is_inside_any(view_files, relpath):
 
406
                    raise errors.FileOutsideView(filename, view_files)
 
407
                new_list.append(relpath)
 
408
            except errors.PathNotChild:
 
409
                raise errors.FileInWrongBranch(self.branch, filename)
 
410
        return new_list
 
411
 
 
412
 
 
413
    @staticmethod
353
414
    def open_downlevel(path=None):
354
415
        """Open an unsupported working tree.
355
416
 
368
429
                return True, None
369
430
            else:
370
431
                return True, tree
371
 
        transport = get_transport(location)
372
 
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
 
432
        t = transport.get_transport(location)
 
433
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
373
434
                                              list_current=list_current)
374
 
        return [t for t in iterator if t is not None]
 
435
        return [tr for tr in iterator if tr is not None]
375
436
 
376
437
    # should be deprecated - this is slow and in any case treating them as a
377
438
    # container is (we now know) bad style -- mbp 20070302
462
523
        return (file_obj, stat_value)
463
524
 
464
525
    def get_file_text(self, file_id, path=None, filtered=True):
465
 
        return self.get_file(file_id, path=path, filtered=filtered).read()
 
526
        my_file = self.get_file(file_id, path=path, filtered=filtered)
 
527
        try:
 
528
            return my_file.read()
 
529
        finally:
 
530
            my_file.close()
466
531
 
467
532
    def get_file_byname(self, filename, filtered=True):
468
533
        path = self.abspath(filename)
522
587
 
523
588
        # Now we have the parents of this content
524
589
        annotator = self.branch.repository.texts.get_annotator()
525
 
        text = self.get_file(file_id).read()
 
590
        text = self.get_file_text(file_id)
526
591
        this_key =(file_id, default_revision)
527
592
        annotator.add_special_text(this_key, file_parent_keys, text)
528
593
        annotations = [(key[-1], line)
1798
1863
            raise errors.ObjectNotLocked(self)
1799
1864
 
1800
1865
    def lock_read(self):
1801
 
        """See Branch.lock_read, and WorkingTree.unlock."""
 
1866
        """Lock the tree for reading.
 
1867
 
 
1868
        This also locks the branch, and can be unlocked via self.unlock().
 
1869
 
 
1870
        :return: A bzrlib.lock.LogicalLockResult.
 
1871
        """
1802
1872
        if not self.is_locked():
1803
1873
            self._reset_data()
1804
1874
        self.branch.lock_read()
1805
1875
        try:
1806
 
            return self._control_files.lock_read()
 
1876
            self._control_files.lock_read()
 
1877
            return LogicalLockResult(self.unlock)
1807
1878
        except:
1808
1879
            self.branch.unlock()
1809
1880
            raise
1810
1881
 
1811
1882
    def lock_tree_write(self):
1812
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
 
1883
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
 
1884
 
 
1885
        :return: A bzrlib.lock.LogicalLockResult.
 
1886
        """
1813
1887
        if not self.is_locked():
1814
1888
            self._reset_data()
1815
1889
        self.branch.lock_read()
1816
1890
        try:
1817
 
            return self._control_files.lock_write()
 
1891
            self._control_files.lock_write()
 
1892
            return LogicalLockResult(self.unlock)
1818
1893
        except:
1819
1894
            self.branch.unlock()
1820
1895
            raise
1821
1896
 
1822
1897
    def lock_write(self):
1823
 
        """See MutableTree.lock_write, and WorkingTree.unlock."""
 
1898
        """See MutableTree.lock_write, and WorkingTree.unlock.
 
1899
 
 
1900
        :return: A bzrlib.lock.LogicalLockResult.
 
1901
        """
1824
1902
        if not self.is_locked():
1825
1903
            self._reset_data()
1826
1904
        self.branch.lock_write()
1827
1905
        try:
1828
 
            return self._control_files.lock_write()
 
1906
            self._control_files.lock_write()
 
1907
            return LogicalLockResult(self.unlock)
1829
1908
        except:
1830
1909
            self.branch.unlock()
1831
1910
            raise
1956
2035
        def recurse_directory_to_add_files(directory):
1957
2036
            # Recurse directory and add all files
1958
2037
            # so we can check if they have changed.
1959
 
            for parent_info, file_infos in\
1960
 
                self.walkdirs(directory):
 
2038
            for parent_info, file_infos in self.walkdirs(directory):
1961
2039
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
2040
                    # Is it versioned or ignored?
1963
2041
                    if self.path2id(relpath) or self.is_ignored(relpath):
1998
2076
                            # ... but not ignored
1999
2077
                            has_changed_files = True
2000
2078
                            break
2001
 
                    elif content_change and (kind[1] is not None):
2002
 
                        # Versioned and changed, but not deleted
 
2079
                    elif (content_change and (kind[1] is not None) and
 
2080
                            osutils.is_inside_any(files, path[1])):
 
2081
                        # Versioned and changed, but not deleted, and still
 
2082
                        # in one of the dirs to be deleted.
2003
2083
                        has_changed_files = True
2004
2084
                        break
2005
2085
 
2636
2716
 
2637
2717
        In Format2 WorkingTrees we have a single lock for the branch and tree
2638
2718
        so lock_tree_write() degrades to lock_write().
 
2719
 
 
2720
        :return: An object with an unlock method which will release the lock
 
2721
            obtained.
2639
2722
        """
2640
2723
        self.branch.lock_write()
2641
2724
        try:
2642
 
            return self._control_files.lock_write()
 
2725
            self._control_files.lock_write()
 
2726
            return self
2643
2727
        except:
2644
2728
            self.branch.unlock()
2645
2729
            raise