/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: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

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)
38
32
 
39
33
from cStringIO import StringIO
40
34
import os
101
95
from bzrlib.filters import filtered_input_file
102
96
from bzrlib.trace import mutter, note
103
97
from bzrlib.transport.local import LocalTransport
104
 
from bzrlib.progress import DummyProgress, ProgressPhase
105
98
from bzrlib.revision import CURRENT_REVISION
106
99
from bzrlib.rio import RioReader, rio_file, Stanza
107
100
from bzrlib.symbol_versioning import (
111
104
 
112
105
 
113
106
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.
114
110
CONFLICT_HEADER_1 = "BZR conflict list format 1"
115
111
 
116
112
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
171
167
        return ''
172
168
 
173
169
 
174
 
class WorkingTree(bzrlib.mutabletree.MutableTree):
 
170
class WorkingTree(bzrlib.mutabletree.MutableTree,
 
171
    bzrdir.ControlComponent):
175
172
    """Working copy tree.
176
173
 
177
174
    The inventory is held in the `Branch` working-inventory, and the
250
247
        self._rules_searcher = None
251
248
        self.views = self._make_views()
252
249
 
 
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
 
253
258
    def _detect_case_handling(self):
254
259
        wt_trans = self.bzrdir.get_workingtree_transport(None)
255
260
        try:
909
914
            branch.last_revision().
910
915
        """
911
916
        from bzrlib.merge import Merger, Merge3Merger
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()
 
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()
949
947
        return conflicts
950
948
 
951
949
    @needs_read_lock
1098
1096
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1099
1097
        if tree_transport.base != branch_transport.base:
1100
1098
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1101
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
 
1099
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
 
1100
                target_branch=new_branch)
1102
1101
        else:
1103
1102
            tree_bzrdir = branch_bzrdir
1104
1103
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1141
        This does not include files that have been deleted in this
1143
1142
        tree. Skips the control directory.
1144
1143
 
1145
 
        :param include_root: if True, do not return an entry for the root
 
1144
        :param include_root: if True, return an entry for the root
1146
1145
        :param from_dir: start from this directory or None for the root
1147
1146
        :param recursive: whether to recurse into subdirectories or not
1148
1147
        """
1602
1601
    @needs_write_lock
1603
1602
    def pull(self, source, overwrite=False, stop_revision=None,
1604
1603
             change_reporter=None, possible_transports=None, local=False):
1605
 
        top_pb = ui.ui_factory.nested_progress_bar()
1606
1604
        source.lock_read()
1607
1605
        try:
1608
 
            pp = ProgressPhase("Pull phase", 2, top_pb)
1609
 
            pp.next_phase()
1610
1606
            old_revision_info = self.branch.last_revision_info()
1611
1607
            basis_tree = self.basis_tree()
1612
1608
            count = self.branch.pull(source, overwrite, stop_revision,
1614
1610
                                     local=local)
1615
1611
            new_revision_info = self.branch.last_revision_info()
1616
1612
            if new_revision_info != old_revision_info:
1617
 
                pp.next_phase()
1618
1613
                repository = self.branch.repository
1619
 
                pb = ui.ui_factory.nested_progress_bar()
1620
1614
                basis_tree.lock_read()
1621
1615
                try:
1622
1616
                    new_basis_tree = self.branch.basis_tree()
1625
1619
                                new_basis_tree,
1626
1620
                                basis_tree,
1627
1621
                                this_tree=self,
1628
 
                                pb=pb,
 
1622
                                pb=None,
1629
1623
                                change_reporter=change_reporter)
1630
1624
                    basis_root_id = basis_tree.get_root_id()
1631
1625
                    new_root_id = new_basis_tree.get_root_id()
1632
1626
                    if basis_root_id != new_root_id:
1633
1627
                        self.set_root_id(new_root_id)
1634
1628
                finally:
1635
 
                    pb.finished()
1636
1629
                    basis_tree.unlock()
1637
1630
                # TODO - dedup parents list with things merged by pull ?
1638
1631
                # reuse the revisiontree we merged against to set the new
1651
1644
            return count
1652
1645
        finally:
1653
1646
            source.unlock()
1654
 
            top_pb.finished()
1655
1647
 
1656
1648
    @needs_write_lock
1657
1649
    def put_file_bytes_non_atomic(self, file_id, bytes):
1742
1734
        r"""Check whether the filename matches an ignore pattern.
1743
1735
 
1744
1736
        Patterns containing '/' or '\' need to match the whole path;
1745
 
        others match against only the last component.
 
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.
1746
1740
 
1747
1741
        If the file is ignored, returns the pattern which caused it to
1748
1742
        be ignored, otherwise None.  So this can simply be used as a
1749
1743
        boolean if desired."""
1750
1744
        if getattr(self, '_ignoreglobster', None) is None:
1751
 
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
 
1745
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1752
1746
        return self._ignoreglobster.match(filename)
1753
1747
 
1754
1748
    def kind(self, file_id):
1902
1896
            # revision_id is set. We must check for this full string, because a
1903
1897
            # root node id can legitimately look like 'revision_id' but cannot
1904
1898
            # contain a '"'.
1905
 
            xml = self.branch.repository.get_inventory_xml(new_revision)
 
1899
            xml = self.branch.repository._get_inventory_xml(new_revision)
1906
1900
            firstline = xml.split('\n', 1)[0]
1907
1901
            if (not 'revision_id="' in firstline or
1908
1902
                'format="7"' not in firstline):
2064
2058
 
2065
2059
    @needs_tree_write_lock
2066
2060
    def revert(self, filenames=None, old_tree=None, backups=True,
2067
 
               pb=DummyProgress(), report_changes=False):
 
2061
               pb=None, report_changes=False):
2068
2062
        from bzrlib.conflicts import resolve
2069
2063
        if filenames == []:
2070
2064
            filenames = None
2259
2253
        # We MUST save it even if an error occurs, because otherwise the users
2260
2254
        # local work is unreferenced and will appear to have been lost.
2261
2255
        #
2262
 
        result = 0
 
2256
        nb_conflicts = 0
2263
2257
        try:
2264
2258
            last_rev = self.get_parent_ids()[0]
2265
2259
        except IndexError:
2266
2260
            last_rev = _mod_revision.NULL_REVISION
2267
2261
        if revision is None:
2268
2262
            revision = self.branch.last_revision()
2269
 
        else:
2270
 
            if revision not in self.branch.revision_history():
2271
 
                raise errors.NoSuchRevision(self.branch, revision)
 
2263
 
 
2264
        old_tip = old_tip or _mod_revision.NULL_REVISION
 
2265
 
 
2266
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
 
2267
            # the branch we are bound to was updated
 
2268
            # merge those changes in first
 
2269
            base_tree  = self.basis_tree()
 
2270
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2271
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
 
2272
                                             base_tree, this_tree=self,
 
2273
                                             change_reporter=change_reporter)
 
2274
            if nb_conflicts:
 
2275
                self.add_parent_tree((old_tip, other_tree))
 
2276
                trace.note('Rerun update after fixing the conflicts.')
 
2277
                return nb_conflicts
 
2278
 
2272
2279
        if last_rev != _mod_revision.ensure_null(revision):
2273
 
            # merge tree state up to specified revision.
 
2280
            # the working tree is up to date with the branch
 
2281
            # we can merge the specified revision from master
 
2282
            to_tree = self.branch.repository.revision_tree(revision)
 
2283
            to_root_id = to_tree.get_root_id()
 
2284
 
2274
2285
            basis = self.basis_tree()
2275
2286
            basis.lock_read()
2276
2287
            try:
2277
 
                to_tree = self.branch.repository.revision_tree(revision)
2278
 
                to_root_id = to_tree.get_root_id()
2279
2288
                if (basis.inventory.root is None
2280
2289
                    or basis.inventory.root.file_id != to_root_id):
2281
2290
                    self.set_root_id(to_root_id)
2282
2291
                    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)
2290
2292
            finally:
2291
2293
                basis.unlock()
 
2294
 
 
2295
            # determine the branch point
 
2296
            graph = self.branch.repository.get_graph()
 
2297
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2298
                                                last_rev)
 
2299
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2300
 
 
2301
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
 
2302
                                             this_tree=self,
 
2303
                                             change_reporter=change_reporter)
 
2304
            self.set_last_revision(revision)
2292
2305
            # TODO - dedup parents list with things merged by pull ?
2293
2306
            # reuse the tree we've updated to to set the basis:
2294
2307
            parent_trees = [(revision, to_tree)]
2301
2314
            for parent in merges:
2302
2315
                parent_trees.append(
2303
2316
                    (parent, self.branch.repository.revision_tree(parent)))
2304
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2317
            if not _mod_revision.is_null(old_tip):
2305
2318
                parent_trees.append(
2306
2319
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2307
2320
            self.set_parent_trees(parent_trees)
2308
2321
            last_rev = parent_trees[0][0]
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
 
2322
        return nb_conflicts
2340
2323
 
2341
2324
    def _write_hashcache_if_dirty(self):
2342
2325
        """Write out the hashcache if it is dirty."""