/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: John Whitley
  • Date: 2010-01-05 19:29:07 UTC
  • mto: This revision was merged to the branch mainline in revision 4981.
  • Revision ID: whitley@bangpath.org-20100105192907-hy326yzkt7ywdao3
A trial implementation of '!!' syntax for double-negative ignore exclusions.
These act like regular ignores, but take precedence over the single '!' 
exclusions.

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
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:
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):
1735
1742
 
1736
1743
        Patterns containing '/' or '\' need to match the whole path;
1737
1744
        others match against only the last component.  Patterns starting
1738
 
        with '!' are ignore exceptions.  Exceptions take precedence
 
1745
        with '!' are ignore exclusions.  Exclusions take precedence
1739
1746
        over regular patterns and cause the filename to not be ignored.
1740
1747
 
1741
1748
        If the file is ignored, returns the pattern which caused it to
1742
1749
        be ignored, otherwise None.  So this can simply be used as a
1743
1750
        boolean if desired."""
1744
1751
        if getattr(self, '_ignoreglobster', None) is None:
1745
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1752
            self._ignoreglobster = globbing.ExcludingGlobster(self.get_ignore_list())
1746
1753
        return self._ignoreglobster.match(filename)
1747
1754
 
1748
1755
    def kind(self, file_id):
1896
1903
            # revision_id is set. We must check for this full string, because a
1897
1904
            # root node id can legitimately look like 'revision_id' but cannot
1898
1905
            # contain a '"'.
1899
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1906
            xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1907
            firstline = xml.split('\n', 1)[0]
1901
1908
            if (not 'revision_id="' in firstline or
1902
1909
                'format="7"' not in firstline):
2058
2065
 
2059
2066
    @needs_tree_write_lock
2060
2067
    def revert(self, filenames=None, old_tree=None, backups=True,
2061
 
               pb=None, report_changes=False):
 
2068
               pb=DummyProgress(), report_changes=False):
2062
2069
        from bzrlib.conflicts import resolve
2063
2070
        if filenames == []:
2064
2071
            filenames = None
2253
2260
        # We MUST save it even if an error occurs, because otherwise the users
2254
2261
        # local work is unreferenced and will appear to have been lost.
2255
2262
        #
2256
 
        nb_conflicts = 0
 
2263
        result = 0
2257
2264
        try:
2258
2265
            last_rev = self.get_parent_ids()[0]
2259
2266
        except IndexError:
2260
2267
            last_rev = _mod_revision.NULL_REVISION
2261
2268
        if revision is None:
2262
2269
            revision = self.branch.last_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
 
 
 
2270
        else:
 
2271
            if revision not in self.branch.revision_history():
 
2272
                raise errors.NoSuchRevision(self.branch, revision)
2279
2273
        if last_rev != _mod_revision.ensure_null(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
            # merge tree state up to specified revision.
2285
2275
            basis = self.basis_tree()
2286
2276
            basis.lock_read()
2287
2277
            try:
2288
 
                if (basis.inventory.root is None
2289
 
                    or basis.inventory.root.file_id != to_root_id):
2290
 
                    self.set_root_id(to_root_id)
 
2278
                to_tree = self.branch.repository.revision_tree(revision)
 
2279
                if basis.inventory.root is None:
 
2280
                    self.set_root_id(to_tree.get_root_id())
2291
2281
                    self.flush()
 
2282
                result += merge.merge_inner(
 
2283
                                      self.branch,
 
2284
                                      to_tree,
 
2285
                                      basis,
 
2286
                                      this_tree=self,
 
2287
                                      change_reporter=change_reporter)
 
2288
                self.set_last_revision(revision)
2292
2289
            finally:
2293
2290
                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)
2305
2291
            # TODO - dedup parents list with things merged by pull ?
2306
2292
            # reuse the tree we've updated to to set the basis:
2307
2293
            parent_trees = [(revision, to_tree)]
2314
2300
            for parent in merges:
2315
2301
                parent_trees.append(
2316
2302
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2303
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2304
                parent_trees.append(
2319
2305
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2306
            self.set_parent_trees(parent_trees)
2321
2307
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2308
        else:
 
2309
            # the working tree had the same last-revision as the master
 
2310
            # branch did. We may still have pivot local work from the local
 
2311
            # branch into old_tip:
 
2312
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2313
                self.add_parent_tree_id(old_tip)
 
2314
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2315
            and old_tip != last_rev):
 
2316
            # our last revision was not the prior branch last revision
 
2317
            # and we have converted that last revision to a pending merge.
 
2318
            # base is somewhere between the branch tip now
 
2319
            # and the now pending merge
 
2320
 
 
2321
            # Since we just modified the working tree and inventory, flush out
 
2322
            # the current state, before we modify it again.
 
2323
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2324
            #       requires it only because TreeTransform directly munges the
 
2325
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2326
            #       should be able to remove this extra flush.
 
2327
            self.flush()
 
2328
            graph = self.branch.repository.get_graph()
 
2329
            base_rev_id = graph.find_unique_lca(revision, old_tip)
 
2330
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2331
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2332
            result += merge.merge_inner(
 
2333
                                  self.branch,
 
2334
                                  other_tree,
 
2335
                                  base_tree,
 
2336
                                  this_tree=self,
 
2337
                                  change_reporter=change_reporter)
 
2338
        return result
2323
2339
 
2324
2340
    def _write_hashcache_if_dirty(self):
2325
2341
        """Write out the hashcache if it is dirty."""