← 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-03 07:15:11 UTC
  • mfrom: (4580.1.2 408199-check-2a)
  • Revision ID: pqm@pqm.ubuntu.com-20090803071511-dwb041qzak0vjzdk
(mbp) check blackbox tests now handle the root being included in the
        file-id count

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:
289
281
        self._control_files.break_lock()
290
282
        self.branch.break_lock()
291
283
 
292
 
    def _get_check_refs(self):
293
 
        """Return the references needed to perform a check of this tree.
294
 
        
295
 
        The default implementation returns no refs, and is only suitable for
296
 
        trees that have no local caching and can commit on ghosts at any time.
297
 
 
298
 
        :seealso: bzrlib.check for details about check_refs.
299
 
        """
300
 
        return []
301
 
 
302
284
    def requires_rich_root(self):
303
285
        return self._format.requires_rich_root
304
286
 
350
332
        if path is None:
351
333
            path = osutils.getcwd()
352
334
        control, relpath = bzrdir.BzrDir.open_containing(path)
 
335
 
353
336
        return control.open_workingtree(), relpath
354
337
 
355
338
    @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
339
    def open_downlevel(path=None):
415
340
        """Open an unsupported working tree.
416
341
 
429
354
                return True, None
430
355
            else:
431
356
                return True, tree
432
 
        t = transport.get_transport(location)
433
 
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
 
357
        transport = get_transport(location)
 
358
        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
434
359
                                              list_current=list_current)
435
 
        return [tr for tr in iterator if tr is not None]
 
360
        return [t for t in iterator if t is not None]
436
361
 
437
362
    # should be deprecated - this is slow and in any case treating them as a
438
363
    # container is (we now know) bad style -- mbp 20070302
523
448
        return (file_obj, stat_value)
524
449
 
525
450
    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()
 
451
        return self.get_file(file_id, path=path, filtered=filtered).read()
531
452
 
532
453
    def get_file_byname(self, filename, filtered=True):
533
454
        path = self.abspath(filename)
587
508
 
588
509
        # Now we have the parents of this content
589
510
        annotator = self.branch.repository.texts.get_annotator()
590
 
        text = self.get_file_text(file_id)
 
511
        text = self.get_file(file_id).read()
591
512
        this_key =(file_id, default_revision)
592
513
        annotator.add_special_text(this_key, file_parent_keys, text)
593
514
        annotations = [(key[-1], line)
613
534
        else:
614
535
            parents = [last_rev]
615
536
        try:
616
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
537
            merges_file = self._transport.get('pending-merges')
617
538
        except errors.NoSuchFile:
618
539
            pass
619
540
        else:
620
 
            for l in osutils.split_lines(merges_bytes):
 
541
            for l in merges_file.readlines():
621
542
                revision_id = l.rstrip('\n')
622
543
                parents.append(revision_id)
623
544
        return parents
682
603
 
683
604
    def get_file_size(self, file_id):
684
605
        """See Tree.get_file_size"""
685
 
        # XXX: this returns the on-disk size; it should probably return the
686
 
        # canonical size
687
606
        try:
688
607
            return os.path.getsize(self.id2abspath(file_id))
689
608
        except OSError, e:
705
624
 
706
625
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
707
626
        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
627
        return self._inventory[file_id].executable
713
628
 
714
629
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
824
739
            raise
825
740
        kind = _mapper(stat_result.st_mode)
826
741
        if kind == 'file':
827
 
            return self._file_content_summary(path, stat_result)
 
742
            size = stat_result.st_size
 
743
            # try for a stat cache lookup
 
744
            executable = self._is_executable_from_path_and_stat(path, stat_result)
 
745
            return (kind, size, executable, self._sha_from_stat(
 
746
                path, stat_result))
828
747
        elif kind == 'directory':
829
748
            # perhaps it looks like a plain directory, but it's really a
830
749
            # reference.
837
756
        else:
838
757
            return (kind, None, None, None)
839
758
 
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
759
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
848
760
        """Common ghost checking functionality from set_parent_*.
849
761
 
969
881
 
970
882
    @needs_write_lock # because merge pulls data into the branch.
971
883
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
972
 
                          merge_type=None, force=False):
 
884
        merge_type=None):
973
885
        """Merge from a branch into this working tree.
974
886
 
975
887
        :param branch: The branch to merge from.
979
891
            branch.last_revision().
980
892
        """
981
893
        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()
 
894
        pb = ui.ui_factory.nested_progress_bar()
 
895
        try:
 
896
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
897
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
898
            merger.pp.next_phase()
 
899
            # check that there are no
 
900
            # local alterations
 
901
            merger.check_basis(check_clean=True, require_commits=False)
 
902
            if to_revision is None:
 
903
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
904
            merger.other_rev_id = to_revision
 
905
            if _mod_revision.is_null(merger.other_rev_id):
 
906
                raise errors.NoCommits(branch)
 
907
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
908
            merger.other_basis = merger.other_rev_id
 
909
            merger.other_tree = self.branch.repository.revision_tree(
 
910
                merger.other_rev_id)
 
911
            merger.other_branch = branch
 
912
            merger.pp.next_phase()
 
913
            if from_revision is None:
 
914
                merger.find_base()
 
915
            else:
 
916
                merger.set_base_revision(from_revision, branch)
 
917
            if merger.base_rev_id == merger.other_rev_id:
 
918
                raise errors.PointlessMerge
 
919
            merger.backup_files = False
 
920
            if merge_type is None:
 
921
                merger.merge_type = Merge3Merger
 
922
            else:
 
923
                merger.merge_type = merge_type
 
924
            merger.set_interesting_files(None)
 
925
            merger.show_base = False
 
926
            merger.reprocess = False
 
927
            conflicts = merger.do_merge()
 
928
            merger.set_pending()
 
929
        finally:
 
930
            pb.finished()
1012
931
        return conflicts
1013
932
 
1014
933
    @needs_read_lock
1161
1080
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1162
1081
        if tree_transport.base != branch_transport.base:
1163
1082
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1164
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1165
 
                target_branch=new_branch)
 
1083
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1166
1084
        else:
1167
1085
            tree_bzrdir = branch_bzrdir
1168
1086
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1206
1124
        This does not include files that have been deleted in this
1207
1125
        tree. Skips the control directory.
1208
1126
 
1209
 
        :param include_root: if True, return an entry for the root
 
1127
        :param include_root: if True, do not return an entry for the root
1210
1128
        :param from_dir: start from this directory or None for the root
1211
1129
        :param recursive: whether to recurse into subdirectories or not
1212
1130
        """
1267
1185
                # absolute path
1268
1186
                fap = from_dir_abspath + '/' + f
1269
1187
 
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
 
1188
                f_ie = inv.get_child(from_dir_id, f)
1275
1189
                if f_ie:
1276
1190
                    c = 'V'
1277
1191
                elif self.is_ignored(fp[1:]):
1278
1192
                    c = 'I'
1279
1193
                else:
1280
 
                    # we may not have found this file, because of a unicode
1281
 
                    # issue, or because the directory was actually a symlink.
 
1194
                    # we may not have found this file, because of a unicode issue
1282
1195
                    f_norm, can_access = osutils.normalized_filename(f)
1283
1196
                    if f == f_norm or not can_access:
1284
1197
                        # No change, so treat this file normally
1327
1240
                stack.pop()
1328
1241
 
1329
1242
    @needs_tree_write_lock
1330
 
    def move(self, from_paths, to_dir=None, after=False):
 
1243
    def move(self, from_paths, to_dir=None, after=False, **kwargs):
1331
1244
        """Rename files.
1332
1245
 
1333
1246
        to_dir must exist in the inventory.
1367
1280
 
1368
1281
        # check for deprecated use of signature
1369
1282
        if to_dir is None:
1370
 
            raise TypeError('You must supply a target directory')
 
1283
            to_dir = kwargs.get('to_name', None)
 
1284
            if to_dir is None:
 
1285
                raise TypeError('You must supply a target directory')
 
1286
            else:
 
1287
                symbol_versioning.warn('The parameter to_name was deprecated'
 
1288
                                       ' in version 0.13. Use to_dir instead',
 
1289
                                       DeprecationWarning)
 
1290
 
1371
1291
        # check destination directory
1372
1292
        if isinstance(from_paths, basestring):
1373
1293
            raise ValueError()
1664
1584
    @needs_write_lock
1665
1585
    def pull(self, source, overwrite=False, stop_revision=None,
1666
1586
             change_reporter=None, possible_transports=None, local=False):
 
1587
        top_pb = ui.ui_factory.nested_progress_bar()
1667
1588
        source.lock_read()
1668
1589
        try:
 
1590
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1591
            pp.next_phase()
1669
1592
            old_revision_info = self.branch.last_revision_info()
1670
1593
            basis_tree = self.basis_tree()
1671
1594
            count = self.branch.pull(source, overwrite, stop_revision,
1673
1596
                                     local=local)
1674
1597
            new_revision_info = self.branch.last_revision_info()
1675
1598
            if new_revision_info != old_revision_info:
 
1599
                pp.next_phase()
1676
1600
                repository = self.branch.repository
 
1601
                pb = ui.ui_factory.nested_progress_bar()
1677
1602
                basis_tree.lock_read()
1678
1603
                try:
1679
1604
                    new_basis_tree = self.branch.basis_tree()
1682
1607
                                new_basis_tree,
1683
1608
                                basis_tree,
1684
1609
                                this_tree=self,
1685
 
                                pb=None,
 
1610
                                pb=pb,
1686
1611
                                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)
 
1612
                    if (basis_tree.inventory.root is None and
 
1613
                        new_basis_tree.inventory.root is not None):
 
1614
                        self.set_root_id(new_basis_tree.get_root_id())
1691
1615
                finally:
 
1616
                    pb.finished()
1692
1617
                    basis_tree.unlock()
1693
1618
                # TODO - dedup parents list with things merged by pull ?
1694
1619
                # reuse the revisiontree we merged against to set the new
1707
1632
            return count
1708
1633
        finally:
1709
1634
            source.unlock()
 
1635
            top_pb.finished()
1710
1636
 
1711
1637
    @needs_write_lock
1712
1638
    def put_file_bytes_non_atomic(self, file_id, bytes):
1797
1723
        r"""Check whether the filename matches an ignore pattern.
1798
1724
 
1799
1725
        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.
 
1726
        others match against only the last component.
1803
1727
 
1804
1728
        If the file is ignored, returns the pattern which caused it to
1805
1729
        be ignored, otherwise None.  So this can simply be used as a
1806
1730
        boolean if desired."""
1807
1731
        if getattr(self, '_ignoreglobster', None) is None:
1808
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1732
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1809
1733
        return self._ignoreglobster.match(filename)
1810
1734
 
1811
1735
    def kind(self, file_id):
1861
1785
            raise errors.ObjectNotLocked(self)
1862
1786
 
1863
1787
    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
 
        """
 
1788
        """See Branch.lock_read, and WorkingTree.unlock."""
1870
1789
        if not self.is_locked():
1871
1790
            self._reset_data()
1872
1791
        self.branch.lock_read()
1873
1792
        try:
1874
 
            self._control_files.lock_read()
1875
 
            return LogicalLockResult(self.unlock)
 
1793
            return self._control_files.lock_read()
1876
1794
        except:
1877
1795
            self.branch.unlock()
1878
1796
            raise
1879
1797
 
1880
1798
    def lock_tree_write(self):
1881
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1882
 
 
1883
 
        :return: A bzrlib.lock.LogicalLockResult.
1884
 
        """
 
1799
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1885
1800
        if not self.is_locked():
1886
1801
            self._reset_data()
1887
1802
        self.branch.lock_read()
1888
1803
        try:
1889
 
            self._control_files.lock_write()
1890
 
            return LogicalLockResult(self.unlock)
 
1804
            return self._control_files.lock_write()
1891
1805
        except:
1892
1806
            self.branch.unlock()
1893
1807
            raise
1894
1808
 
1895
1809
    def lock_write(self):
1896
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1897
 
 
1898
 
        :return: A bzrlib.lock.LogicalLockResult.
1899
 
        """
 
1810
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1900
1811
        if not self.is_locked():
1901
1812
            self._reset_data()
1902
1813
        self.branch.lock_write()
1903
1814
        try:
1904
 
            self._control_files.lock_write()
1905
 
            return LogicalLockResult(self.unlock)
 
1815
            return self._control_files.lock_write()
1906
1816
        except:
1907
1817
            self.branch.unlock()
1908
1818
            raise
1916
1826
    def _reset_data(self):
1917
1827
        """Reset transient data that cannot be revalidated."""
1918
1828
        self._inventory_is_modified = False
1919
 
        f = self._transport.get('inventory')
1920
 
        try:
1921
 
            result = self._deserialize(f)
1922
 
        finally:
1923
 
            f.close()
 
1829
        result = self._deserialize(self._transport.get('inventory'))
1924
1830
        self._set_inventory(result, dirty=False)
1925
1831
 
1926
1832
    @needs_tree_write_lock
1973
1879
            # revision_id is set. We must check for this full string, because a
1974
1880
            # root node id can legitimately look like 'revision_id' but cannot
1975
1881
            # contain a '"'.
1976
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1882
            xml = self.branch.repository.get_inventory_xml(new_revision)
1977
1883
            firstline = xml.split('\n', 1)[0]
1978
1884
            if (not 'revision_id="' in firstline or
1979
1885
                'format="7"' not in firstline):
1980
 
                inv = self.branch.repository._serializer.read_inventory_from_string(
1981
 
                    xml, new_revision)
 
1886
                inv = self.branch.repository.deserialise_inventory(
 
1887
                    new_revision, xml)
1982
1888
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1983
1889
            self._write_basis_inventory(xml)
1984
1890
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
2002
1908
        # binary.
2003
1909
        if self._inventory_is_modified:
2004
1910
            raise errors.InventoryModified(self)
2005
 
        f = self._transport.get('inventory')
2006
 
        try:
2007
 
            result = self._deserialize(f)
2008
 
        finally:
2009
 
            f.close()
 
1911
        result = self._deserialize(self._transport.get('inventory'))
2010
1912
        self._set_inventory(result, dirty=False)
2011
1913
        return result
2012
1914
 
2025
1927
 
2026
1928
        inv_delta = []
2027
1929
 
2028
 
        all_files = set() # specified and nested files 
 
1930
        new_files=set()
2029
1931
        unknown_nested_files=set()
2030
 
        if to_file is None:
2031
 
            to_file = sys.stdout
2032
 
 
2033
 
        files_to_backup = []
2034
1932
 
2035
1933
        def recurse_directory_to_add_files(directory):
2036
1934
            # Recurse directory and add all files
2037
1935
            # so we can check if they have changed.
2038
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1936
            for parent_info, file_infos in\
 
1937
                self.walkdirs(directory):
2039
1938
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
2040
1939
                    # Is it versioned or ignored?
2041
 
                    if self.path2id(relpath):
 
1940
                    if self.path2id(relpath) or self.is_ignored(relpath):
2042
1941
                        # Add nested content for deletion.
2043
 
                        all_files.add(relpath)
 
1942
                        new_files.add(relpath)
2044
1943
                    else:
2045
 
                        # Files which are not versioned
 
1944
                        # Files which are not versioned and not ignored
2046
1945
                        # should be treated as unknown.
2047
 
                        files_to_backup.append(relpath)
 
1946
                        unknown_nested_files.add((relpath, None, kind))
2048
1947
 
2049
1948
        for filename in files:
2050
1949
            # Get file name into canonical form.
2051
1950
            abspath = self.abspath(filename)
2052
1951
            filename = self.relpath(abspath)
2053
1952
            if len(filename) > 0:
2054
 
                all_files.add(filename)
 
1953
                new_files.add(filename)
2055
1954
                recurse_directory_to_add_files(filename)
2056
1955
 
2057
 
        files = list(all_files)
 
1956
        files = list(new_files)
2058
1957
 
2059
1958
        if len(files) == 0:
2060
1959
            return # nothing to do
2064
1963
 
2065
1964
        # Bail out if we are going to delete files we shouldn't
2066
1965
        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])
 
1966
            has_changed_files = len(unknown_nested_files) > 0
 
1967
            if not has_changed_files:
 
1968
                for (file_id, path, content_change, versioned, parent_id, name,
 
1969
                     kind, executable) in self.iter_changes(self.basis_tree(),
 
1970
                         include_unchanged=True, require_versioned=False,
 
1971
                         want_unversioned=True, specific_files=files):
 
1972
                    if versioned == (False, False):
 
1973
                        # The record is unknown ...
 
1974
                        if not self.is_ignored(path[1]):
 
1975
                            # ... but not ignored
 
1976
                            has_changed_files = True
 
1977
                            break
 
1978
                    elif content_change and (kind[1] is not None):
 
1979
                        # Versioned and changed, but not deleted
 
1980
                        has_changed_files = True
 
1981
                        break
2079
1982
 
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)
 
1983
            if has_changed_files:
 
1984
                # Make delta show ALL applicable changes in error message.
 
1985
                tree_delta = self.changes_from(self.basis_tree(),
 
1986
                    require_versioned=False, want_unversioned=True,
 
1987
                    specific_files=files)
 
1988
                for unknown_file in unknown_nested_files:
 
1989
                    if unknown_file not in tree_delta.unversioned:
 
1990
                        tree_delta.unversioned.extend((unknown_file,))
 
1991
                raise errors.BzrRemoveChangedFilesError(tree_delta)
2084
1992
 
2085
1993
        # Build inv_delta and delete files where applicable,
2086
1994
        # do this before any modifications to inventory.
2096
2004
                        new_status = 'I'
2097
2005
                    else:
2098
2006
                        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')
 
2007
                    textui.show_status(new_status, self.kind(fid), f,
 
2008
                                       to_file=to_file)
2102
2009
                # Unversion file
2103
2010
                inv_delta.append((f, None, fid, None))
2104
2011
                message = "removed %s" % (f,)
2110
2017
                        len(os.listdir(abs_path)) > 0):
2111
2018
                        if force:
2112
2019
                            osutils.rmtree(abs_path)
2113
 
                            message = "deleted %s" % (f,)
2114
2020
                        else:
2115
 
                            message = backup(f)
 
2021
                            message = "%s is not an empty directory "\
 
2022
                                "and won't be deleted." % (f,)
2116
2023
                    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,)
 
2024
                        osutils.delete_any(abs_path)
 
2025
                        message = "deleted %s" % (f,)
2122
2026
                elif message is not None:
2123
2027
                    # Only care if we haven't done anything yet.
2124
2028
                    message = "%s does not exist." % (f,)
2130
2034
 
2131
2035
    @needs_tree_write_lock
2132
2036
    def revert(self, filenames=None, old_tree=None, backups=True,
2133
 
               pb=None, report_changes=False):
 
2037
               pb=DummyProgress(), report_changes=False):
2134
2038
        from bzrlib.conflicts import resolve
2135
2039
        if filenames == []:
2136
2040
            filenames = None
2258
2162
        """
2259
2163
        raise NotImplementedError(self.unlock)
2260
2164
 
2261
 
    _marker = object()
2262
 
 
2263
 
    def update(self, change_reporter=None, possible_transports=None,
2264
 
               revision=None, old_tip=_marker):
 
2165
    def update(self, change_reporter=None, possible_transports=None):
2265
2166
        """Update a working tree along its branch.
2266
2167
 
2267
2168
        This will update the branch if its bound too, which means we have
2285
2186
        - Merge current state -> basis tree of the master w.r.t. the old tree
2286
2187
          basis.
2287
2188
        - 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
2189
        """
2295
2190
        if self.branch.get_bound_location() is not None:
2296
2191
            self.lock_write()
2297
 
            update_branch = (old_tip is self._marker)
 
2192
            update_branch = True
2298
2193
        else:
2299
2194
            self.lock_tree_write()
2300
2195
            update_branch = False
2302
2197
            if update_branch:
2303
2198
                old_tip = self.branch.update(possible_transports)
2304
2199
            else:
2305
 
                if old_tip is self._marker:
2306
 
                    old_tip = None
2307
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2200
                old_tip = None
 
2201
            return self._update_tree(old_tip, change_reporter)
2308
2202
        finally:
2309
2203
            self.unlock()
2310
2204
 
2311
2205
    @needs_tree_write_lock
2312
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2206
    def _update_tree(self, old_tip=None, change_reporter=None):
2313
2207
        """Update a tree to the master branch.
2314
2208
 
2315
2209
        :param old_tip: if supplied, the previous tip revision the branch,
2325
2219
        # We MUST save it even if an error occurs, because otherwise the users
2326
2220
        # local work is unreferenced and will appear to have been lost.
2327
2221
        #
2328
 
        nb_conflicts = 0
 
2222
        result = 0
2329
2223
        try:
2330
2224
            last_rev = self.get_parent_ids()[0]
2331
2225
        except IndexError:
2332
2226
            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
 
 
 
2227
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2228
            # merge tree state up to new branch tip.
2357
2229
            basis = self.basis_tree()
2358
2230
            basis.lock_read()
2359
2231
            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)
 
2232
                to_tree = self.branch.basis_tree()
 
2233
                if basis.inventory.root is None:
 
2234
                    self.set_root_id(to_tree.get_root_id())
2363
2235
                    self.flush()
 
2236
                result += merge.merge_inner(
 
2237
                                      self.branch,
 
2238
                                      to_tree,
 
2239
                                      basis,
 
2240
                                      this_tree=self,
 
2241
                                      change_reporter=change_reporter)
2364
2242
            finally:
2365
2243
                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
2244
            # TODO - dedup parents list with things merged by pull ?
2378
2245
            # reuse the tree we've updated to to set the basis:
2379
 
            parent_trees = [(revision, to_tree)]
 
2246
            parent_trees = [(self.branch.last_revision(), to_tree)]
2380
2247
            merges = self.get_parent_ids()[1:]
2381
2248
            # Ideally we ask the tree for the trees here, that way the working
2382
2249
            # tree can decide whether to give us the entire tree or give us a
2386
2253
            for parent in merges:
2387
2254
                parent_trees.append(
2388
2255
                    (parent, self.branch.repository.revision_tree(parent)))
2389
 
            if not _mod_revision.is_null(old_tip):
 
2256
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2390
2257
                parent_trees.append(
2391
2258
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2392
2259
            self.set_parent_trees(parent_trees)
2393
2260
            last_rev = parent_trees[0][0]
2394
 
        return nb_conflicts
 
2261
        else:
 
2262
            # the working tree had the same last-revision as the master
 
2263
            # branch did. We may still have pivot local work from the local
 
2264
            # branch into old_tip:
 
2265
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2266
                self.add_parent_tree_id(old_tip)
 
2267
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2268
            and old_tip != last_rev):
 
2269
            # our last revision was not the prior branch last revision
 
2270
            # and we have converted that last revision to a pending merge.
 
2271
            # base is somewhere between the branch tip now
 
2272
            # and the now pending merge
 
2273
 
 
2274
            # Since we just modified the working tree and inventory, flush out
 
2275
            # the current state, before we modify it again.
 
2276
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2277
            #       requires it only because TreeTransform directly munges the
 
2278
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2279
            #       should be able to remove this extra flush.
 
2280
            self.flush()
 
2281
            graph = self.branch.repository.get_graph()
 
2282
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2283
                                                old_tip)
 
2284
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2285
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2286
            result += merge.merge_inner(
 
2287
                                  self.branch,
 
2288
                                  other_tree,
 
2289
                                  base_tree,
 
2290
                                  this_tree=self,
 
2291
                                  change_reporter=change_reporter)
 
2292
        return result
2395
2293
 
2396
2294
    def _write_hashcache_if_dirty(self):
2397
2295
        """Write out the hashcache if it is dirty."""
2638
2536
        return un_resolved, resolved
2639
2537
 
2640
2538
    @needs_read_lock
2641
 
    def _check(self, references):
2642
 
        """Check the tree for consistency.
2643
 
 
2644
 
        :param references: A dict with keys matching the items returned by
2645
 
            self._get_check_refs(), and values from looking those keys up in
2646
 
            the repository.
2647
 
        """
 
2539
    def _check(self):
2648
2540
        tree_basis = self.basis_tree()
2649
2541
        tree_basis.lock_read()
2650
2542
        try:
2651
 
            repo_basis = references[('trees', self.last_revision())]
 
2543
            repo_basis = self.branch.repository.revision_tree(
 
2544
                self.last_revision())
2652
2545
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
2653
2546
                raise errors.BzrCheckError(
2654
2547
                    "Mismatched basis inventory content.")
2667
2560
        """
2668
2561
        return
2669
2562
 
 
2563
    @needs_read_lock
2670
2564
    def _get_rules_searcher(self, default_searcher):
2671
2565
        """See Tree._get_rules_searcher."""
2672
2566
        if self._rules_searcher is None:
2699
2593
        if self._inventory is None:
2700
2594
            self.read_working_inventory()
2701
2595
 
2702
 
    def _get_check_refs(self):
2703
 
        """Return the references needed to perform a check of this tree."""
2704
 
        return [('trees', self.last_revision())]
2705
 
 
2706
2596
    def lock_tree_write(self):
2707
2597
        """See WorkingTree.lock_tree_write().
2708
2598
 
2709
2599
        In Format2 WorkingTrees we have a single lock for the branch and tree
2710
2600
        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
2601
        """
2715
2602
        self.branch.lock_write()
2716
2603
        try:
2717
 
            self._control_files.lock_write()
2718
 
            return self
 
2604
            return self._control_files.lock_write()
2719
2605
        except:
2720
2606
            self.branch.unlock()
2721
2607
            raise
2769
2655
                mode=self.bzrdir._get_file_mode())
2770
2656
            return True
2771
2657
 
2772
 
    def _get_check_refs(self):
2773
 
        """Return the references needed to perform a check of this tree."""
2774
 
        return [('trees', self.last_revision())]
2775
 
 
2776
2658
    @needs_tree_write_lock
2777
2659
    def set_conflicts(self, conflicts):
2778
2660
        self._put_rio('conflicts', conflicts.to_stanzas(),
2855
2737
        """Return the format for the working tree object in a_bzrdir."""
2856
2738
        try:
2857
2739
            transport = a_bzrdir.get_workingtree_transport(None)
2858
 
            format_string = transport.get_bytes("format")
 
2740
            format_string = transport.get("format").read()
2859
2741
            return klass._formats[format_string]
2860
2742
        except errors.NoSuchFile:
2861
2743
            raise errors.NoWorkingTree(base=transport.base)
3125
3007
        return self.get_format_string()
3126
3008
 
3127
3009
 
3128
 
__default_format = WorkingTreeFormat6()
 
3010
__default_format = WorkingTreeFormat4()
3129
3011
WorkingTreeFormat.register_format(__default_format)
 
3012
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3130
3013
WorkingTreeFormat.register_format(WorkingTreeFormat5())
3131
 
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3132
3014
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3133
3015
WorkingTreeFormat.set_default_format(__default_format)
3134
3016
# formats which have no format string are not discoverable