← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-02 17:16:12 UTC
  • mto: This revision was merged to the branch mainline in revision 5369.
  • Revision ID: john@arbash-meinel.com-20100802171612-rdh5ods70w2bl3j7
We also have to re-implement it for _simple_set_pyx.pyx

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
            # XXX: doesn't really belong here, and seems to have the strange
 
368
            # side effect of making it return a bunch of files, not the whole
 
369
            # tree -- mbp 20100716
 
370
            if tree.supports_views() and apply_view:
 
371
                view_files = tree.views.lookup_view()
 
372
                if view_files:
 
373
                    file_list = view_files
 
374
                    view_str = views.view_display_str(view_files)
 
375
                    note("Ignoring files outside view. View is %s" % view_str)
 
376
            return tree, file_list
 
377
        tree = WorkingTree.open_containing(file_list[0])[0]
 
378
        return tree, tree.safe_relpath_files(file_list, canonicalize,
 
379
            apply_view=apply_view)
 
380
 
 
381
    def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
 
382
        """Convert file_list into a list of relpaths in tree.
 
383
 
 
384
        :param self: A tree to operate on.
 
385
        :param file_list: A list of user provided paths or None.
 
386
        :param apply_view: if True and a view is set, apply it or check that
 
387
            specified files are within it
 
388
        :return: A list of relative paths.
 
389
        :raises errors.PathNotChild: When a provided path is in a different self
 
390
            than self.
 
391
        """
 
392
        if file_list is None:
 
393
            return None
 
394
        if self.supports_views() and apply_view:
 
395
            view_files = self.views.lookup_view()
 
396
        else:
 
397
            view_files = []
 
398
        new_list = []
 
399
        # self.relpath exists as a "thunk" to osutils, but canonical_relpath
 
400
        # doesn't - fix that up here before we enter the loop.
 
401
        if canonicalize:
 
402
            fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
 
403
        else:
 
404
            fixer = self.relpath
 
405
        for filename in file_list:
 
406
            relpath = fixer(osutils.dereference_path(filename))
 
407
            if view_files and not osutils.is_inside_any(view_files, relpath):
 
408
                raise errors.FileOutsideView(filename, view_files)
 
409
            new_list.append(relpath)
 
410
        return new_list
 
411
 
 
412
    @staticmethod
353
413
    def open_downlevel(path=None):
354
414
        """Open an unsupported working tree.
355
415
 
368
428
                return True, None
369
429
            else:
370
430
                return True, tree
371
 
        transport = get_transport(location)
372
 
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
 
431
        t = transport.get_transport(location)
 
432
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
373
433
                                              list_current=list_current)
374
 
        return [t for t in iterator if t is not None]
 
434
        return [tr for tr in iterator if tr is not None]
375
435
 
376
436
    # should be deprecated - this is slow and in any case treating them as a
377
437
    # container is (we now know) bad style -- mbp 20070302
462
522
        return (file_obj, stat_value)
463
523
 
464
524
    def get_file_text(self, file_id, path=None, filtered=True):
465
 
        return self.get_file(file_id, path=path, filtered=filtered).read()
 
525
        my_file = self.get_file(file_id, path=path, filtered=filtered)
 
526
        try:
 
527
            return my_file.read()
 
528
        finally:
 
529
            my_file.close()
466
530
 
467
531
    def get_file_byname(self, filename, filtered=True):
468
532
        path = self.abspath(filename)
522
586
 
523
587
        # Now we have the parents of this content
524
588
        annotator = self.branch.repository.texts.get_annotator()
525
 
        text = self.get_file(file_id).read()
 
589
        text = self.get_file_text(file_id)
526
590
        this_key =(file_id, default_revision)
527
591
        annotator.add_special_text(this_key, file_parent_keys, text)
528
592
        annotations = [(key[-1], line)
1257
1321
                stack.pop()
1258
1322
 
1259
1323
    @needs_tree_write_lock
1260
 
    def move(self, from_paths, to_dir=None, after=False, **kwargs):
 
1324
    def move(self, from_paths, to_dir=None, after=False):
1261
1325
        """Rename files.
1262
1326
 
1263
1327
        to_dir must exist in the inventory.
1297
1361
 
1298
1362
        # check for deprecated use of signature
1299
1363
        if to_dir is None:
1300
 
            to_dir = kwargs.get('to_name', None)
1301
 
            if to_dir is None:
1302
 
                raise TypeError('You must supply a target directory')
1303
 
            else:
1304
 
                symbol_versioning.warn('The parameter to_name was deprecated'
1305
 
                                       ' in version 0.13. Use to_dir instead',
1306
 
                                       DeprecationWarning)
1307
 
 
 
1364
            raise TypeError('You must supply a target directory')
1308
1365
        # check destination directory
1309
1366
        if isinstance(from_paths, basestring):
1310
1367
            raise ValueError()
1798
1855
            raise errors.ObjectNotLocked(self)
1799
1856
 
1800
1857
    def lock_read(self):
1801
 
        """See Branch.lock_read, and WorkingTree.unlock."""
 
1858
        """Lock the tree for reading.
 
1859
 
 
1860
        This also locks the branch, and can be unlocked via self.unlock().
 
1861
 
 
1862
        :return: A bzrlib.lock.LogicalLockResult.
 
1863
        """
1802
1864
        if not self.is_locked():
1803
1865
            self._reset_data()
1804
1866
        self.branch.lock_read()
1805
1867
        try:
1806
 
            return self._control_files.lock_read()
 
1868
            self._control_files.lock_read()
 
1869
            return LogicalLockResult(self.unlock)
1807
1870
        except:
1808
1871
            self.branch.unlock()
1809
1872
            raise
1810
1873
 
1811
1874
    def lock_tree_write(self):
1812
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
 
1875
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
 
1876
 
 
1877
        :return: A bzrlib.lock.LogicalLockResult.
 
1878
        """
1813
1879
        if not self.is_locked():
1814
1880
            self._reset_data()
1815
1881
        self.branch.lock_read()
1816
1882
        try:
1817
 
            return self._control_files.lock_write()
 
1883
            self._control_files.lock_write()
 
1884
            return LogicalLockResult(self.unlock)
1818
1885
        except:
1819
1886
            self.branch.unlock()
1820
1887
            raise
1821
1888
 
1822
1889
    def lock_write(self):
1823
 
        """See MutableTree.lock_write, and WorkingTree.unlock."""
 
1890
        """See MutableTree.lock_write, and WorkingTree.unlock.
 
1891
 
 
1892
        :return: A bzrlib.lock.LogicalLockResult.
 
1893
        """
1824
1894
        if not self.is_locked():
1825
1895
            self._reset_data()
1826
1896
        self.branch.lock_write()
1827
1897
        try:
1828
 
            return self._control_files.lock_write()
 
1898
            self._control_files.lock_write()
 
1899
            return LogicalLockResult(self.unlock)
1829
1900
        except:
1830
1901
            self.branch.unlock()
1831
1902
            raise
1956
2027
        def recurse_directory_to_add_files(directory):
1957
2028
            # Recurse directory and add all files
1958
2029
            # so we can check if they have changed.
1959
 
            for parent_info, file_infos in\
1960
 
                self.walkdirs(directory):
 
2030
            for parent_info, file_infos in self.walkdirs(directory):
1961
2031
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
2032
                    # Is it versioned or ignored?
1963
2033
                    if self.path2id(relpath) or self.is_ignored(relpath):
1998
2068
                            # ... but not ignored
1999
2069
                            has_changed_files = True
2000
2070
                            break
2001
 
                    elif content_change and (kind[1] is not None):
2002
 
                        # Versioned and changed, but not deleted
 
2071
                    elif (content_change and (kind[1] is not None) and
 
2072
                            osutils.is_inside_any(files, path[1])):
 
2073
                        # Versioned and changed, but not deleted, and still
 
2074
                        # in one of the dirs to be deleted.
2003
2075
                        has_changed_files = True
2004
2076
                        break
2005
2077
 
2636
2708
 
2637
2709
        In Format2 WorkingTrees we have a single lock for the branch and tree
2638
2710
        so lock_tree_write() degrades to lock_write().
 
2711
 
 
2712
        :return: An object with an unlock method which will release the lock
 
2713
            obtained.
2639
2714
        """
2640
2715
        self.branch.lock_write()
2641
2716
        try:
2642
 
            return self._control_files.lock_write()
 
2717
            self._control_files.lock_write()
 
2718
            return self
2643
2719
        except:
2644
2720
            self.branch.unlock()
2645
2721
            raise