~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-11-27 23:21:36 UTC
  • mfrom: (4585.1.19 foreign-tests-4)
  • Revision ID: pqm@pqm.ubuntu.com-20091127232136-bkm3vrye2wt4odbw
(Jelmer) Add basic tests for foreign repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
95
101
from bzrlib.filters import filtered_input_file
96
102
from bzrlib.trace import mutter, note
97
103
from bzrlib.transport.local import LocalTransport
 
104
from bzrlib.progress import DummyProgress, ProgressPhase
98
105
from bzrlib.revision import CURRENT_REVISION
99
106
from bzrlib.rio import RioReader, rio_file, Stanza
100
107
from bzrlib.symbol_versioning import (
104
111
 
105
112
 
106
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
 
# TODO: Modifying the conflict objects or their type is currently nearly
108
 
# impossible as there is no clear relationship between the working tree format
109
 
# and the conflict list file format.
110
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
111
115
 
112
116
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
167
171
        return ''
168
172
 
169
173
 
170
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
171
 
    bzrdir.ControlComponent):
 
174
class WorkingTree(bzrlib.mutabletree.MutableTree):
172
175
    """Working copy tree.
173
176
 
174
177
    The inventory is held in the `Branch` working-inventory, and the
247
250
        self._rules_searcher = None
248
251
        self.views = self._make_views()
249
252
 
250
 
    @property
251
 
    def user_transport(self):
252
 
        return self.bzrdir.user_transport
253
 
 
254
 
    @property
255
 
    def control_transport(self):
256
 
        return self._transport
257
 
 
258
253
    def _detect_case_handling(self):
259
254
        wt_trans = self.bzrdir.get_workingtree_transport(None)
260
255
        try:
548
543
        else:
549
544
            parents = [last_rev]
550
545
        try:
551
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
546
            merges_file = self._transport.get('pending-merges')
552
547
        except errors.NoSuchFile:
553
548
            pass
554
549
        else:
555
 
            for l in osutils.split_lines(merges_bytes):
 
550
            for l in merges_file.readlines():
556
551
                revision_id = l.rstrip('\n')
557
552
                parents.append(revision_id)
558
553
        return parents
914
909
            branch.last_revision().
915
910
        """
916
911
        from bzrlib.merge import Merger, Merge3Merger
917
 
        merger = Merger(self.branch, this_tree=self)
918
 
        # check that there are no local alterations
919
 
        if not force and self.has_changes():
920
 
            raise errors.UncommittedChanges(self)
921
 
        if to_revision is None:
922
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
923
 
        merger.other_rev_id = to_revision
924
 
        if _mod_revision.is_null(merger.other_rev_id):
925
 
            raise errors.NoCommits(branch)
926
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
 
        merger.other_basis = merger.other_rev_id
928
 
        merger.other_tree = self.branch.repository.revision_tree(
929
 
            merger.other_rev_id)
930
 
        merger.other_branch = branch
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()
 
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()
947
949
        return conflicts
948
950
 
949
951
    @needs_read_lock
1096
1098
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1099
        if tree_transport.base != branch_transport.base:
1098
1100
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
 
                target_branch=new_branch)
 
1101
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1101
1102
        else:
1102
1103
            tree_bzrdir = branch_bzrdir
1103
1104
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1142
        This does not include files that have been deleted in this
1142
1143
        tree. Skips the control directory.
1143
1144
 
1144
 
        :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
1145
1146
        :param from_dir: start from this directory or None for the root
1146
1147
        :param recursive: whether to recurse into subdirectories or not
1147
1148
        """
1601
1602
    @needs_write_lock
1602
1603
    def pull(self, source, overwrite=False, stop_revision=None,
1603
1604
             change_reporter=None, possible_transports=None, local=False):
 
1605
        top_pb = ui.ui_factory.nested_progress_bar()
1604
1606
        source.lock_read()
1605
1607
        try:
 
1608
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1609
            pp.next_phase()
1606
1610
            old_revision_info = self.branch.last_revision_info()
1607
1611
            basis_tree = self.basis_tree()
1608
1612
            count = self.branch.pull(source, overwrite, stop_revision,
1610
1614
                                     local=local)
1611
1615
            new_revision_info = self.branch.last_revision_info()
1612
1616
            if new_revision_info != old_revision_info:
 
1617
                pp.next_phase()
1613
1618
                repository = self.branch.repository
 
1619
                pb = ui.ui_factory.nested_progress_bar()
1614
1620
                basis_tree.lock_read()
1615
1621
                try:
1616
1622
                    new_basis_tree = self.branch.basis_tree()
1619
1625
                                new_basis_tree,
1620
1626
                                basis_tree,
1621
1627
                                this_tree=self,
1622
 
                                pb=None,
 
1628
                                pb=pb,
1623
1629
                                change_reporter=change_reporter)
1624
 
                    basis_root_id = basis_tree.get_root_id()
1625
 
                    new_root_id = new_basis_tree.get_root_id()
1626
 
                    if basis_root_id != new_root_id:
1627
 
                        self.set_root_id(new_root_id)
 
1630
                    if (basis_tree.inventory.root is None and
 
1631
                        new_basis_tree.inventory.root is not None):
 
1632
                        self.set_root_id(new_basis_tree.get_root_id())
1628
1633
                finally:
 
1634
                    pb.finished()
1629
1635
                    basis_tree.unlock()
1630
1636
                # TODO - dedup parents list with things merged by pull ?
1631
1637
                # reuse the revisiontree we merged against to set the new
1644
1650
            return count
1645
1651
        finally:
1646
1652
            source.unlock()
 
1653
            top_pb.finished()
1647
1654
 
1648
1655
    @needs_write_lock
1649
1656
    def put_file_bytes_non_atomic(self, file_id, bytes):
1734
1741
        r"""Check whether the filename matches an ignore pattern.
1735
1742
 
1736
1743
        Patterns containing '/' or '\' need to match the whole path;
1737
 
        others match against only the last component.  Patterns starting
1738
 
        with '!' are ignore exceptions.  Exceptions take precedence
1739
 
        over regular patterns and cause the filename to not be ignored.
 
1744
        others match against only the last component.
1740
1745
 
1741
1746
        If the file is ignored, returns the pattern which caused it to
1742
1747
        be ignored, otherwise None.  So this can simply be used as a
1743
1748
        boolean if desired."""
1744
1749
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1750
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1751
        return self._ignoreglobster.match(filename)
1747
1752
 
1748
1753
    def kind(self, file_id):
1798
1803
            raise errors.ObjectNotLocked(self)
1799
1804
 
1800
1805
    def lock_read(self):
1801
 
        """Lock the tree for reading.
1802
 
 
1803
 
        This also locks the branch, and can be unlocked via self.unlock().
1804
 
 
1805
 
        :return: An object with an unlock method which will release the lock
1806
 
            obtained.
1807
 
        """
 
1806
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1807
        if not self.is_locked():
1809
1808
            self._reset_data()
1810
1809
        self.branch.lock_read()
1811
1810
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return self
 
1811
            return self._control_files.lock_read()
1814
1812
        except:
1815
1813
            self.branch.unlock()
1816
1814
            raise
1817
1815
 
1818
1816
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: An object with an unlock method which will release the lock
1822
 
            obtained.
1823
 
        """
 
1817
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1824
1818
        if not self.is_locked():
1825
1819
            self._reset_data()
1826
1820
        self.branch.lock_read()
1827
1821
        try:
1828
 
            self._control_files.lock_write()
1829
 
            return self
 
1822
            return self._control_files.lock_write()
1830
1823
        except:
1831
1824
            self.branch.unlock()
1832
1825
            raise
1833
1826
 
1834
1827
    def lock_write(self):
1835
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1836
 
 
1837
 
        :return: An object with an unlock method which will release the lock
1838
 
            obtained.
1839
 
        """
 
1828
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1840
1829
        if not self.is_locked():
1841
1830
            self._reset_data()
1842
1831
        self.branch.lock_write()
1843
1832
        try:
1844
 
            self._control_files.lock_write()
1845
 
            return self
 
1833
            return self._control_files.lock_write()
1846
1834
        except:
1847
1835
            self.branch.unlock()
1848
1836
            raise
1856
1844
    def _reset_data(self):
1857
1845
        """Reset transient data that cannot be revalidated."""
1858
1846
        self._inventory_is_modified = False
1859
 
        f = self._transport.get('inventory')
1860
 
        try:
1861
 
            result = self._deserialize(f)
1862
 
        finally:
1863
 
            f.close()
 
1847
        result = self._deserialize(self._transport.get('inventory'))
1864
1848
        self._set_inventory(result, dirty=False)
1865
1849
 
1866
1850
    @needs_tree_write_lock
1913
1897
            # revision_id is set. We must check for this full string, because a
1914
1898
            # root node id can legitimately look like 'revision_id' but cannot
1915
1899
            # contain a '"'.
1916
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1900
            xml = self.branch.repository.get_inventory_xml(new_revision)
1917
1901
            firstline = xml.split('\n', 1)[0]
1918
1902
            if (not 'revision_id="' in firstline or
1919
1903
                'format="7"' not in firstline):
1942
1926
        # binary.
1943
1927
        if self._inventory_is_modified:
1944
1928
            raise errors.InventoryModified(self)
1945
 
        f = self._transport.get('inventory')
1946
 
        try:
1947
 
            result = self._deserialize(f)
1948
 
        finally:
1949
 
            f.close()
 
1929
        result = self._deserialize(self._transport.get('inventory'))
1950
1930
        self._set_inventory(result, dirty=False)
1951
1931
        return result
1952
1932
 
2075
2055
 
2076
2056
    @needs_tree_write_lock
2077
2057
    def revert(self, filenames=None, old_tree=None, backups=True,
2078
 
               pb=None, report_changes=False):
 
2058
               pb=DummyProgress(), report_changes=False):
2079
2059
        from bzrlib.conflicts import resolve
2080
2060
        if filenames == []:
2081
2061
            filenames = None
2203
2183
        """
2204
2184
        raise NotImplementedError(self.unlock)
2205
2185
 
2206
 
    _marker = object()
2207
 
 
2208
 
    def update(self, change_reporter=None, possible_transports=None,
2209
 
               revision=None, old_tip=_marker):
 
2186
    def update(self, change_reporter=None, possible_transports=None):
2210
2187
        """Update a working tree along its branch.
2211
2188
 
2212
2189
        This will update the branch if its bound too, which means we have
2230
2207
        - Merge current state -> basis tree of the master w.r.t. the old tree
2231
2208
          basis.
2232
2209
        - Do a 'normal' merge of the old branch basis if it is relevant.
2233
 
 
2234
 
        :param revision: The target revision to update to. Must be in the
2235
 
            revision history.
2236
 
        :param old_tip: If branch.update() has already been run, the value it
2237
 
            returned (old tip of the branch or None). _marker is used
2238
 
            otherwise.
2239
2210
        """
2240
2211
        if self.branch.get_bound_location() is not None:
2241
2212
            self.lock_write()
2242
 
            update_branch = (old_tip is self._marker)
 
2213
            update_branch = True
2243
2214
        else:
2244
2215
            self.lock_tree_write()
2245
2216
            update_branch = False
2247
2218
            if update_branch:
2248
2219
                old_tip = self.branch.update(possible_transports)
2249
2220
            else:
2250
 
                if old_tip is self._marker:
2251
 
                    old_tip = None
2252
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2221
                old_tip = None
 
2222
            return self._update_tree(old_tip, change_reporter)
2253
2223
        finally:
2254
2224
            self.unlock()
2255
2225
 
2256
2226
    @needs_tree_write_lock
2257
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2227
    def _update_tree(self, old_tip=None, change_reporter=None):
2258
2228
        """Update a tree to the master branch.
2259
2229
 
2260
2230
        :param old_tip: if supplied, the previous tip revision the branch,
2270
2240
        # We MUST save it even if an error occurs, because otherwise the users
2271
2241
        # local work is unreferenced and will appear to have been lost.
2272
2242
        #
2273
 
        nb_conflicts = 0
 
2243
        result = 0
2274
2244
        try:
2275
2245
            last_rev = self.get_parent_ids()[0]
2276
2246
        except IndexError:
2277
2247
            last_rev = _mod_revision.NULL_REVISION
2278
 
        if revision is None:
2279
 
            revision = self.branch.last_revision()
2280
 
 
2281
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2282
 
 
2283
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2284
 
            # the branch we are bound to was updated
2285
 
            # merge those changes in first
2286
 
            base_tree  = self.basis_tree()
2287
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2288
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2289
 
                                             base_tree, this_tree=self,
2290
 
                                             change_reporter=change_reporter)
2291
 
            if nb_conflicts:
2292
 
                self.add_parent_tree((old_tip, other_tree))
2293
 
                trace.note('Rerun update after fixing the conflicts.')
2294
 
                return nb_conflicts
2295
 
 
2296
 
        if last_rev != _mod_revision.ensure_null(revision):
2297
 
            # the working tree is up to date with the branch
2298
 
            # we can merge the specified revision from master
2299
 
            to_tree = self.branch.repository.revision_tree(revision)
2300
 
            to_root_id = to_tree.get_root_id()
2301
 
 
 
2248
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2249
            # merge tree state up to new branch tip.
2302
2250
            basis = self.basis_tree()
2303
2251
            basis.lock_read()
2304
2252
            try:
2305
 
                if (basis.inventory.root is None
2306
 
                    or basis.inventory.root.file_id != to_root_id):
2307
 
                    self.set_root_id(to_root_id)
 
2253
                to_tree = self.branch.basis_tree()
 
2254
                if basis.inventory.root is None:
 
2255
                    self.set_root_id(to_tree.get_root_id())
2308
2256
                    self.flush()
 
2257
                result += merge.merge_inner(
 
2258
                                      self.branch,
 
2259
                                      to_tree,
 
2260
                                      basis,
 
2261
                                      this_tree=self,
 
2262
                                      change_reporter=change_reporter)
2309
2263
            finally:
2310
2264
                basis.unlock()
2311
 
 
2312
 
            # determine the branch point
2313
 
            graph = self.branch.repository.get_graph()
2314
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2315
 
                                                last_rev)
2316
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
 
 
2318
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2319
 
                                             this_tree=self,
2320
 
                                             change_reporter=change_reporter)
2321
 
            self.set_last_revision(revision)
2322
2265
            # TODO - dedup parents list with things merged by pull ?
2323
2266
            # reuse the tree we've updated to to set the basis:
2324
 
            parent_trees = [(revision, to_tree)]
 
2267
            parent_trees = [(self.branch.last_revision(), to_tree)]
2325
2268
            merges = self.get_parent_ids()[1:]
2326
2269
            # Ideally we ask the tree for the trees here, that way the working
2327
2270
            # tree can decide whether to give us the entire tree or give us a
2331
2274
            for parent in merges:
2332
2275
                parent_trees.append(
2333
2276
                    (parent, self.branch.repository.revision_tree(parent)))
2334
 
            if not _mod_revision.is_null(old_tip):
 
2277
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2335
2278
                parent_trees.append(
2336
2279
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2337
2280
            self.set_parent_trees(parent_trees)
2338
2281
            last_rev = parent_trees[0][0]
2339
 
        return nb_conflicts
 
2282
        else:
 
2283
            # the working tree had the same last-revision as the master
 
2284
            # branch did. We may still have pivot local work from the local
 
2285
            # branch into old_tip:
 
2286
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2287
                self.add_parent_tree_id(old_tip)
 
2288
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2289
            and old_tip != last_rev):
 
2290
            # our last revision was not the prior branch last revision
 
2291
            # and we have converted that last revision to a pending merge.
 
2292
            # base is somewhere between the branch tip now
 
2293
            # and the now pending merge
 
2294
 
 
2295
            # Since we just modified the working tree and inventory, flush out
 
2296
            # the current state, before we modify it again.
 
2297
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2298
            #       requires it only because TreeTransform directly munges the
 
2299
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2300
            #       should be able to remove this extra flush.
 
2301
            self.flush()
 
2302
            graph = self.branch.repository.get_graph()
 
2303
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2304
                                                old_tip)
 
2305
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2306
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2307
            result += merge.merge_inner(
 
2308
                                  self.branch,
 
2309
                                  other_tree,
 
2310
                                  base_tree,
 
2311
                                  this_tree=self,
 
2312
                                  change_reporter=change_reporter)
 
2313
        return result
2340
2314
 
2341
2315
    def _write_hashcache_if_dirty(self):
2342
2316
        """Write out the hashcache if it is dirty."""
2653
2627
 
2654
2628
        In Format2 WorkingTrees we have a single lock for the branch and tree
2655
2629
        so lock_tree_write() degrades to lock_write().
2656
 
 
2657
 
        :return: An object with an unlock method which will release the lock
2658
 
            obtained.
2659
2630
        """
2660
2631
        self.branch.lock_write()
2661
2632
        try:
2662
 
            self._control_files.lock_write()
2663
 
            return self
 
2633
            return self._control_files.lock_write()
2664
2634
        except:
2665
2635
            self.branch.unlock()
2666
2636
            raise
2800
2770
        """Return the format for the working tree object in a_bzrdir."""
2801
2771
        try:
2802
2772
            transport = a_bzrdir.get_workingtree_transport(None)
2803
 
            format_string = transport.get_bytes("format")
 
2773
            format_string = transport.get("format").read()
2804
2774
            return klass._formats[format_string]
2805
2775
        except errors.NoSuchFile:
2806
2776
            raise errors.NoWorkingTree(base=transport.base)