/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2010-01-15 06:55:33 UTC
  • mto: This revision was merged to the branch mainline in revision 4974.
  • Revision ID: mbp@sourcefrog.net-20100115065533-0goq0a2ap9v1356r
Add SmartClient repr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
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 (
105
111
 
106
112
 
107
113
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
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
115
 
113
116
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
171
        return ''
169
172
 
170
173
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
174
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
175
    """Working copy tree.
174
176
 
175
177
    The inventory is held in the `Branch` working-inventory, and the
248
250
        self._rules_searcher = None
249
251
        self.views = self._make_views()
250
252
 
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
253
    def _detect_case_handling(self):
260
254
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
255
        try:
915
909
            branch.last_revision().
916
910
        """
917
911
        from bzrlib.merge import Merger, Merge3Merger
918
 
        merger = Merger(self.branch, this_tree=self)
919
 
        # check that there are no local alterations
920
 
        if not force and self.has_changes():
921
 
            raise errors.UncommittedChanges(self)
922
 
        if to_revision is None:
923
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
924
 
        merger.other_rev_id = to_revision
925
 
        if _mod_revision.is_null(merger.other_rev_id):
926
 
            raise errors.NoCommits(branch)
927
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
928
 
        merger.other_basis = merger.other_rev_id
929
 
        merger.other_tree = self.branch.repository.revision_tree(
930
 
            merger.other_rev_id)
931
 
        merger.other_branch = branch
932
 
        if from_revision is None:
933
 
            merger.find_base()
934
 
        else:
935
 
            merger.set_base_revision(from_revision, branch)
936
 
        if merger.base_rev_id == merger.other_rev_id:
937
 
            raise errors.PointlessMerge
938
 
        merger.backup_files = False
939
 
        if merge_type is None:
940
 
            merger.merge_type = Merge3Merger
941
 
        else:
942
 
            merger.merge_type = merge_type
943
 
        merger.set_interesting_files(None)
944
 
        merger.show_base = False
945
 
        merger.reprocess = False
946
 
        conflicts = merger.do_merge()
947
 
        merger.set_pending()
 
912
        pb = ui.ui_factory.nested_progress_bar()
 
913
        try:
 
914
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
915
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
916
            merger.pp.next_phase()
 
917
            # check that there are no local alterations
 
918
            if not force and self.has_changes():
 
919
                raise errors.UncommittedChanges(self)
 
920
            if to_revision is None:
 
921
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
922
            merger.other_rev_id = to_revision
 
923
            if _mod_revision.is_null(merger.other_rev_id):
 
924
                raise errors.NoCommits(branch)
 
925
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
926
            merger.other_basis = merger.other_rev_id
 
927
            merger.other_tree = self.branch.repository.revision_tree(
 
928
                merger.other_rev_id)
 
929
            merger.other_branch = branch
 
930
            merger.pp.next_phase()
 
931
            if from_revision is None:
 
932
                merger.find_base()
 
933
            else:
 
934
                merger.set_base_revision(from_revision, branch)
 
935
            if merger.base_rev_id == merger.other_rev_id:
 
936
                raise errors.PointlessMerge
 
937
            merger.backup_files = False
 
938
            if merge_type is None:
 
939
                merger.merge_type = Merge3Merger
 
940
            else:
 
941
                merger.merge_type = merge_type
 
942
            merger.set_interesting_files(None)
 
943
            merger.show_base = False
 
944
            merger.reprocess = False
 
945
            conflicts = merger.do_merge()
 
946
            merger.set_pending()
 
947
        finally:
 
948
            pb.finished()
948
949
        return conflicts
949
950
 
950
951
    @needs_read_lock
1097
1098
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1099
        if tree_transport.base != branch_transport.base:
1099
1100
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1101
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1102
        else:
1103
1103
            tree_bzrdir = branch_bzrdir
1104
1104
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1142
        This does not include files that have been deleted in this
1143
1143
        tree. Skips the control directory.
1144
1144
 
1145
 
        :param include_root: if True, return an entry for the root
 
1145
        :param include_root: if True, do not return an entry for the root
1146
1146
        :param from_dir: start from this directory or None for the root
1147
1147
        :param recursive: whether to recurse into subdirectories or not
1148
1148
        """
1602
1602
    @needs_write_lock
1603
1603
    def pull(self, source, overwrite=False, stop_revision=None,
1604
1604
             change_reporter=None, possible_transports=None, local=False):
 
1605
        top_pb = ui.ui_factory.nested_progress_bar()
1605
1606
        source.lock_read()
1606
1607
        try:
 
1608
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1609
            pp.next_phase()
1607
1610
            old_revision_info = self.branch.last_revision_info()
1608
1611
            basis_tree = self.basis_tree()
1609
1612
            count = self.branch.pull(source, overwrite, stop_revision,
1611
1614
                                     local=local)
1612
1615
            new_revision_info = self.branch.last_revision_info()
1613
1616
            if new_revision_info != old_revision_info:
 
1617
                pp.next_phase()
1614
1618
                repository = self.branch.repository
 
1619
                pb = ui.ui_factory.nested_progress_bar()
1615
1620
                basis_tree.lock_read()
1616
1621
                try:
1617
1622
                    new_basis_tree = self.branch.basis_tree()
1620
1625
                                new_basis_tree,
1621
1626
                                basis_tree,
1622
1627
                                this_tree=self,
1623
 
                                pb=None,
 
1628
                                pb=pb,
1624
1629
                                change_reporter=change_reporter)
1625
1630
                    basis_root_id = basis_tree.get_root_id()
1626
1631
                    new_root_id = new_basis_tree.get_root_id()
1627
1632
                    if basis_root_id != new_root_id:
1628
1633
                        self.set_root_id(new_root_id)
1629
1634
                finally:
 
1635
                    pb.finished()
1630
1636
                    basis_tree.unlock()
1631
1637
                # TODO - dedup parents list with things merged by pull ?
1632
1638
                # reuse the revisiontree we merged against to set the new
1645
1651
            return count
1646
1652
        finally:
1647
1653
            source.unlock()
 
1654
            top_pb.finished()
1648
1655
 
1649
1656
    @needs_write_lock
1650
1657
    def put_file_bytes_non_atomic(self, file_id, bytes):
1735
1742
        r"""Check whether the filename matches an ignore pattern.
1736
1743
 
1737
1744
        Patterns containing '/' or '\' need to match the whole path;
1738
 
        others match against only the last component.  Patterns starting
1739
 
        with '!' are ignore exceptions.  Exceptions take precedence
1740
 
        over regular patterns and cause the filename to not be ignored.
 
1745
        others match against only the last component.
1741
1746
 
1742
1747
        If the file is ignored, returns the pattern which caused it to
1743
1748
        be ignored, otherwise None.  So this can simply be used as a
1744
1749
        boolean if desired."""
1745
1750
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1751
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1752
        return self._ignoreglobster.match(filename)
1748
1753
 
1749
1754
    def kind(self, file_id):
1799
1804
            raise errors.ObjectNotLocked(self)
1800
1805
 
1801
1806
    def lock_read(self):
1802
 
        """Lock the tree for reading.
1803
 
 
1804
 
        This also locks the branch, and can be unlocked via self.unlock().
1805
 
 
1806
 
        :return: A bzrlib.lock.LogicalLockResult.
1807
 
        """
 
1807
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1808
        if not self.is_locked():
1809
1809
            self._reset_data()
1810
1810
        self.branch.lock_read()
1811
1811
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1812
            return self._control_files.lock_read()
1814
1813
        except:
1815
1814
            self.branch.unlock()
1816
1815
            raise
1817
1816
 
1818
1817
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1818
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1819
        if not self.is_locked():
1824
1820
            self._reset_data()
1825
1821
        self.branch.lock_read()
1826
1822
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1823
            return self._control_files.lock_write()
1829
1824
        except:
1830
1825
            self.branch.unlock()
1831
1826
            raise
1832
1827
 
1833
1828
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1829
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1830
        if not self.is_locked():
1839
1831
            self._reset_data()
1840
1832
        self.branch.lock_write()
1841
1833
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1834
            return self._control_files.lock_write()
1844
1835
        except:
1845
1836
            self.branch.unlock()
1846
1837
            raise
1911
1902
            # revision_id is set. We must check for this full string, because a
1912
1903
            # root node id can legitimately look like 'revision_id' but cannot
1913
1904
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1905
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1906
            firstline = xml.split('\n', 1)[0]
1916
1907
            if (not 'revision_id="' in firstline or
1917
1908
                'format="7"' not in firstline):
2073
2064
 
2074
2065
    @needs_tree_write_lock
2075
2066
    def revert(self, filenames=None, old_tree=None, backups=True,
2076
 
               pb=None, report_changes=False):
 
2067
               pb=DummyProgress(), report_changes=False):
2077
2068
        from bzrlib.conflicts import resolve
2078
2069
        if filenames == []:
2079
2070
            filenames = None
2268
2259
        # We MUST save it even if an error occurs, because otherwise the users
2269
2260
        # local work is unreferenced and will appear to have been lost.
2270
2261
        #
2271
 
        nb_conflicts = 0
 
2262
        result = 0
2272
2263
        try:
2273
2264
            last_rev = self.get_parent_ids()[0]
2274
2265
        except IndexError:
2275
2266
            last_rev = _mod_revision.NULL_REVISION
2276
2267
        if revision is None:
2277
2268
            revision = self.branch.last_revision()
2278
 
 
2279
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2280
 
 
2281
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2282
 
            # the branch we are bound to was updated
2283
 
            # merge those changes in first
2284
 
            base_tree  = self.basis_tree()
2285
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2286
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2287
 
                                             base_tree, this_tree=self,
2288
 
                                             change_reporter=change_reporter)
2289
 
            if nb_conflicts:
2290
 
                self.add_parent_tree((old_tip, other_tree))
2291
 
                trace.note('Rerun update after fixing the conflicts.')
2292
 
                return nb_conflicts
2293
 
 
 
2269
        else:
 
2270
            if revision not in self.branch.revision_history():
 
2271
                raise errors.NoSuchRevision(self.branch, revision)
2294
2272
        if last_rev != _mod_revision.ensure_null(revision):
2295
 
            # the working tree is up to date with the branch
2296
 
            # we can merge the specified revision from master
2297
 
            to_tree = self.branch.repository.revision_tree(revision)
2298
 
            to_root_id = to_tree.get_root_id()
2299
 
 
 
2273
            # merge tree state up to specified revision.
2300
2274
            basis = self.basis_tree()
2301
2275
            basis.lock_read()
2302
2276
            try:
 
2277
                to_tree = self.branch.repository.revision_tree(revision)
 
2278
                to_root_id = to_tree.get_root_id()
2303
2279
                if (basis.inventory.root is None
2304
2280
                    or basis.inventory.root.file_id != to_root_id):
2305
2281
                    self.set_root_id(to_root_id)
2306
2282
                    self.flush()
 
2283
                result += merge.merge_inner(
 
2284
                                      self.branch,
 
2285
                                      to_tree,
 
2286
                                      basis,
 
2287
                                      this_tree=self,
 
2288
                                      change_reporter=change_reporter)
 
2289
                self.set_last_revision(revision)
2307
2290
            finally:
2308
2291
                basis.unlock()
2309
 
 
2310
 
            # determine the branch point
2311
 
            graph = self.branch.repository.get_graph()
2312
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2313
 
                                                last_rev)
2314
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2315
 
 
2316
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2317
 
                                             this_tree=self,
2318
 
                                             change_reporter=change_reporter)
2319
 
            self.set_last_revision(revision)
2320
2292
            # TODO - dedup parents list with things merged by pull ?
2321
2293
            # reuse the tree we've updated to to set the basis:
2322
2294
            parent_trees = [(revision, to_tree)]
2329
2301
            for parent in merges:
2330
2302
                parent_trees.append(
2331
2303
                    (parent, self.branch.repository.revision_tree(parent)))
2332
 
            if not _mod_revision.is_null(old_tip):
 
2304
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2333
2305
                parent_trees.append(
2334
2306
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2335
2307
            self.set_parent_trees(parent_trees)
2336
2308
            last_rev = parent_trees[0][0]
2337
 
        return nb_conflicts
 
2309
        else:
 
2310
            # the working tree had the same last-revision as the master
 
2311
            # branch did. We may still have pivot local work from the local
 
2312
            # branch into old_tip:
 
2313
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2314
                self.add_parent_tree_id(old_tip)
 
2315
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2316
            and old_tip != last_rev):
 
2317
            # our last revision was not the prior branch last revision
 
2318
            # and we have converted that last revision to a pending merge.
 
2319
            # base is somewhere between the branch tip now
 
2320
            # and the now pending merge
 
2321
 
 
2322
            # Since we just modified the working tree and inventory, flush out
 
2323
            # the current state, before we modify it again.
 
2324
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2325
            #       requires it only because TreeTransform directly munges the
 
2326
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2327
            #       should be able to remove this extra flush.
 
2328
            self.flush()
 
2329
            graph = self.branch.repository.get_graph()
 
2330
            base_rev_id = graph.find_unique_lca(revision, old_tip)
 
2331
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2332
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2333
            result += merge.merge_inner(
 
2334
                                  self.branch,
 
2335
                                  other_tree,
 
2336
                                  base_tree,
 
2337
                                  this_tree=self,
 
2338
                                  change_reporter=change_reporter)
 
2339
        return result
2338
2340
 
2339
2341
    def _write_hashcache_if_dirty(self):
2340
2342
        """Write out the hashcache if it is dirty."""
2651
2653
 
2652
2654
        In Format2 WorkingTrees we have a single lock for the branch and tree
2653
2655
        so lock_tree_write() degrades to lock_write().
2654
 
 
2655
 
        :return: An object with an unlock method which will release the lock
2656
 
            obtained.
2657
2656
        """
2658
2657
        self.branch.lock_write()
2659
2658
        try:
2660
 
            self._control_files.lock_write()
2661
 
            return self
 
2659
            return self._control_files.lock_write()
2662
2660
        except:
2663
2661
            self.branch.unlock()
2664
2662
            raise