← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-15 09:15:03 UTC
  • mfrom: (4595.7.4 409137-lsb-release)
  • Revision ID: pqm@pqm.ubuntu.com-20090815091503-qwbm6glvv31rnujw
(mbp) show platform in selftest, version and backtrace

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
682
613
 
683
614
    def get_file_size(self, file_id):
684
615
        """See Tree.get_file_size"""
685
 
        # XXX: this returns the on-disk size; it should probably return the
686
 
        # canonical size
687
616
        try:
688
617
            return os.path.getsize(self.id2abspath(file_id))
689
618
        except OSError, e:
705
634
 
706
635
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
707
636
        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
637
        return self._inventory[file_id].executable
713
638
 
714
639
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
824
749
            raise
825
750
        kind = _mapper(stat_result.st_mode)
826
751
        if kind == 'file':
827
 
            return self._file_content_summary(path, stat_result)
 
752
            size = stat_result.st_size
 
753
            # try for a stat cache lookup
 
754
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
755
            return (kind, size, executable, self._sha_from_stat(
 
756
                path, stat_result))
828
757
        elif kind == 'directory':
829
758
            # perhaps it looks like a plain directory, but it's really a
830
759
            # reference.
837
766
        else:
838
767
            return (kind, None, None, None)
839
768
 
840
 
    def _file_content_summary(self, path, stat_result):
841
 
        size = stat_result.st_size
842
 
        executable = self._is_executable_from_path_and_stat(path, stat_result)
843
 
        # try for a stat cache lookup
844
 
        return ('file', size, executable, self._sha_from_stat(
845
 
            path, stat_result))
846
 
 
847
769
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
848
770
        """Common ghost checking functionality from set_parent_*.
849
771
 
969
891
 
970
892
    @needs_write_lock # because merge pulls data into the branch.
971
893
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
972
 
                          merge_type=None, force=False):
 
894
        merge_type=None):
973
895
        """Merge from a branch into this working tree.
974
896
 
975
897
        :param branch: The branch to merge from.
979
901
            branch.last_revision().
980
902
        """
981
903
        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()
 
904
        pb = ui.ui_factory.nested_progress_bar()
 
905
        try:
 
906
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
907
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
908
            merger.pp.next_phase()
 
909
            # check that there are no
 
910
            # local alterations
 
911
            merger.check_basis(check_clean=True, require_commits=False)
 
912
            if to_revision is None:
 
913
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
914
            merger.other_rev_id = to_revision
 
915
            if _mod_revision.is_null(merger.other_rev_id):
 
916
                raise errors.NoCommits(branch)
 
917
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
918
            merger.other_basis = merger.other_rev_id
 
919
            merger.other_tree = self.branch.repository.revision_tree(
 
920
                merger.other_rev_id)
 
921
            merger.other_branch = branch
 
922
            merger.pp.next_phase()
 
923
            if from_revision is None:
 
924
                merger.find_base()
 
925
            else:
 
926
                merger.set_base_revision(from_revision, branch)
 
927
            if merger.base_rev_id == merger.other_rev_id:
 
928
                raise errors.PointlessMerge
 
929
            merger.backup_files = False
 
930
            if merge_type is None:
 
931
                merger.merge_type = Merge3Merger
 
932
            else:
 
933
                merger.merge_type = merge_type
 
934
            merger.set_interesting_files(None)
 
935
            merger.show_base = False
 
936
            merger.reprocess = False
 
937
            conflicts = merger.do_merge()
 
938
            merger.set_pending()
 
939
        finally:
 
940
            pb.finished()
1012
941
        return conflicts
1013
942
 
1014
943
    @needs_read_lock
1161
1090
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1162
1091
        if tree_transport.base != branch_transport.base:
1163
1092
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1164
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1165
 
                target_branch=new_branch)
 
1093
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1166
1094
        else:
1167
1095
            tree_bzrdir = branch_bzrdir
1168
1096
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1206
1134
        This does not include files that have been deleted in this
1207
1135
        tree. Skips the control directory.
1208
1136
 
1209
 
        :param include_root: if True, return an entry for the root
 
1137
        :param include_root: if True, do not return an entry for the root
1210
1138
        :param from_dir: start from this directory or None for the root
1211
1139
        :param recursive: whether to recurse into subdirectories or not
1212
1140
        """
1267
1195
                # absolute path
1268
1196
                fap = from_dir_abspath + '/' + f
1269
1197
 
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
 
1198
                f_ie = inv.get_child(from_dir_id, f)
1275
1199
                if f_ie:
1276
1200
                    c = 'V'
1277
1201
                elif self.is_ignored(fp[1:]):
1278
1202
                    c = 'I'
1279
1203
                else:
1280
 
                    # we may not have found this file, because of a unicode
1281
 
                    # issue, or because the directory was actually a symlink.
 
1204
                    # we may not have found this file, because of a unicode issue
1282
1205
                    f_norm, can_access = osutils.normalized_filename(f)
1283
1206
                    if f == f_norm or not can_access:
1284
1207
                        # No change, so treat this file normally
1327
1250
                stack.pop()
1328
1251
 
1329
1252
    @needs_tree_write_lock
1330
 
    def move(self, from_paths, to_dir=None, after=False):
 
1253
    def move(self, from_paths, to_dir=None, after=False, **kwargs):
1331
1254
        """Rename files.
1332
1255
 
1333
1256
        to_dir must exist in the inventory.
1367
1290
 
1368
1291
        # check for deprecated use of signature
1369
1292
        if to_dir is None:
1370
 
            raise TypeError('You must supply a target directory')
 
1293
            to_dir = kwargs.get('to_name', None)
 
1294
            if to_dir is None:
 
1295
                raise TypeError('You must supply a target directory')
 
1296
            else:
 
1297
                symbol_versioning.warn('The parameter to_name was deprecated'
 
1298
                                       ' in version 0.13. Use to_dir instead',
 
1299
                                       DeprecationWarning)
 
1300
 
1371
1301
        # check destination directory
1372
1302
        if isinstance(from_paths, basestring):
1373
1303
            raise ValueError()
1664
1594
    @needs_write_lock
1665
1595
    def pull(self, source, overwrite=False, stop_revision=None,
1666
1596
             change_reporter=None, possible_transports=None, local=False):
 
1597
        top_pb = ui.ui_factory.nested_progress_bar()
1667
1598
        source.lock_read()
1668
1599
        try:
 
1600
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1601
            pp.next_phase()
1669
1602
            old_revision_info = self.branch.last_revision_info()
1670
1603
            basis_tree = self.basis_tree()
1671
1604
            count = self.branch.pull(source, overwrite, stop_revision,
1673
1606
                                     local=local)
1674
1607
            new_revision_info = self.branch.last_revision_info()
1675
1608
            if new_revision_info != old_revision_info:
 
1609
                pp.next_phase()
1676
1610
                repository = self.branch.repository
 
1611
                pb = ui.ui_factory.nested_progress_bar()
1677
1612
                basis_tree.lock_read()
1678
1613
                try:
1679
1614
                    new_basis_tree = self.branch.basis_tree()
1682
1617
                                new_basis_tree,
1683
1618
                                basis_tree,
1684
1619
                                this_tree=self,
1685
 
                                pb=None,
 
1620
                                pb=pb,
1686
1621
                                change_reporter=change_reporter)
1687
 
                    basis_root_id = basis_tree.get_root_id()
1688
 
                    new_root_id = new_basis_tree.get_root_id()
1689
 
                    if basis_root_id != new_root_id:
1690
 
                        self.set_root_id(new_root_id)
 
1622
                    if (basis_tree.inventory.root is None and
 
1623
                        new_basis_tree.inventory.root is not None):
 
1624
                        self.set_root_id(new_basis_tree.get_root_id())
1691
1625
                finally:
 
1626
                    pb.finished()
1692
1627
                    basis_tree.unlock()
1693
1628
                # TODO - dedup parents list with things merged by pull ?
1694
1629
                # reuse the revisiontree we merged against to set the new
1707
1642
            return count
1708
1643
        finally:
1709
1644
            source.unlock()
 
1645
            top_pb.finished()
1710
1646
 
1711
1647
    @needs_write_lock
1712
1648
    def put_file_bytes_non_atomic(self, file_id, bytes):
1797
1733
        r"""Check whether the filename matches an ignore pattern.
1798
1734
 
1799
1735
        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.
 
1736
        others match against only the last component.
1803
1737
 
1804
1738
        If the file is ignored, returns the pattern which caused it to
1805
1739
        be ignored, otherwise None.  So this can simply be used as a
1806
1740
        boolean if desired."""
1807
1741
        if getattr(self, '_ignoreglobster', None) is None:
1808
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1742
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1809
1743
        return self._ignoreglobster.match(filename)
1810
1744
 
1811
1745
    def kind(self, file_id):
1861
1795
            raise errors.ObjectNotLocked(self)
1862
1796
 
1863
1797
    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
 
        """
 
1798
        """See Branch.lock_read, and WorkingTree.unlock."""
1870
1799
        if not self.is_locked():
1871
1800
            self._reset_data()
1872
1801
        self.branch.lock_read()
1873
1802
        try:
1874
 
            self._control_files.lock_read()
1875
 
            return LogicalLockResult(self.unlock)
 
1803
            return self._control_files.lock_read()
1876
1804
        except:
1877
1805
            self.branch.unlock()
1878
1806
            raise
1879
1807
 
1880
1808
    def lock_tree_write(self):
1881
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1882
 
 
1883
 
        :return: A bzrlib.lock.LogicalLockResult.
1884
 
        """
 
1809
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1885
1810
        if not self.is_locked():
1886
1811
            self._reset_data()
1887
1812
        self.branch.lock_read()
1888
1813
        try:
1889
 
            self._control_files.lock_write()
1890
 
            return LogicalLockResult(self.unlock)
 
1814
            return self._control_files.lock_write()
1891
1815
        except:
1892
1816
            self.branch.unlock()
1893
1817
            raise
1894
1818
 
1895
1819
    def lock_write(self):
1896
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1897
 
 
1898
 
        :return: A bzrlib.lock.LogicalLockResult.
1899
 
        """
 
1820
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1900
1821
        if not self.is_locked():
1901
1822
            self._reset_data()
1902
1823
        self.branch.lock_write()
1903
1824
        try:
1904
 
            self._control_files.lock_write()
1905
 
            return LogicalLockResult(self.unlock)
 
1825
            return self._control_files.lock_write()
1906
1826
        except:
1907
1827
            self.branch.unlock()
1908
1828
            raise
1916
1836
    def _reset_data(self):
1917
1837
        """Reset transient data that cannot be revalidated."""
1918
1838
        self._inventory_is_modified = False
1919
 
        f = self._transport.get('inventory')
1920
 
        try:
1921
 
            result = self._deserialize(f)
1922
 
        finally:
1923
 
            f.close()
 
1839
        result = self._deserialize(self._transport.get('inventory'))
1924
1840
        self._set_inventory(result, dirty=False)
1925
1841
 
1926
1842
    @needs_tree_write_lock
1973
1889
            # revision_id is set. We must check for this full string, because a
1974
1890
            # root node id can legitimately look like 'revision_id' but cannot
1975
1891
            # contain a '"'.
1976
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1892
            xml = self.branch.repository.get_inventory_xml(new_revision)
1977
1893
            firstline = xml.split('\n', 1)[0]
1978
1894
            if (not 'revision_id="' in firstline or
1979
1895
                'format="7"' not in firstline):
1980
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1981
 
                    xml, new_revision)
 
1896
                inv = self.branch.repository.deserialise_inventory(
 
1897
                    new_revision, xml)
1982
1898
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1983
1899
            self._write_basis_inventory(xml)
1984
1900
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
2002
1918
        # binary.
2003
1919
        if self._inventory_is_modified:
2004
1920
            raise errors.InventoryModified(self)
2005
 
        f = self._transport.get('inventory')
2006
 
        try:
2007
 
            result = self._deserialize(f)
2008
 
        finally:
2009
 
            f.close()
 
1921
        result = self._deserialize(self._transport.get('inventory'))
2010
1922
        self._set_inventory(result, dirty=False)
2011
1923
        return result
2012
1924
 
2025
1937
 
2026
1938
        inv_delta = []
2027
1939
 
2028
 
        all_files = set() # specified and nested files 
 
1940
        new_files=set()
2029
1941
        unknown_nested_files=set()
2030
 
        if to_file is None:
2031
 
            to_file = sys.stdout
2032
 
 
2033
 
        files_to_backup = []
2034
1942
 
2035
1943
        def recurse_directory_to_add_files(directory):
2036
1944
            # Recurse directory and add all files
2037
1945
            # so we can check if they have changed.
2038
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1946
            for parent_info, file_infos in\
 
1947
                self.walkdirs(directory):
2039
1948
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
2040
1949
                    # Is it versioned or ignored?
2041
 
                    if self.path2id(relpath):
 
1950
                    if self.path2id(relpath) or self.is_ignored(relpath):
2042
1951
                        # Add nested content for deletion.
2043
 
                        all_files.add(relpath)
 
1952
                        new_files.add(relpath)
2044
1953
                    else:
2045
 
                        # Files which are not versioned
 
1954
                        # Files which are not versioned and not ignored
2046
1955
                        # should be treated as unknown.
2047
 
                        files_to_backup.append(relpath)
 
1956
                        unknown_nested_files.add((relpath, None, kind))
2048
1957
 
2049
1958
        for filename in files:
2050
1959
            # Get file name into canonical form.
2051
1960
            abspath = self.abspath(filename)
2052
1961
            filename = self.relpath(abspath)
2053
1962
            if len(filename) > 0:
2054
 
                all_files.add(filename)
 
1963
                new_files.add(filename)
2055
1964
                recurse_directory_to_add_files(filename)
2056
1965
 
2057
 
        files = list(all_files)
 
1966
        files = list(new_files)
2058
1967
 
2059
1968
        if len(files) == 0:
2060
1969
            return # nothing to do
2064
1973
 
2065
1974
        # Bail out if we are going to delete files we shouldn't
2066
1975
        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])
 
1976
            has_changed_files = len(unknown_nested_files) > 0
 
1977
            if not has_changed_files:
 
1978
                for (file_id, path, content_change, versioned, parent_id, name,
 
1979
                     kind, executable) in self.iter_changes(self.basis_tree(),
 
1980
                         include_unchanged=True, require_versioned=False,
 
1981
                         want_unversioned=True, specific_files=files):
 
1982
                    if versioned == (False, False):
 
1983
                        # The record is unknown ...
 
1984
                        if not self.is_ignored(path[1]):
 
1985
                            # ... but not ignored
 
1986
                            has_changed_files = True
 
1987
                            break
 
1988
                    elif content_change and (kind[1] is not None):
 
1989
                        # Versioned and changed, but not deleted
 
1990
                        has_changed_files = True
 
1991
                        break
2079
1992
 
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)
 
1993
            if has_changed_files:
 
1994
                # Make delta show ALL applicable changes in error message.
 
1995
                tree_delta = self.changes_from(self.basis_tree(),
 
1996
                    require_versioned=False, want_unversioned=True,
 
1997
                    specific_files=files)
 
1998
                for unknown_file in unknown_nested_files:
 
1999
                    if unknown_file not in tree_delta.unversioned:
 
2000
                        tree_delta.unversioned.extend((unknown_file,))
 
2001
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2084
2002
 
2085
2003
        # Build inv_delta and delete files where applicable,
2086
2004
        # do this before any modifications to inventory.
2096
2014
                        new_status = 'I'
2097
2015
                    else:
2098
2016
                        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')
 
2017
                    textui.show_status(new_status, self.kind(fid), f,
 
2018
                                       to_file=to_file)
2102
2019
                # Unversion file
2103
2020
                inv_delta.append((f, None, fid, None))
2104
2021
                message = "removed %s" % (f,)
2110
2027
                        len(os.listdir(abs_path)) > 0):
2111
2028
                        if force:
2112
2029
                            osutils.rmtree(abs_path)
2113
 
                            message = "deleted %s" % (f,)
2114
2030
                        else:
2115
 
                            message = backup(f)
 
2031
                            message = "%s is not an empty directory "\
 
2032
                                "and won't be deleted." % (f,)
2116
2033
                    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,)
 
2034
                        osutils.delete_any(abs_path)
 
2035
                        message = "deleted %s" % (f,)
2122
2036
                elif message is not None:
2123
2037
                    # Only care if we haven't done anything yet.
2124
2038
                    message = "%s does not exist." % (f,)
2130
2044
 
2131
2045
    @needs_tree_write_lock
2132
2046
    def revert(self, filenames=None, old_tree=None, backups=True,
2133
 
               pb=None, report_changes=False):
 
2047
               pb=DummyProgress(), report_changes=False):
2134
2048
        from bzrlib.conflicts import resolve
2135
2049
        if filenames == []:
2136
2050
            filenames = None
2258
2172
        """
2259
2173
        raise NotImplementedError(self.unlock)
2260
2174
 
2261
 
    _marker = object()
2262
 
 
2263
 
    def update(self, change_reporter=None, possible_transports=None,
2264
 
               revision=None, old_tip=_marker):
 
2175
    def update(self, change_reporter=None, possible_transports=None):
2265
2176
        """Update a working tree along its branch.
2266
2177
 
2267
2178
        This will update the branch if its bound too, which means we have
2285
2196
        - Merge current state -> basis tree of the master w.r.t. the old tree
2286
2197
          basis.
2287
2198
        - 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
2199
        """
2295
2200
        if self.branch.get_bound_location() is not None:
2296
2201
            self.lock_write()
2297
 
            update_branch = (old_tip is self._marker)
 
2202
            update_branch = True
2298
2203
        else:
2299
2204
            self.lock_tree_write()
2300
2205
            update_branch = False
2302
2207
            if update_branch:
2303
2208
                old_tip = self.branch.update(possible_transports)
2304
2209
            else:
2305
 
                if old_tip is self._marker:
2306
 
                    old_tip = None
2307
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2210
                old_tip = None
 
2211
            return self._update_tree(old_tip, change_reporter)
2308
2212
        finally:
2309
2213
            self.unlock()
2310
2214
 
2311
2215
    @needs_tree_write_lock
2312
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2216
    def _update_tree(self, old_tip=None, change_reporter=None):
2313
2217
        """Update a tree to the master branch.
2314
2218
 
2315
2219
        :param old_tip: if supplied, the previous tip revision the branch,
2325
2229
        # We MUST save it even if an error occurs, because otherwise the users
2326
2230
        # local work is unreferenced and will appear to have been lost.
2327
2231
        #
2328
 
        nb_conflicts = 0
 
2232
        result = 0
2329
2233
        try:
2330
2234
            last_rev = self.get_parent_ids()[0]
2331
2235
        except IndexError:
2332
2236
            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
 
 
 
2237
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2238
            # merge tree state up to new branch tip.
2357
2239
            basis = self.basis_tree()
2358
2240
            basis.lock_read()
2359
2241
            try:
2360
 
                if (basis.inventory.root is None
2361
 
                    or basis.inventory.root.file_id != to_root_id):
2362
 
                    self.set_root_id(to_root_id)
 
2242
                to_tree = self.branch.basis_tree()
 
2243
                if basis.inventory.root is None:
 
2244
                    self.set_root_id(to_tree.get_root_id())
2363
2245
                    self.flush()
 
2246
                result += merge.merge_inner(
 
2247
                                      self.branch,
 
2248
                                      to_tree,
 
2249
                                      basis,
 
2250
                                      this_tree=self,
 
2251
                                      change_reporter=change_reporter)
2364
2252
            finally:
2365
2253
                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
2254
            # TODO - dedup parents list with things merged by pull ?
2378
2255
            # reuse the tree we've updated to to set the basis:
2379
 
            parent_trees = [(revision, to_tree)]
 
2256
            parent_trees = [(self.branch.last_revision(), to_tree)]
2380
2257
            merges = self.get_parent_ids()[1:]
2381
2258
            # Ideally we ask the tree for the trees here, that way the working
2382
2259
            # tree can decide whether to give us the entire tree or give us a
2386
2263
            for parent in merges:
2387
2264
                parent_trees.append(
2388
2265
                    (parent, self.branch.repository.revision_tree(parent)))
2389
 
            if not _mod_revision.is_null(old_tip):
 
2266
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2390
2267
                parent_trees.append(
2391
2268
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2392
2269
            self.set_parent_trees(parent_trees)
2393
2270
            last_rev = parent_trees[0][0]
2394
 
        return nb_conflicts
 
2271
        else:
 
2272
            # the working tree had the same last-revision as the master
 
2273
            # branch did. We may still have pivot local work from the local
 
2274
            # branch into old_tip:
 
2275
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2276
                self.add_parent_tree_id(old_tip)
 
2277
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2278
            and old_tip != last_rev):
 
2279
            # our last revision was not the prior branch last revision
 
2280
            # and we have converted that last revision to a pending merge.
 
2281
            # base is somewhere between the branch tip now
 
2282
            # and the now pending merge
 
2283
 
 
2284
            # Since we just modified the working tree and inventory, flush out
 
2285
            # the current state, before we modify it again.
 
2286
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2287
            #       requires it only because TreeTransform directly munges the
 
2288
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2289
            #       should be able to remove this extra flush.
 
2290
            self.flush()
 
2291
            graph = self.branch.repository.get_graph()
 
2292
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2293
                                                old_tip)
 
2294
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2295
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2296
            result += merge.merge_inner(
 
2297
                                  self.branch,
 
2298
                                  other_tree,
 
2299
                                  base_tree,
 
2300
                                  this_tree=self,
 
2301
                                  change_reporter=change_reporter)
 
2302
        return result
2395
2303
 
2396
2304
    def _write_hashcache_if_dirty(self):
2397
2305
        """Write out the hashcache if it is dirty."""
2667
2575
        """
2668
2576
        return
2669
2577
 
 
2578
    @needs_read_lock
2670
2579
    def _get_rules_searcher(self, default_searcher):
2671
2580
        """See Tree._get_rules_searcher."""
2672
2581
        if self._rules_searcher is None:
2708
2617
 
2709
2618
        In Format2 WorkingTrees we have a single lock for the branch and tree
2710
2619
        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
2620
        """
2715
2621
        self.branch.lock_write()
2716
2622
        try:
2717
 
            self._control_files.lock_write()
2718
 
            return self
 
2623
            return self._control_files.lock_write()
2719
2624
        except:
2720
2625
            self.branch.unlock()
2721
2626
            raise
2855
2760
        """Return the format for the working tree object in a_bzrdir."""
2856
2761
        try:
2857
2762
            transport = a_bzrdir.get_workingtree_transport(None)
2858
 
            format_string = transport.get_bytes("format")
 
2763
            format_string = transport.get("format").read()
2859
2764
            return klass._formats[format_string]
2860
2765
        except errors.NoSuchFile:
2861
2766
            raise errors.NoWorkingTree(base=transport.base)
3125
3030
        return self.get_format_string()
3126
3031
 
3127
3032
 
3128
 
__default_format = WorkingTreeFormat6()
 
3033
__default_format = WorkingTreeFormat4()
3129
3034
WorkingTreeFormat.register_format(__default_format)
 
3035
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3130
3036
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3131
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3132
3037
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3133
3038
WorkingTreeFormat.set_default_format(__default_format)
3134
3039
# formats which have no format string are not discoverable