← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Danny van Heumen
  • Date: 2010-03-09 16:38:10 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309163810-ujn8hcx08f75nlf1
Refined test to make use of locking hooks and also validate if lock is truly a checkout-lock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
49
55
    branch,
50
56
    bzrdir,
51
57
    conflicts as _mod_conflicts,
52
 
    controldir,
53
58
    errors,
54
59
    generate_ids,
55
60
    globbing,
60
65
    merge,
61
66
    revision as _mod_revision,
62
67
    revisiontree,
 
68
    textui,
63
69
    trace,
64
70
    transform,
65
 
    transport,
66
71
    ui,
67
72
    views,
68
73
    xml5,
69
74
    xml7,
70
75
    )
 
76
import bzrlib.branch
 
77
from bzrlib.transport import get_transport
71
78
from bzrlib.workingtree_4 import (
72
79
    WorkingTreeFormat4,
73
80
    WorkingTreeFormat5,
77
84
 
78
85
from bzrlib import symbol_versioning
79
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
 
from bzrlib.lock import LogicalLockResult
81
87
from bzrlib.lockable_files import LockableFiles
82
88
from bzrlib.lockdir import LockDir
83
89
import bzrlib.mutabletree
96
102
from bzrlib.filters import filtered_input_file
97
103
from bzrlib.trace import mutter, note
98
104
from bzrlib.transport.local import LocalTransport
 
105
from bzrlib.progress import DummyProgress, ProgressPhase
99
106
from bzrlib.revision import CURRENT_REVISION
100
107
from bzrlib.rio import RioReader, rio_file, Stanza
101
108
from bzrlib.symbol_versioning import (
105
112
 
106
113
 
107
114
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
 
# TODO: Modifying the conflict objects or their type is currently nearly
109
 
# impossible as there is no clear relationship between the working tree format
110
 
# and the conflict list file format.
111
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
116
 
113
117
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
172
        return ''
169
173
 
170
174
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    controldir.ControlComponent):
 
175
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
176
    """Working copy tree.
174
177
 
175
178
    The inventory is held in the `Branch` working-inventory, and the
177
180
 
178
181
    It is possible for a `WorkingTree` to have a filename which is
179
182
    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).
183
183
    """
184
184
 
185
185
    # override this to set the strategy for storing views
251
251
        self._rules_searcher = None
252
252
        self.views = self._make_views()
253
253
 
254
 
    @property
255
 
    def user_transport(self):
256
 
        return self.bzrdir.user_transport
257
 
 
258
 
    @property
259
 
    def control_transport(self):
260
 
        return self._transport
261
 
 
262
254
    def _detect_case_handling(self):
263
255
        wt_trans = self.bzrdir.get_workingtree_transport(None)
264
256
        try:
350
342
        if path is None:
351
343
            path = osutils.getcwd()
352
344
        control, relpath = bzrdir.BzrDir.open_containing(path)
 
345
 
353
346
        return control.open_workingtree(), relpath
354
347
 
355
348
    @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
414
349
    def open_downlevel(path=None):
415
350
        """Open an unsupported working tree.
416
351
 
429
364
                return True, None
430
365
            else:
431
366
                return True, tree
432
 
        t = transport.get_transport(location)
433
 
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
 
367
        transport = get_transport(location)
 
368
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
434
369
                                              list_current=list_current)
435
 
        return [tr for tr in iterator if tr is not None]
 
370
        return [t for t in iterator if t is not None]
436
371
 
437
372
    # should be deprecated - this is slow and in any case treating them as a
438
373
    # container is (we now know) bad style -- mbp 20070302
523
458
        return (file_obj, stat_value)
524
459
 
525
460
    def get_file_text(self, file_id, path=None, filtered=True):
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()
 
461
        return self.get_file(file_id, path=path, filtered=filtered).read()
531
462
 
532
463
    def get_file_byname(self, filename, filtered=True):
533
464
        path = self.abspath(filename)
587
518
 
588
519
        # Now we have the parents of this content
589
520
        annotator = self.branch.repository.texts.get_annotator()
590
 
        text = self.get_file_text(file_id)
 
521
        text = self.get_file(file_id).read()
591
522
        this_key =(file_id, default_revision)
592
523
        annotator.add_special_text(this_key, file_parent_keys, text)
593
524
        annotations = [(key[-1], line)
613
544
        else:
614
545
            parents = [last_rev]
615
546
        try:
616
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
547
            merges_file = self._transport.get('pending-merges')
617
548
        except errors.NoSuchFile:
618
549
            pass
619
550
        else:
620
 
            for l in osutils.split_lines(merges_bytes):
 
551
            for l in merges_file.readlines():
621
552
                revision_id = l.rstrip('\n')
622
553
                parents.append(revision_id)
623
554
        return parents
705
636
 
706
637
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
707
638
        file_id = self.path2id(path)
708
 
        if file_id is None:
709
 
            # For unversioned files on win32, we just assume they are not
710
 
            # executable
711
 
            return False
712
639
        return self._inventory[file_id].executable
713
640
 
714
641
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
969
896
 
970
897
    @needs_write_lock # because merge pulls data into the branch.
971
898
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
972
 
                          merge_type=None, force=False):
 
899
        merge_type=None):
973
900
        """Merge from a branch into this working tree.
974
901
 
975
902
        :param branch: The branch to merge from.
979
906
            branch.last_revision().
980
907
        """
981
908
        from bzrlib.merge import Merger, Merge3Merger
982
 
        merger = Merger(self.branch, this_tree=self)
983
 
        # check that there are no local alterations
984
 
        if not force and self.has_changes():
985
 
            raise errors.UncommittedChanges(self)
986
 
        if to_revision is None:
987
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
988
 
        merger.other_rev_id = to_revision
989
 
        if _mod_revision.is_null(merger.other_rev_id):
990
 
            raise errors.NoCommits(branch)
991
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
992
 
        merger.other_basis = merger.other_rev_id
993
 
        merger.other_tree = self.branch.repository.revision_tree(
994
 
            merger.other_rev_id)
995
 
        merger.other_branch = branch
996
 
        if from_revision is None:
997
 
            merger.find_base()
998
 
        else:
999
 
            merger.set_base_revision(from_revision, branch)
1000
 
        if merger.base_rev_id == merger.other_rev_id:
1001
 
            raise errors.PointlessMerge
1002
 
        merger.backup_files = False
1003
 
        if merge_type is None:
1004
 
            merger.merge_type = Merge3Merger
1005
 
        else:
1006
 
            merger.merge_type = merge_type
1007
 
        merger.set_interesting_files(None)
1008
 
        merger.show_base = False
1009
 
        merger.reprocess = False
1010
 
        conflicts = merger.do_merge()
1011
 
        merger.set_pending()
 
909
        pb = ui.ui_factory.nested_progress_bar()
 
910
        try:
 
911
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
912
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
913
            merger.pp.next_phase()
 
914
            # check that there are no
 
915
            # local alterations
 
916
            merger.check_basis(check_clean=True, require_commits=False)
 
917
            if to_revision is None:
 
918
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
919
            merger.other_rev_id = to_revision
 
920
            if _mod_revision.is_null(merger.other_rev_id):
 
921
                raise errors.NoCommits(branch)
 
922
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
923
            merger.other_basis = merger.other_rev_id
 
924
            merger.other_tree = self.branch.repository.revision_tree(
 
925
                merger.other_rev_id)
 
926
            merger.other_branch = branch
 
927
            merger.pp.next_phase()
 
928
            if from_revision is None:
 
929
                merger.find_base()
 
930
            else:
 
931
                merger.set_base_revision(from_revision, branch)
 
932
            if merger.base_rev_id == merger.other_rev_id:
 
933
                raise errors.PointlessMerge
 
934
            merger.backup_files = False
 
935
            if merge_type is None:
 
936
                merger.merge_type = Merge3Merger
 
937
            else:
 
938
                merger.merge_type = merge_type
 
939
            merger.set_interesting_files(None)
 
940
            merger.show_base = False
 
941
            merger.reprocess = False
 
942
            conflicts = merger.do_merge()
 
943
            merger.set_pending()
 
944
        finally:
 
945
            pb.finished()
1012
946
        return conflicts
1013
947
 
1014
948
    @needs_read_lock
1161
1095
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1162
1096
        if tree_transport.base != branch_transport.base:
1163
1097
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1164
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1165
 
                target_branch=new_branch)
 
1098
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1166
1099
        else:
1167
1100
            tree_bzrdir = branch_bzrdir
1168
1101
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1206
1139
        This does not include files that have been deleted in this
1207
1140
        tree. Skips the control directory.
1208
1141
 
1209
 
        :param include_root: if True, return an entry for the root
 
1142
        :param include_root: if True, do not return an entry for the root
1210
1143
        :param from_dir: start from this directory or None for the root
1211
1144
        :param recursive: whether to recurse into subdirectories or not
1212
1145
        """
1267
1200
                # absolute path
1268
1201
                fap = from_dir_abspath + '/' + f
1269
1202
 
1270
 
                dir_ie = inv[from_dir_id]
1271
 
                if dir_ie.kind == 'directory':
1272
 
                    f_ie = dir_ie.children.get(f)
1273
 
                else:
1274
 
                    f_ie = None
 
1203
                f_ie = inv.get_child(from_dir_id, f)
1275
1204
                if f_ie:
1276
1205
                    c = 'V'
1277
1206
                elif self.is_ignored(fp[1:]):
1278
1207
                    c = 'I'
1279
1208
                else:
1280
 
                    # we may not have found this file, because of a unicode
1281
 
                    # issue, or because the directory was actually a symlink.
 
1209
                    # we may not have found this file, because of a unicode issue
1282
1210
                    f_norm, can_access = osutils.normalized_filename(f)
1283
1211
                    if f == f_norm or not can_access:
1284
1212
                        # No change, so treat this file normally
1327
1255
                stack.pop()
1328
1256
 
1329
1257
    @needs_tree_write_lock
1330
 
    def move(self, from_paths, to_dir=None, after=False):
 
1258
    def move(self, from_paths, to_dir=None, after=False, **kwargs):
1331
1259
        """Rename files.
1332
1260
 
1333
1261
        to_dir must exist in the inventory.
1367
1295
 
1368
1296
        # check for deprecated use of signature
1369
1297
        if to_dir is None:
1370
 
            raise TypeError('You must supply a target directory')
 
1298
            to_dir = kwargs.get('to_name', None)
 
1299
            if to_dir is None:
 
1300
                raise TypeError('You must supply a target directory')
 
1301
            else:
 
1302
                symbol_versioning.warn('The parameter to_name was deprecated'
 
1303
                                       ' in version 0.13. Use to_dir instead',
 
1304
                                       DeprecationWarning)
 
1305
 
1371
1306
        # check destination directory
1372
1307
        if isinstance(from_paths, basestring):
1373
1308
            raise ValueError()
1664
1599
    @needs_write_lock
1665
1600
    def pull(self, source, overwrite=False, stop_revision=None,
1666
1601
             change_reporter=None, possible_transports=None, local=False):
 
1602
        top_pb = ui.ui_factory.nested_progress_bar()
1667
1603
        source.lock_read()
1668
1604
        try:
 
1605
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1606
            pp.next_phase()
1669
1607
            old_revision_info = self.branch.last_revision_info()
1670
1608
            basis_tree = self.basis_tree()
1671
1609
            count = self.branch.pull(source, overwrite, stop_revision,
1673
1611
                                     local=local)
1674
1612
            new_revision_info = self.branch.last_revision_info()
1675
1613
            if new_revision_info != old_revision_info:
 
1614
                pp.next_phase()
1676
1615
                repository = self.branch.repository
 
1616
                pb = ui.ui_factory.nested_progress_bar()
1677
1617
                basis_tree.lock_read()
1678
1618
                try:
1679
1619
                    new_basis_tree = self.branch.basis_tree()
1682
1622
                                new_basis_tree,
1683
1623
                                basis_tree,
1684
1624
                                this_tree=self,
1685
 
                                pb=None,
 
1625
                                pb=pb,
1686
1626
                                change_reporter=change_reporter)
1687
1627
                    basis_root_id = basis_tree.get_root_id()
1688
1628
                    new_root_id = new_basis_tree.get_root_id()
1689
1629
                    if basis_root_id != new_root_id:
1690
1630
                        self.set_root_id(new_root_id)
1691
1631
                finally:
 
1632
                    pb.finished()
1692
1633
                    basis_tree.unlock()
1693
1634
                # TODO - dedup parents list with things merged by pull ?
1694
1635
                # reuse the revisiontree we merged against to set the new
1707
1648
            return count
1708
1649
        finally:
1709
1650
            source.unlock()
 
1651
            top_pb.finished()
1710
1652
 
1711
1653
    @needs_write_lock
1712
1654
    def put_file_bytes_non_atomic(self, file_id, bytes):
1797
1739
        r"""Check whether the filename matches an ignore pattern.
1798
1740
 
1799
1741
        Patterns containing '/' or '\' need to match the whole path;
1800
 
        others match against only the last component.  Patterns starting
1801
 
        with '!' are ignore exceptions.  Exceptions take precedence
1802
 
        over regular patterns and cause the filename to not be ignored.
 
1742
        others match against only the last component.
1803
1743
 
1804
1744
        If the file is ignored, returns the pattern which caused it to
1805
1745
        be ignored, otherwise None.  So this can simply be used as a
1806
1746
        boolean if desired."""
1807
1747
        if getattr(self, '_ignoreglobster', None) is None:
1808
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1748
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1809
1749
        return self._ignoreglobster.match(filename)
1810
1750
 
1811
1751
    def kind(self, file_id):
1861
1801
            raise errors.ObjectNotLocked(self)
1862
1802
 
1863
1803
    def lock_read(self):
1864
 
        """Lock the tree for reading.
1865
 
 
1866
 
        This also locks the branch, and can be unlocked via self.unlock().
1867
 
 
1868
 
        :return: A bzrlib.lock.LogicalLockResult.
1869
 
        """
 
1804
        """See Branch.lock_read, and WorkingTree.unlock."""
1870
1805
        if not self.is_locked():
1871
1806
            self._reset_data()
1872
1807
        self.branch.lock_read()
1873
1808
        try:
1874
 
            self._control_files.lock_read()
1875
 
            return LogicalLockResult(self.unlock)
 
1809
            return self._control_files.lock_read()
1876
1810
        except:
1877
1811
            self.branch.unlock()
1878
1812
            raise
1879
1813
 
1880
1814
    def lock_tree_write(self):
1881
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1882
 
 
1883
 
        :return: A bzrlib.lock.LogicalLockResult.
1884
 
        """
 
1815
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1885
1816
        if not self.is_locked():
1886
1817
            self._reset_data()
1887
1818
        self.branch.lock_read()
1888
1819
        try:
1889
 
            self._control_files.lock_write()
1890
 
            return LogicalLockResult(self.unlock)
 
1820
            return self._control_files.lock_write()
1891
1821
        except:
1892
1822
            self.branch.unlock()
1893
1823
            raise
1894
1824
 
1895
1825
    def lock_write(self):
1896
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1897
 
 
1898
 
        :return: A bzrlib.lock.LogicalLockResult.
1899
 
        """
 
1826
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1900
1827
        if not self.is_locked():
1901
1828
            self._reset_data()
1902
1829
        self.branch.lock_write()
1903
1830
        try:
1904
 
            self._control_files.lock_write()
1905
 
            return LogicalLockResult(self.unlock)
 
1831
            return self._control_files.lock_write()
1906
1832
        except:
1907
1833
            self.branch.unlock()
1908
1834
            raise
1916
1842
    def _reset_data(self):
1917
1843
        """Reset transient data that cannot be revalidated."""
1918
1844
        self._inventory_is_modified = False
1919
 
        f = self._transport.get('inventory')
1920
 
        try:
1921
 
            result = self._deserialize(f)
1922
 
        finally:
1923
 
            f.close()
 
1845
        result = self._deserialize(self._transport.get('inventory'))
1924
1846
        self._set_inventory(result, dirty=False)
1925
1847
 
1926
1848
    @needs_tree_write_lock
1973
1895
            # revision_id is set. We must check for this full string, because a
1974
1896
            # root node id can legitimately look like 'revision_id' but cannot
1975
1897
            # contain a '"'.
1976
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1898
            xml = self.branch.repository.get_inventory_xml(new_revision)
1977
1899
            firstline = xml.split('\n', 1)[0]
1978
1900
            if (not 'revision_id="' in firstline or
1979
1901
                'format="7"' not in firstline):
2002
1924
        # binary.
2003
1925
        if self._inventory_is_modified:
2004
1926
            raise errors.InventoryModified(self)
2005
 
        f = self._transport.get('inventory')
2006
 
        try:
2007
 
            result = self._deserialize(f)
2008
 
        finally:
2009
 
            f.close()
 
1927
        result = self._deserialize(self._transport.get('inventory'))
2010
1928
        self._set_inventory(result, dirty=False)
2011
1929
        return result
2012
1930
 
2025
1943
 
2026
1944
        inv_delta = []
2027
1945
 
2028
 
        all_files = set() # specified and nested files 
 
1946
        new_files=set()
2029
1947
        unknown_nested_files=set()
2030
 
        if to_file is None:
2031
 
            to_file = sys.stdout
2032
 
 
2033
 
        files_to_backup = []
2034
1948
 
2035
1949
        def recurse_directory_to_add_files(directory):
2036
1950
            # Recurse directory and add all files
2037
1951
            # so we can check if they have changed.
2038
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1952
            for parent_info, file_infos in\
 
1953
                self.walkdirs(directory):
2039
1954
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
2040
1955
                    # Is it versioned or ignored?
2041
 
                    if self.path2id(relpath):
 
1956
                    if self.path2id(relpath) or self.is_ignored(relpath):
2042
1957
                        # Add nested content for deletion.
2043
 
                        all_files.add(relpath)
 
1958
                        new_files.add(relpath)
2044
1959
                    else:
2045
 
                        # Files which are not versioned
 
1960
                        # Files which are not versioned and not ignored
2046
1961
                        # should be treated as unknown.
2047
 
                        files_to_backup.append(relpath)
 
1962
                        unknown_nested_files.add((relpath, None, kind))
2048
1963
 
2049
1964
        for filename in files:
2050
1965
            # Get file name into canonical form.
2051
1966
            abspath = self.abspath(filename)
2052
1967
            filename = self.relpath(abspath)
2053
1968
            if len(filename) > 0:
2054
 
                all_files.add(filename)
 
1969
                new_files.add(filename)
2055
1970
                recurse_directory_to_add_files(filename)
2056
1971
 
2057
 
        files = list(all_files)
 
1972
        files = list(new_files)
2058
1973
 
2059
1974
        if len(files) == 0:
2060
1975
            return # nothing to do
2064
1979
 
2065
1980
        # Bail out if we are going to delete files we shouldn't
2066
1981
        if not keep_files and not force:
2067
 
            for (file_id, path, content_change, versioned, parent_id, name,
2068
 
                 kind, executable) in self.iter_changes(self.basis_tree(),
2069
 
                     include_unchanged=True, require_versioned=False,
2070
 
                     want_unversioned=True, specific_files=files):
2071
 
                if versioned[0] == False:
2072
 
                    # The record is unknown or newly added
2073
 
                    files_to_backup.append(path[1])
2074
 
                elif (content_change and (kind[1] is not None) and
2075
 
                        osutils.is_inside_any(files, path[1])):
2076
 
                    # Versioned and changed, but not deleted, and still
2077
 
                    # in one of the dirs to be deleted.
2078
 
                    files_to_backup.append(path[1])
 
1982
            has_changed_files = len(unknown_nested_files) > 0
 
1983
            if not has_changed_files:
 
1984
                for (file_id, path, content_change, versioned, parent_id, name,
 
1985
                     kind, executable) in self.iter_changes(self.basis_tree(),
 
1986
                         include_unchanged=True, require_versioned=False,
 
1987
                         want_unversioned=True, specific_files=files):
 
1988
                    if versioned == (False, False):
 
1989
                        # The record is unknown ...
 
1990
                        if not self.is_ignored(path[1]):
 
1991
                            # ... but not ignored
 
1992
                            has_changed_files = True
 
1993
                            break
 
1994
                    elif content_change and (kind[1] is not None):
 
1995
                        # Versioned and changed, but not deleted
 
1996
                        has_changed_files = True
 
1997
                        break
2079
1998
 
2080
 
        def backup(file_to_backup):
2081
 
            backup_name = self.bzrdir.generate_backup_name(file_to_backup)
2082
 
            osutils.rename(abs_path, self.abspath(backup_name))
2083
 
            return "removed %s (but kept a copy: %s)" % (file_to_backup, backup_name)
 
1999
            if has_changed_files:
 
2000
                # Make delta show ALL applicable changes in error message.
 
2001
                tree_delta = self.changes_from(self.basis_tree(),
 
2002
                    require_versioned=False, want_unversioned=True,
 
2003
                    specific_files=files)
 
2004
                for unknown_file in unknown_nested_files:
 
2005
                    if unknown_file not in tree_delta.unversioned:
 
2006
                        tree_delta.unversioned.extend((unknown_file,))
 
2007
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2084
2008
 
2085
2009
        # Build inv_delta and delete files where applicable,
2086
2010
        # do this before any modifications to inventory.
2096
2020
                        new_status = 'I'
2097
2021
                    else:
2098
2022
                        new_status = '?'
2099
 
                    # XXX: Really should be a more abstract reporter interface
2100
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2101
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2023
                    textui.show_status(new_status, self.kind(fid), f,
 
2024
                                       to_file=to_file)
2102
2025
                # Unversion file
2103
2026
                inv_delta.append((f, None, fid, None))
2104
2027
                message = "removed %s" % (f,)
2110
2033
                        len(os.listdir(abs_path)) > 0):
2111
2034
                        if force:
2112
2035
                            osutils.rmtree(abs_path)
2113
 
                            message = "deleted %s" % (f,)
2114
2036
                        else:
2115
 
                            message = backup(f)
 
2037
                            message = "%s is not an empty directory "\
 
2038
                                "and won't be deleted." % (f,)
2116
2039
                    else:
2117
 
                        if f in files_to_backup:
2118
 
                            message = backup(f)
2119
 
                        else:
2120
 
                            osutils.delete_any(abs_path)
2121
 
                            message = "deleted %s" % (f,)
 
2040
                        osutils.delete_any(abs_path)
 
2041
                        message = "deleted %s" % (f,)
2122
2042
                elif message is not None:
2123
2043
                    # Only care if we haven't done anything yet.
2124
2044
                    message = "%s does not exist." % (f,)
2130
2050
 
2131
2051
    @needs_tree_write_lock
2132
2052
    def revert(self, filenames=None, old_tree=None, backups=True,
2133
 
               pb=None, report_changes=False):
 
2053
               pb=DummyProgress(), report_changes=False):
2134
2054
        from bzrlib.conflicts import resolve
2135
2055
        if filenames == []:
2136
2056
            filenames = None
2258
2178
        """
2259
2179
        raise NotImplementedError(self.unlock)
2260
2180
 
2261
 
    _marker = object()
2262
 
 
2263
 
    def update(self, change_reporter=None, possible_transports=None,
2264
 
               revision=None, old_tip=_marker):
 
2181
    def update(self, change_reporter=None, possible_transports=None):
2265
2182
        """Update a working tree along its branch.
2266
2183
 
2267
2184
        This will update the branch if its bound too, which means we have
2285
2202
        - Merge current state -> basis tree of the master w.r.t. the old tree
2286
2203
          basis.
2287
2204
        - Do a 'normal' merge of the old branch basis if it is relevant.
2288
 
 
2289
 
        :param revision: The target revision to update to. Must be in the
2290
 
            revision history.
2291
 
        :param old_tip: If branch.update() has already been run, the value it
2292
 
            returned (old tip of the branch or None). _marker is used
2293
 
            otherwise.
2294
2205
        """
2295
2206
        if self.branch.get_bound_location() is not None:
2296
2207
            self.lock_write()
2297
 
            update_branch = (old_tip is self._marker)
 
2208
            update_branch = True
2298
2209
        else:
2299
2210
            self.lock_tree_write()
2300
2211
            update_branch = False
2302
2213
            if update_branch:
2303
2214
                old_tip = self.branch.update(possible_transports)
2304
2215
            else:
2305
 
                if old_tip is self._marker:
2306
 
                    old_tip = None
2307
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2216
                old_tip = None
 
2217
            return self._update_tree(old_tip, change_reporter)
2308
2218
        finally:
2309
2219
            self.unlock()
2310
2220
 
2311
2221
    @needs_tree_write_lock
2312
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2222
    def _update_tree(self, old_tip=None, change_reporter=None):
2313
2223
        """Update a tree to the master branch.
2314
2224
 
2315
2225
        :param old_tip: if supplied, the previous tip revision the branch,
2325
2235
        # We MUST save it even if an error occurs, because otherwise the users
2326
2236
        # local work is unreferenced and will appear to have been lost.
2327
2237
        #
2328
 
        nb_conflicts = 0
 
2238
        result = 0
2329
2239
        try:
2330
2240
            last_rev = self.get_parent_ids()[0]
2331
2241
        except IndexError:
2332
2242
            last_rev = _mod_revision.NULL_REVISION
2333
 
        if revision is None:
2334
 
            revision = self.branch.last_revision()
2335
 
 
2336
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2337
 
 
2338
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2339
 
            # the branch we are bound to was updated
2340
 
            # merge those changes in first
2341
 
            base_tree  = self.basis_tree()
2342
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2343
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2344
 
                                             base_tree, this_tree=self,
2345
 
                                             change_reporter=change_reporter)
2346
 
            if nb_conflicts:
2347
 
                self.add_parent_tree((old_tip, other_tree))
2348
 
                trace.note('Rerun update after fixing the conflicts.')
2349
 
                return nb_conflicts
2350
 
 
2351
 
        if last_rev != _mod_revision.ensure_null(revision):
2352
 
            # the working tree is up to date with the branch
2353
 
            # we can merge the specified revision from master
2354
 
            to_tree = self.branch.repository.revision_tree(revision)
2355
 
            to_root_id = to_tree.get_root_id()
2356
 
 
 
2243
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2244
            # merge tree state up to new branch tip.
2357
2245
            basis = self.basis_tree()
2358
2246
            basis.lock_read()
2359
2247
            try:
 
2248
                to_tree = self.branch.basis_tree()
 
2249
                to_root_id = to_tree.get_root_id()
2360
2250
                if (basis.inventory.root is None
2361
2251
                    or basis.inventory.root.file_id != to_root_id):
2362
2252
                    self.set_root_id(to_root_id)
2363
2253
                    self.flush()
 
2254
                result += merge.merge_inner(
 
2255
                                      self.branch,
 
2256
                                      to_tree,
 
2257
                                      basis,
 
2258
                                      this_tree=self,
 
2259
                                      change_reporter=change_reporter)
2364
2260
            finally:
2365
2261
                basis.unlock()
2366
 
 
2367
 
            # determine the branch point
2368
 
            graph = self.branch.repository.get_graph()
2369
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2370
 
                                                last_rev)
2371
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2372
 
 
2373
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2374
 
                                             this_tree=self,
2375
 
                                             change_reporter=change_reporter)
2376
 
            self.set_last_revision(revision)
2377
2262
            # TODO - dedup parents list with things merged by pull ?
2378
2263
            # reuse the tree we've updated to to set the basis:
2379
 
            parent_trees = [(revision, to_tree)]
 
2264
            parent_trees = [(self.branch.last_revision(), to_tree)]
2380
2265
            merges = self.get_parent_ids()[1:]
2381
2266
            # Ideally we ask the tree for the trees here, that way the working
2382
2267
            # tree can decide whether to give us the entire tree or give us a
2386
2271
            for parent in merges:
2387
2272
                parent_trees.append(
2388
2273
                    (parent, self.branch.repository.revision_tree(parent)))
2389
 
            if not _mod_revision.is_null(old_tip):
 
2274
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2390
2275
                parent_trees.append(
2391
2276
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2392
2277
            self.set_parent_trees(parent_trees)
2393
2278
            last_rev = parent_trees[0][0]
2394
 
        return nb_conflicts
 
2279
        else:
 
2280
            # the working tree had the same last-revision as the master
 
2281
            # branch did. We may still have pivot local work from the local
 
2282
            # branch into old_tip:
 
2283
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2284
                self.add_parent_tree_id(old_tip)
 
2285
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2286
            and old_tip != last_rev):
 
2287
            # our last revision was not the prior branch last revision
 
2288
            # and we have converted that last revision to a pending merge.
 
2289
            # base is somewhere between the branch tip now
 
2290
            # and the now pending merge
 
2291
 
 
2292
            # Since we just modified the working tree and inventory, flush out
 
2293
            # the current state, before we modify it again.
 
2294
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2295
            #       requires it only because TreeTransform directly munges the
 
2296
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2297
            #       should be able to remove this extra flush.
 
2298
            self.flush()
 
2299
            graph = self.branch.repository.get_graph()
 
2300
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2301
                                                old_tip)
 
2302
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2303
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2304
            result += merge.merge_inner(
 
2305
                                  self.branch,
 
2306
                                  other_tree,
 
2307
                                  base_tree,
 
2308
                                  this_tree=self,
 
2309
                                  change_reporter=change_reporter)
 
2310
        return result
2395
2311
 
2396
2312
    def _write_hashcache_if_dirty(self):
2397
2313
        """Write out the hashcache if it is dirty."""
2667
2583
        """
2668
2584
        return
2669
2585
 
 
2586
    @needs_read_lock
2670
2587
    def _get_rules_searcher(self, default_searcher):
2671
2588
        """See Tree._get_rules_searcher."""
2672
2589
        if self._rules_searcher is None:
2708
2625
 
2709
2626
        In Format2 WorkingTrees we have a single lock for the branch and tree
2710
2627
        so lock_tree_write() degrades to lock_write().
2711
 
 
2712
 
        :return: An object with an unlock method which will release the lock
2713
 
            obtained.
2714
2628
        """
2715
2629
        self.branch.lock_write()
2716
2630
        try:
2717
 
            self._control_files.lock_write()
2718
 
            return self
 
2631
            return self._control_files.lock_write()
2719
2632
        except:
2720
2633
            self.branch.unlock()
2721
2634
            raise
2855
2768
        """Return the format for the working tree object in a_bzrdir."""
2856
2769
        try:
2857
2770
            transport = a_bzrdir.get_workingtree_transport(None)
2858
 
            format_string = transport.get_bytes("format")
 
2771
            format_string = transport.get("format").read()
2859
2772
            return klass._formats[format_string]
2860
2773
        except errors.NoSuchFile:
2861
2774
            raise errors.NoWorkingTree(base=transport.base)