/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: Jelmer Vernooij
  • Date: 2010-08-02 23:53:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5389.
  • Revision ID: jelmer@samba.org-20100802235316-v6a6p0r2a1os0dsn
base ControlDir on ControlComponent.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
49
49
    branch,
50
50
    bzrdir,
51
51
    conflicts as _mod_conflicts,
 
52
    controldir,
52
53
    errors,
53
54
    generate_ids,
54
55
    globbing,
61
62
    revisiontree,
62
63
    trace,
63
64
    transform,
 
65
    transport,
64
66
    ui,
65
67
    views,
66
68
    xml5,
67
69
    xml7,
68
70
    )
69
 
import bzrlib.branch
70
 
from bzrlib.transport import get_transport
71
71
from bzrlib.workingtree_4 import (
72
72
    WorkingTreeFormat4,
73
73
    WorkingTreeFormat5,
77
77
 
78
78
from bzrlib import symbol_versioning
79
79
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
80
from bzrlib.lock import LogicalLockResult
80
81
from bzrlib.lockable_files import LockableFiles
81
82
from bzrlib.lockdir import LockDir
82
83
import bzrlib.mutabletree
168
169
 
169
170
 
170
171
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
172
    controldir.ControlComponent):
172
173
    """Working copy tree.
173
174
 
174
175
    The inventory is held in the `Branch` working-inventory, and the
176
177
 
177
178
    It is possible for a `WorkingTree` to have a filename which is
178
179
    not listed in the Inventory and vice versa.
 
180
 
 
181
    :ivar basedir: The root of the tree on disk. This is a unicode path object
 
182
        (as opposed to a URL).
179
183
    """
180
184
 
181
185
    # override this to set the strategy for storing views
346
350
        if path is None:
347
351
            path = osutils.getcwd()
348
352
        control, relpath = bzrdir.BzrDir.open_containing(path)
349
 
 
350
353
        return control.open_workingtree(), relpath
351
354
 
352
355
    @staticmethod
 
356
    def open_containing_paths(file_list, default_directory='.',
 
357
        canonicalize=True, apply_view=True):
 
358
        """Open the WorkingTree that contains a set of paths.
 
359
 
 
360
        Fail if the paths given are not all in a single tree.
 
361
 
 
362
        This is used for the many command-line interfaces that take a list of
 
363
        any number of files and that require they all be in the same tree.
 
364
        """
 
365
        # recommended replacement for builtins.internal_tree_files
 
366
        if file_list is None or len(file_list) == 0:
 
367
            tree = WorkingTree.open_containing(default_directory)[0]
 
368
            # XXX: doesn't really belong here, and seems to have the strange
 
369
            # side effect of making it return a bunch of files, not the whole
 
370
            # tree -- mbp 20100716
 
371
            if tree.supports_views() and apply_view:
 
372
                view_files = tree.views.lookup_view()
 
373
                if view_files:
 
374
                    file_list = view_files
 
375
                    view_str = views.view_display_str(view_files)
 
376
                    note("Ignoring files outside view. View is %s" % view_str)
 
377
            return tree, file_list
 
378
        tree = WorkingTree.open_containing(file_list[0])[0]
 
379
        return tree, tree.safe_relpath_files(file_list, canonicalize,
 
380
            apply_view=apply_view)
 
381
 
 
382
    def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
 
383
        """Convert file_list into a list of relpaths in tree.
 
384
 
 
385
        :param self: A tree to operate on.
 
386
        :param file_list: A list of user provided paths or None.
 
387
        :param apply_view: if True and a view is set, apply it or check that
 
388
            specified files are within it
 
389
        :return: A list of relative paths.
 
390
        :raises errors.PathNotChild: When a provided path is in a different self
 
391
            than self.
 
392
        """
 
393
        if file_list is None:
 
394
            return None
 
395
        if self.supports_views() and apply_view:
 
396
            view_files = self.views.lookup_view()
 
397
        else:
 
398
            view_files = []
 
399
        new_list = []
 
400
        # self.relpath exists as a "thunk" to osutils, but canonical_relpath
 
401
        # doesn't - fix that up here before we enter the loop.
 
402
        if canonicalize:
 
403
            fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
 
404
        else:
 
405
            fixer = self.relpath
 
406
        for filename in file_list:
 
407
            relpath = fixer(osutils.dereference_path(filename))
 
408
            if view_files and not osutils.is_inside_any(view_files, relpath):
 
409
                raise errors.FileOutsideView(filename, view_files)
 
410
            new_list.append(relpath)
 
411
        return new_list
 
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)
1257
1322
                stack.pop()
1258
1323
 
1259
1324
    @needs_tree_write_lock
1260
 
    def move(self, from_paths, to_dir=None, after=False, **kwargs):
 
1325
    def move(self, from_paths, to_dir=None, after=False):
1261
1326
        """Rename files.
1262
1327
 
1263
1328
        to_dir must exist in the inventory.
1297
1362
 
1298
1363
        # check for deprecated use of signature
1299
1364
        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
 
 
 
1365
            raise TypeError('You must supply a target directory')
1308
1366
        # check destination directory
1309
1367
        if isinstance(from_paths, basestring):
1310
1368
            raise ValueError()
1798
1856
            raise errors.ObjectNotLocked(self)
1799
1857
 
1800
1858
    def lock_read(self):
1801
 
        """See Branch.lock_read, and WorkingTree.unlock."""
 
1859
        """Lock the tree for reading.
 
1860
 
 
1861
        This also locks the branch, and can be unlocked via self.unlock().
 
1862
 
 
1863
        :return: A bzrlib.lock.LogicalLockResult.
 
1864
        """
1802
1865
        if not self.is_locked():
1803
1866
            self._reset_data()
1804
1867
        self.branch.lock_read()
1805
1868
        try:
1806
 
            return self._control_files.lock_read()
 
1869
            self._control_files.lock_read()
 
1870
            return LogicalLockResult(self.unlock)
1807
1871
        except:
1808
1872
            self.branch.unlock()
1809
1873
            raise
1810
1874
 
1811
1875
    def lock_tree_write(self):
1812
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
 
1876
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
 
1877
 
 
1878
        :return: A bzrlib.lock.LogicalLockResult.
 
1879
        """
1813
1880
        if not self.is_locked():
1814
1881
            self._reset_data()
1815
1882
        self.branch.lock_read()
1816
1883
        try:
1817
 
            return self._control_files.lock_write()
 
1884
            self._control_files.lock_write()
 
1885
            return LogicalLockResult(self.unlock)
1818
1886
        except:
1819
1887
            self.branch.unlock()
1820
1888
            raise
1821
1889
 
1822
1890
    def lock_write(self):
1823
 
        """See MutableTree.lock_write, and WorkingTree.unlock."""
 
1891
        """See MutableTree.lock_write, and WorkingTree.unlock.
 
1892
 
 
1893
        :return: A bzrlib.lock.LogicalLockResult.
 
1894
        """
1824
1895
        if not self.is_locked():
1825
1896
            self._reset_data()
1826
1897
        self.branch.lock_write()
1827
1898
        try:
1828
 
            return self._control_files.lock_write()
 
1899
            self._control_files.lock_write()
 
1900
            return LogicalLockResult(self.unlock)
1829
1901
        except:
1830
1902
            self.branch.unlock()
1831
1903
            raise
1956
2028
        def recurse_directory_to_add_files(directory):
1957
2029
            # Recurse directory and add all files
1958
2030
            # so we can check if they have changed.
1959
 
            for parent_info, file_infos in\
1960
 
                self.walkdirs(directory):
 
2031
            for parent_info, file_infos in self.walkdirs(directory):
1961
2032
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
2033
                    # Is it versioned or ignored?
1963
2034
                    if self.path2id(relpath) or self.is_ignored(relpath):
1998
2069
                            # ... but not ignored
1999
2070
                            has_changed_files = True
2000
2071
                            break
2001
 
                    elif content_change and (kind[1] is not None):
2002
 
                        # Versioned and changed, but not deleted
 
2072
                    elif (content_change and (kind[1] is not None) and
 
2073
                            osutils.is_inside_any(files, path[1])):
 
2074
                        # Versioned and changed, but not deleted, and still
 
2075
                        # in one of the dirs to be deleted.
2003
2076
                        has_changed_files = True
2004
2077
                        break
2005
2078
 
2636
2709
 
2637
2710
        In Format2 WorkingTrees we have a single lock for the branch and tree
2638
2711
        so lock_tree_write() degrades to lock_write().
 
2712
 
 
2713
        :return: An object with an unlock method which will release the lock
 
2714
            obtained.
2639
2715
        """
2640
2716
        self.branch.lock_write()
2641
2717
        try:
2642
 
            return self._control_files.lock_write()
 
2718
            self._control_files.lock_write()
 
2719
            return self
2643
2720
        except:
2644
2721
            self.branch.unlock()
2645
2722
            raise