/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Add a NEWS entry and prepare submission.

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
77
83
 
78
84
from bzrlib import symbol_versioning
79
85
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
 
from bzrlib.lock import LogicalLockResult
81
86
from bzrlib.lockable_files import LockableFiles
82
87
from bzrlib.lockdir import LockDir
83
88
import bzrlib.mutabletree
96
101
from bzrlib.filters import filtered_input_file
97
102
from bzrlib.trace import mutter, note
98
103
from bzrlib.transport.local import LocalTransport
 
104
from bzrlib.progress import DummyProgress, ProgressPhase
99
105
from bzrlib.revision import CURRENT_REVISION
100
106
from bzrlib.rio import RioReader, rio_file, Stanza
101
107
from bzrlib.symbol_versioning import (
168
174
        return ''
169
175
 
170
176
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
177
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
178
    """Working copy tree.
174
179
 
175
180
    The inventory is held in the `Branch` working-inventory, and the
248
253
        self._rules_searcher = None
249
254
        self.views = self._make_views()
250
255
 
251
 
    @property
252
 
    def user_transport(self):
253
 
        return self.bzrdir.user_transport
254
 
 
255
 
    @property
256
 
    def control_transport(self):
257
 
        return self._transport
258
 
 
259
256
    def _detect_case_handling(self):
260
257
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
258
        try:
463
460
        return (file_obj, stat_value)
464
461
 
465
462
    def get_file_text(self, file_id, path=None, filtered=True):
466
 
        my_file = self.get_file(file_id, path=path, filtered=filtered)
467
 
        try:
468
 
            return my_file.read()
469
 
        finally:
470
 
            my_file.close()
 
463
        return self.get_file(file_id, path=path, filtered=filtered).read()
471
464
 
472
465
    def get_file_byname(self, filename, filtered=True):
473
466
        path = self.abspath(filename)
527
520
 
528
521
        # Now we have the parents of this content
529
522
        annotator = self.branch.repository.texts.get_annotator()
530
 
        text = self.get_file_text(file_id)
 
523
        text = self.get_file(file_id).read()
531
524
        this_key =(file_id, default_revision)
532
525
        annotator.add_special_text(this_key, file_parent_keys, text)
533
526
        annotations = [(key[-1], line)
919
912
            branch.last_revision().
920
913
        """
921
914
        from bzrlib.merge import Merger, Merge3Merger
922
 
        merger = Merger(self.branch, this_tree=self)
923
 
        # check that there are no local alterations
924
 
        if not force and self.has_changes():
925
 
            raise errors.UncommittedChanges(self)
926
 
        if to_revision is None:
927
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
928
 
        merger.other_rev_id = to_revision
929
 
        if _mod_revision.is_null(merger.other_rev_id):
930
 
            raise errors.NoCommits(branch)
931
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
932
 
        merger.other_basis = merger.other_rev_id
933
 
        merger.other_tree = self.branch.repository.revision_tree(
934
 
            merger.other_rev_id)
935
 
        merger.other_branch = branch
936
 
        if from_revision is None:
937
 
            merger.find_base()
938
 
        else:
939
 
            merger.set_base_revision(from_revision, branch)
940
 
        if merger.base_rev_id == merger.other_rev_id:
941
 
            raise errors.PointlessMerge
942
 
        merger.backup_files = False
943
 
        if merge_type is None:
944
 
            merger.merge_type = Merge3Merger
945
 
        else:
946
 
            merger.merge_type = merge_type
947
 
        merger.set_interesting_files(None)
948
 
        merger.show_base = False
949
 
        merger.reprocess = False
950
 
        conflicts = merger.do_merge()
951
 
        merger.set_pending()
 
915
        pb = ui.ui_factory.nested_progress_bar()
 
916
        try:
 
917
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
918
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
919
            merger.pp.next_phase()
 
920
            # check that there are no local alterations
 
921
            if not force and self.has_changes():
 
922
                raise errors.UncommittedChanges(self)
 
923
            if to_revision is None:
 
924
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
925
            merger.other_rev_id = to_revision
 
926
            if _mod_revision.is_null(merger.other_rev_id):
 
927
                raise errors.NoCommits(branch)
 
928
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
929
            merger.other_basis = merger.other_rev_id
 
930
            merger.other_tree = self.branch.repository.revision_tree(
 
931
                merger.other_rev_id)
 
932
            merger.other_branch = branch
 
933
            merger.pp.next_phase()
 
934
            if from_revision is None:
 
935
                merger.find_base()
 
936
            else:
 
937
                merger.set_base_revision(from_revision, branch)
 
938
            if merger.base_rev_id == merger.other_rev_id:
 
939
                raise errors.PointlessMerge
 
940
            merger.backup_files = False
 
941
            if merge_type is None:
 
942
                merger.merge_type = Merge3Merger
 
943
            else:
 
944
                merger.merge_type = merge_type
 
945
            merger.set_interesting_files(None)
 
946
            merger.show_base = False
 
947
            merger.reprocess = False
 
948
            conflicts = merger.do_merge()
 
949
            merger.set_pending()
 
950
        finally:
 
951
            pb.finished()
952
952
        return conflicts
953
953
 
954
954
    @needs_read_lock
1101
1101
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1102
1102
        if tree_transport.base != branch_transport.base:
1103
1103
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1104
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1105
 
                target_branch=new_branch)
 
1104
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1106
1105
        else:
1107
1106
            tree_bzrdir = branch_bzrdir
1108
1107
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1146
1145
        This does not include files that have been deleted in this
1147
1146
        tree. Skips the control directory.
1148
1147
 
1149
 
        :param include_root: if True, return an entry for the root
 
1148
        :param include_root: if True, do not return an entry for the root
1150
1149
        :param from_dir: start from this directory or None for the root
1151
1150
        :param recursive: whether to recurse into subdirectories or not
1152
1151
        """
1606
1605
    @needs_write_lock
1607
1606
    def pull(self, source, overwrite=False, stop_revision=None,
1608
1607
             change_reporter=None, possible_transports=None, local=False):
 
1608
        top_pb = ui.ui_factory.nested_progress_bar()
1609
1609
        source.lock_read()
1610
1610
        try:
 
1611
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1612
            pp.next_phase()
1611
1613
            old_revision_info = self.branch.last_revision_info()
1612
1614
            basis_tree = self.basis_tree()
1613
1615
            count = self.branch.pull(source, overwrite, stop_revision,
1615
1617
                                     local=local)
1616
1618
            new_revision_info = self.branch.last_revision_info()
1617
1619
            if new_revision_info != old_revision_info:
 
1620
                pp.next_phase()
1618
1621
                repository = self.branch.repository
 
1622
                pb = ui.ui_factory.nested_progress_bar()
1619
1623
                basis_tree.lock_read()
1620
1624
                try:
1621
1625
                    new_basis_tree = self.branch.basis_tree()
1624
1628
                                new_basis_tree,
1625
1629
                                basis_tree,
1626
1630
                                this_tree=self,
1627
 
                                pb=None,
 
1631
                                pb=pb,
1628
1632
                                change_reporter=change_reporter)
1629
 
                    basis_root_id = basis_tree.get_root_id()
1630
 
                    new_root_id = new_basis_tree.get_root_id()
1631
 
                    if basis_root_id != new_root_id:
1632
 
                        self.set_root_id(new_root_id)
 
1633
                    if (basis_tree.inventory.root is None and
 
1634
                        new_basis_tree.inventory.root is not None):
 
1635
                        self.set_root_id(new_basis_tree.get_root_id())
1633
1636
                finally:
 
1637
                    pb.finished()
1634
1638
                    basis_tree.unlock()
1635
1639
                # TODO - dedup parents list with things merged by pull ?
1636
1640
                # reuse the revisiontree we merged against to set the new
1649
1653
            return count
1650
1654
        finally:
1651
1655
            source.unlock()
 
1656
            top_pb.finished()
1652
1657
 
1653
1658
    @needs_write_lock
1654
1659
    def put_file_bytes_non_atomic(self, file_id, bytes):
1739
1744
        r"""Check whether the filename matches an ignore pattern.
1740
1745
 
1741
1746
        Patterns containing '/' or '\' need to match the whole path;
1742
 
        others match against only the last component.  Patterns starting
1743
 
        with '!' are ignore exceptions.  Exceptions take precedence
1744
 
        over regular patterns and cause the filename to not be ignored.
 
1747
        others match against only the last component.
1745
1748
 
1746
1749
        If the file is ignored, returns the pattern which caused it to
1747
1750
        be ignored, otherwise None.  So this can simply be used as a
1748
1751
        boolean if desired."""
1749
1752
        if getattr(self, '_ignoreglobster', None) is None:
1750
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1753
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1751
1754
        return self._ignoreglobster.match(filename)
1752
1755
 
1753
1756
    def kind(self, file_id):
1803
1806
            raise errors.ObjectNotLocked(self)
1804
1807
 
1805
1808
    def lock_read(self):
1806
 
        """Lock the tree for reading.
1807
 
 
1808
 
        This also locks the branch, and can be unlocked via self.unlock().
1809
 
 
1810
 
        :return: A bzrlib.lock.LogicalLockResult.
1811
 
        """
 
1809
        """See Branch.lock_read, and WorkingTree.unlock."""
1812
1810
        if not self.is_locked():
1813
1811
            self._reset_data()
1814
1812
        self.branch.lock_read()
1815
1813
        try:
1816
 
            self._control_files.lock_read()
1817
 
            return LogicalLockResult(self.unlock)
 
1814
            return self._control_files.lock_read()
1818
1815
        except:
1819
1816
            self.branch.unlock()
1820
1817
            raise
1821
1818
 
1822
1819
    def lock_tree_write(self):
1823
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1824
 
 
1825
 
        :return: A bzrlib.lock.LogicalLockResult.
1826
 
        """
 
1820
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1827
1821
        if not self.is_locked():
1828
1822
            self._reset_data()
1829
1823
        self.branch.lock_read()
1830
1824
        try:
1831
 
            self._control_files.lock_write()
1832
 
            return LogicalLockResult(self.unlock)
 
1825
            return self._control_files.lock_write()
1833
1826
        except:
1834
1827
            self.branch.unlock()
1835
1828
            raise
1836
1829
 
1837
1830
    def lock_write(self):
1838
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1839
 
 
1840
 
        :return: A bzrlib.lock.LogicalLockResult.
1841
 
        """
 
1831
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1842
1832
        if not self.is_locked():
1843
1833
            self._reset_data()
1844
1834
        self.branch.lock_write()
1845
1835
        try:
1846
 
            self._control_files.lock_write()
1847
 
            return LogicalLockResult(self.unlock)
 
1836
            return self._control_files.lock_write()
1848
1837
        except:
1849
1838
            self.branch.unlock()
1850
1839
            raise
1915
1904
            # revision_id is set. We must check for this full string, because a
1916
1905
            # root node id can legitimately look like 'revision_id' but cannot
1917
1906
            # contain a '"'.
1918
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1907
            xml = self.branch.repository.get_inventory_xml(new_revision)
1919
1908
            firstline = xml.split('\n', 1)[0]
1920
1909
            if (not 'revision_id="' in firstline or
1921
1910
                'format="7"' not in firstline):
1975
1964
        def recurse_directory_to_add_files(directory):
1976
1965
            # Recurse directory and add all files
1977
1966
            # so we can check if they have changed.
1978
 
            for parent_info, file_infos in self.walkdirs(directory):
 
1967
            for parent_info, file_infos in\
 
1968
                self.walkdirs(directory):
1979
1969
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
1980
1970
                    # Is it versioned or ignored?
1981
1971
                    if self.path2id(relpath) or self.is_ignored(relpath):
2016
2006
                            # ... but not ignored
2017
2007
                            has_changed_files = True
2018
2008
                            break
2019
 
                    elif (content_change and (kind[1] is not None) and
2020
 
                            osutils.is_inside_any(files, path[1])):
2021
 
                        # Versioned and changed, but not deleted, and still
2022
 
                        # in one of the dirs to be deleted.
 
2009
                    elif content_change and (kind[1] is not None):
 
2010
                        # Versioned and changed, but not deleted
2023
2011
                        has_changed_files = True
2024
2012
                        break
2025
2013
 
2078
2066
 
2079
2067
    @needs_tree_write_lock
2080
2068
    def revert(self, filenames=None, old_tree=None, backups=True,
2081
 
               pb=None, report_changes=False):
 
2069
               pb=DummyProgress(), report_changes=False):
2082
2070
        from bzrlib.conflicts import resolve
2083
2071
        if filenames == []:
2084
2072
            filenames = None
2206
2194
        """
2207
2195
        raise NotImplementedError(self.unlock)
2208
2196
 
2209
 
    _marker = object()
2210
 
 
2211
 
    def update(self, change_reporter=None, possible_transports=None,
2212
 
               revision=None, old_tip=_marker):
 
2197
    def update(self, change_reporter=None, possible_transports=None):
2213
2198
        """Update a working tree along its branch.
2214
2199
 
2215
2200
        This will update the branch if its bound too, which means we have
2233
2218
        - Merge current state -> basis tree of the master w.r.t. the old tree
2234
2219
          basis.
2235
2220
        - Do a 'normal' merge of the old branch basis if it is relevant.
2236
 
 
2237
 
        :param revision: The target revision to update to. Must be in the
2238
 
            revision history.
2239
 
        :param old_tip: If branch.update() has already been run, the value it
2240
 
            returned (old tip of the branch or None). _marker is used
2241
 
            otherwise.
2242
2221
        """
2243
2222
        if self.branch.get_bound_location() is not None:
2244
2223
            self.lock_write()
2245
 
            update_branch = (old_tip is self._marker)
 
2224
            update_branch = True
2246
2225
        else:
2247
2226
            self.lock_tree_write()
2248
2227
            update_branch = False
2250
2229
            if update_branch:
2251
2230
                old_tip = self.branch.update(possible_transports)
2252
2231
            else:
2253
 
                if old_tip is self._marker:
2254
 
                    old_tip = None
2255
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2232
                old_tip = None
 
2233
            return self._update_tree(old_tip, change_reporter)
2256
2234
        finally:
2257
2235
            self.unlock()
2258
2236
 
2259
2237
    @needs_tree_write_lock
2260
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2238
    def _update_tree(self, old_tip=None, change_reporter=None):
2261
2239
        """Update a tree to the master branch.
2262
2240
 
2263
2241
        :param old_tip: if supplied, the previous tip revision the branch,
2273
2251
        # We MUST save it even if an error occurs, because otherwise the users
2274
2252
        # local work is unreferenced and will appear to have been lost.
2275
2253
        #
2276
 
        nb_conflicts = 0
 
2254
        result = 0
2277
2255
        try:
2278
2256
            last_rev = self.get_parent_ids()[0]
2279
2257
        except IndexError:
2280
2258
            last_rev = _mod_revision.NULL_REVISION
2281
 
        if revision is None:
2282
 
            revision = self.branch.last_revision()
2283
 
 
2284
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2285
 
 
2286
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2287
 
            # the branch we are bound to was updated
2288
 
            # merge those changes in first
2289
 
            base_tree  = self.basis_tree()
2290
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2291
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2292
 
                                             base_tree, this_tree=self,
2293
 
                                             change_reporter=change_reporter)
2294
 
            if nb_conflicts:
2295
 
                self.add_parent_tree((old_tip, other_tree))
2296
 
                trace.note('Rerun update after fixing the conflicts.')
2297
 
                return nb_conflicts
2298
 
 
2299
 
        if last_rev != _mod_revision.ensure_null(revision):
2300
 
            # the working tree is up to date with the branch
2301
 
            # we can merge the specified revision from master
2302
 
            to_tree = self.branch.repository.revision_tree(revision)
2303
 
            to_root_id = to_tree.get_root_id()
2304
 
 
 
2259
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2260
            # merge tree state up to new branch tip.
2305
2261
            basis = self.basis_tree()
2306
2262
            basis.lock_read()
2307
2263
            try:
2308
 
                if (basis.inventory.root is None
2309
 
                    or basis.inventory.root.file_id != to_root_id):
2310
 
                    self.set_root_id(to_root_id)
 
2264
                to_tree = self.branch.basis_tree()
 
2265
                if basis.inventory.root is None:
 
2266
                    self.set_root_id(to_tree.get_root_id())
2311
2267
                    self.flush()
 
2268
                result += merge.merge_inner(
 
2269
                                      self.branch,
 
2270
                                      to_tree,
 
2271
                                      basis,
 
2272
                                      this_tree=self,
 
2273
                                      change_reporter=change_reporter)
2312
2274
            finally:
2313
2275
                basis.unlock()
2314
 
 
2315
 
            # determine the branch point
2316
 
            graph = self.branch.repository.get_graph()
2317
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2318
 
                                                last_rev)
2319
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2320
 
 
2321
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2322
 
                                             this_tree=self,
2323
 
                                             change_reporter=change_reporter)
2324
 
            self.set_last_revision(revision)
2325
2276
            # TODO - dedup parents list with things merged by pull ?
2326
2277
            # reuse the tree we've updated to to set the basis:
2327
 
            parent_trees = [(revision, to_tree)]
 
2278
            parent_trees = [(self.branch.last_revision(), to_tree)]
2328
2279
            merges = self.get_parent_ids()[1:]
2329
2280
            # Ideally we ask the tree for the trees here, that way the working
2330
2281
            # tree can decide whether to give us the entire tree or give us a
2334
2285
            for parent in merges:
2335
2286
                parent_trees.append(
2336
2287
                    (parent, self.branch.repository.revision_tree(parent)))
2337
 
            if not _mod_revision.is_null(old_tip):
 
2288
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2338
2289
                parent_trees.append(
2339
2290
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2340
2291
            self.set_parent_trees(parent_trees)
2341
2292
            last_rev = parent_trees[0][0]
2342
 
        return nb_conflicts
 
2293
        else:
 
2294
            # the working tree had the same last-revision as the master
 
2295
            # branch did. We may still have pivot local work from the local
 
2296
            # branch into old_tip:
 
2297
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2298
                self.add_parent_tree_id(old_tip)
 
2299
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2300
            and old_tip != last_rev):
 
2301
            # our last revision was not the prior branch last revision
 
2302
            # and we have converted that last revision to a pending merge.
 
2303
            # base is somewhere between the branch tip now
 
2304
            # and the now pending merge
 
2305
 
 
2306
            # Since we just modified the working tree and inventory, flush out
 
2307
            # the current state, before we modify it again.
 
2308
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2309
            #       requires it only because TreeTransform directly munges the
 
2310
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2311
            #       should be able to remove this extra flush.
 
2312
            self.flush()
 
2313
            graph = self.branch.repository.get_graph()
 
2314
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2315
                                                old_tip)
 
2316
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2317
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2318
            result += merge.merge_inner(
 
2319
                                  self.branch,
 
2320
                                  other_tree,
 
2321
                                  base_tree,
 
2322
                                  this_tree=self,
 
2323
                                  change_reporter=change_reporter)
 
2324
        return result
2343
2325
 
2344
2326
    def _write_hashcache_if_dirty(self):
2345
2327
        """Write out the hashcache if it is dirty."""
2656
2638
 
2657
2639
        In Format2 WorkingTrees we have a single lock for the branch and tree
2658
2640
        so lock_tree_write() degrades to lock_write().
2659
 
 
2660
 
        :return: An object with an unlock method which will release the lock
2661
 
            obtained.
2662
2641
        """
2663
2642
        self.branch.lock_write()
2664
2643
        try:
2665
 
            self._control_files.lock_write()
2666
 
            return self
 
2644
            return self._control_files.lock_write()
2667
2645
        except:
2668
2646
            self.branch.unlock()
2669
2647
            raise