← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Ian Clatworthy
  • Date: 2009-09-09 00:49:50 UTC
  • mto: (4634.37.2 prepare-2.0)
  • mto: This revision was merged to the branch mainline in revision 4689.
  • Revision ID: ian.clatworthy@canonical.com-20090909004950-43z4zdicb5u91iet
tweak quick reference naming to make it consistent with other PDFs

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
65
65
    merge,
66
66
    revision as _mod_revision,
67
67
    revisiontree,
 
68
    textui,
68
69
    trace,
69
70
    transform,
70
71
    ui,
101
102
from bzrlib.filters import filtered_input_file
102
103
from bzrlib.trace import mutter, note
103
104
from bzrlib.transport.local import LocalTransport
104
 
from bzrlib.progress import ProgressPhase
 
105
from bzrlib.progress import DummyProgress, ProgressPhase
105
106
from bzrlib.revision import CURRENT_REVISION
106
107
from bzrlib.rio import RioReader, rio_file, Stanza
107
108
from bzrlib.symbol_versioning import (
111
112
 
112
113
 
113
114
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
114
 
# TODO: Modifying the conflict objects or their type is currently nearly
115
 
# impossible as there is no clear relationship between the working tree format
116
 
# and the conflict list file format.
117
115
CONFLICT_HEADER_1 = "BZR conflict list format 1"
118
116
 
119
117
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
546
544
        else:
547
545
            parents = [last_rev]
548
546
        try:
549
 
            merges_bytes = self._transport.get_bytes('pending-merges')
 
547
            merges_file = self._transport.get('pending-merges')
550
548
        except errors.NoSuchFile:
551
549
            pass
552
550
        else:
553
 
            for l in osutils.split_lines(merges_bytes):
 
551
            for l in merges_file.readlines():
554
552
                revision_id = l.rstrip('\n')
555
553
                parents.append(revision_id)
556
554
        return parents
638
636
 
639
637
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
640
638
        file_id = self.path2id(path)
641
 
        if file_id is None:
642
 
            # For unversioned files on win32, we just assume they are not
643
 
            # executable
644
 
            return False
645
639
        return self._inventory[file_id].executable
646
640
 
647
641
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
902
896
 
903
897
    @needs_write_lock # because merge pulls data into the branch.
904
898
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
905
 
                          merge_type=None, force=False):
 
899
        merge_type=None):
906
900
        """Merge from a branch into this working tree.
907
901
 
908
902
        :param branch: The branch to merge from.
912
906
            branch.last_revision().
913
907
        """
914
908
        from bzrlib.merge import Merger, Merge3Merger
915
 
        merger = Merger(self.branch, this_tree=self)
916
 
        # check that there are no local alterations
917
 
        if not force and self.has_changes():
918
 
            raise errors.UncommittedChanges(self)
919
 
        if to_revision is None:
920
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
921
 
        merger.other_rev_id = to_revision
922
 
        if _mod_revision.is_null(merger.other_rev_id):
923
 
            raise errors.NoCommits(branch)
924
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
925
 
        merger.other_basis = merger.other_rev_id
926
 
        merger.other_tree = self.branch.repository.revision_tree(
927
 
            merger.other_rev_id)
928
 
        merger.other_branch = branch
929
 
        if from_revision is None:
930
 
            merger.find_base()
931
 
        else:
932
 
            merger.set_base_revision(from_revision, branch)
933
 
        if merger.base_rev_id == merger.other_rev_id:
934
 
            raise errors.PointlessMerge
935
 
        merger.backup_files = False
936
 
        if merge_type is None:
937
 
            merger.merge_type = Merge3Merger
938
 
        else:
939
 
            merger.merge_type = merge_type
940
 
        merger.set_interesting_files(None)
941
 
        merger.show_base = False
942
 
        merger.reprocess = False
943
 
        conflicts = merger.do_merge()
944
 
        merger.set_pending()
 
909
        pb = ui.ui_factory.nested_progress_bar()
 
910
        try:
 
911
            merger = Merger(self.branch, this_tree=self, pb=pb)
 
912
            merger.pp = ProgressPhase("Merge phase", 5, pb)
 
913
            merger.pp.next_phase()
 
914
            # check that there are no
 
915
            # local alterations
 
916
            merger.check_basis(check_clean=True, require_commits=False)
 
917
            if to_revision is None:
 
918
                to_revision = _mod_revision.ensure_null(branch.last_revision())
 
919
            merger.other_rev_id = to_revision
 
920
            if _mod_revision.is_null(merger.other_rev_id):
 
921
                raise errors.NoCommits(branch)
 
922
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
 
923
            merger.other_basis = merger.other_rev_id
 
924
            merger.other_tree = self.branch.repository.revision_tree(
 
925
                merger.other_rev_id)
 
926
            merger.other_branch = branch
 
927
            merger.pp.next_phase()
 
928
            if from_revision is None:
 
929
                merger.find_base()
 
930
            else:
 
931
                merger.set_base_revision(from_revision, branch)
 
932
            if merger.base_rev_id == merger.other_rev_id:
 
933
                raise errors.PointlessMerge
 
934
            merger.backup_files = False
 
935
            if merge_type is None:
 
936
                merger.merge_type = Merge3Merger
 
937
            else:
 
938
                merger.merge_type = merge_type
 
939
            merger.set_interesting_files(None)
 
940
            merger.show_base = False
 
941
            merger.reprocess = False
 
942
            conflicts = merger.do_merge()
 
943
            merger.set_pending()
 
944
        finally:
 
945
            pb.finished()
945
946
        return conflicts
946
947
 
947
948
    @needs_read_lock
1598
1599
    @needs_write_lock
1599
1600
    def pull(self, source, overwrite=False, stop_revision=None,
1600
1601
             change_reporter=None, possible_transports=None, local=False):
 
1602
        top_pb = ui.ui_factory.nested_progress_bar()
1601
1603
        source.lock_read()
1602
1604
        try:
 
1605
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1606
            pp.next_phase()
1603
1607
            old_revision_info = self.branch.last_revision_info()
1604
1608
            basis_tree = self.basis_tree()
1605
1609
            count = self.branch.pull(source, overwrite, stop_revision,
1607
1611
                                     local=local)
1608
1612
            new_revision_info = self.branch.last_revision_info()
1609
1613
            if new_revision_info != old_revision_info:
 
1614
                pp.next_phase()
1610
1615
                repository = self.branch.repository
 
1616
                pb = ui.ui_factory.nested_progress_bar()
1611
1617
                basis_tree.lock_read()
1612
1618
                try:
1613
1619
                    new_basis_tree = self.branch.basis_tree()
1616
1622
                                new_basis_tree,
1617
1623
                                basis_tree,
1618
1624
                                this_tree=self,
1619
 
                                pb=None,
 
1625
                                pb=pb,
1620
1626
                                change_reporter=change_reporter)
1621
 
                    basis_root_id = basis_tree.get_root_id()
1622
 
                    new_root_id = new_basis_tree.get_root_id()
1623
 
                    if basis_root_id != new_root_id:
1624
 
                        self.set_root_id(new_root_id)
 
1627
                    if (basis_tree.inventory.root is None and
 
1628
                        new_basis_tree.inventory.root is not None):
 
1629
                        self.set_root_id(new_basis_tree.get_root_id())
1625
1630
                finally:
 
1631
                    pb.finished()
1626
1632
                    basis_tree.unlock()
1627
1633
                # TODO - dedup parents list with things merged by pull ?
1628
1634
                # reuse the revisiontree we merged against to set the new
1641
1647
            return count
1642
1648
        finally:
1643
1649
            source.unlock()
 
1650
            top_pb.finished()
1644
1651
 
1645
1652
    @needs_write_lock
1646
1653
    def put_file_bytes_non_atomic(self, file_id, bytes):
1731
1738
        r"""Check whether the filename matches an ignore pattern.
1732
1739
 
1733
1740
        Patterns containing '/' or '\' need to match the whole path;
1734
 
        others match against only the last component.  Patterns starting
1735
 
        with '!' are ignore exceptions.  Exceptions take precedence
1736
 
        over regular patterns and cause the filename to not be ignored.
 
1741
        others match against only the last component.
1737
1742
 
1738
1743
        If the file is ignored, returns the pattern which caused it to
1739
1744
        be ignored, otherwise None.  So this can simply be used as a
1740
1745
        boolean if desired."""
1741
1746
        if getattr(self, '_ignoreglobster', None) is None:
1742
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1747
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1743
1748
        return self._ignoreglobster.match(filename)
1744
1749
 
1745
1750
    def kind(self, file_id):
1836
1841
    def _reset_data(self):
1837
1842
        """Reset transient data that cannot be revalidated."""
1838
1843
        self._inventory_is_modified = False
1839
 
        f = self._transport.get('inventory')
1840
 
        try:
1841
 
            result = self._deserialize(f)
1842
 
        finally:
1843
 
            f.close()
 
1844
        result = self._deserialize(self._transport.get('inventory'))
1844
1845
        self._set_inventory(result, dirty=False)
1845
1846
 
1846
1847
    @needs_tree_write_lock
1893
1894
            # revision_id is set. We must check for this full string, because a
1894
1895
            # root node id can legitimately look like 'revision_id' but cannot
1895
1896
            # contain a '"'.
1896
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1897
            xml = self.branch.repository.get_inventory_xml(new_revision)
1897
1898
            firstline = xml.split('\n', 1)[0]
1898
1899
            if (not 'revision_id="' in firstline or
1899
1900
                'format="7"' not in firstline):
1922
1923
        # binary.
1923
1924
        if self._inventory_is_modified:
1924
1925
            raise errors.InventoryModified(self)
1925
 
        f = self._transport.get('inventory')
1926
 
        try:
1927
 
            result = self._deserialize(f)
1928
 
        finally:
1929
 
            f.close()
 
1926
        result = self._deserialize(self._transport.get('inventory'))
1930
1927
        self._set_inventory(result, dirty=False)
1931
1928
        return result
1932
1929
 
1947
1944
 
1948
1945
        new_files=set()
1949
1946
        unknown_nested_files=set()
1950
 
        if to_file is None:
1951
 
            to_file = sys.stdout
1952
1947
 
1953
1948
        def recurse_directory_to_add_files(directory):
1954
1949
            # Recurse directory and add all files
2024
2019
                        new_status = 'I'
2025
2020
                    else:
2026
2021
                        new_status = '?'
2027
 
                    # XXX: Really should be a more abstract reporter interface
2028
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2029
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2022
                    textui.show_status(new_status, self.kind(fid), f,
 
2023
                                       to_file=to_file)
2030
2024
                # Unversion file
2031
2025
                inv_delta.append((f, None, fid, None))
2032
2026
                message = "removed %s" % (f,)
2055
2049
 
2056
2050
    @needs_tree_write_lock
2057
2051
    def revert(self, filenames=None, old_tree=None, backups=True,
2058
 
               pb=None, report_changes=False):
 
2052
               pb=DummyProgress(), report_changes=False):
2059
2053
        from bzrlib.conflicts import resolve
2060
2054
        if filenames == []:
2061
2055
            filenames = None
2183
2177
        """
2184
2178
        raise NotImplementedError(self.unlock)
2185
2179
 
2186
 
    _marker = object()
2187
 
 
2188
 
    def update(self, change_reporter=None, possible_transports=None,
2189
 
               revision=None, old_tip=_marker):
 
2180
    def update(self, change_reporter=None, possible_transports=None):
2190
2181
        """Update a working tree along its branch.
2191
2182
 
2192
2183
        This will update the branch if its bound too, which means we have
2210
2201
        - Merge current state -> basis tree of the master w.r.t. the old tree
2211
2202
          basis.
2212
2203
        - Do a 'normal' merge of the old branch basis if it is relevant.
2213
 
 
2214
 
        :param revision: The target revision to update to. Must be in the
2215
 
            revision history.
2216
 
        :param old_tip: If branch.update() has already been run, the value it
2217
 
            returned (old tip of the branch or None). _marker is used
2218
 
            otherwise.
2219
2204
        """
2220
2205
        if self.branch.get_bound_location() is not None:
2221
2206
            self.lock_write()
2222
 
            update_branch = (old_tip is self._marker)
 
2207
            update_branch = True
2223
2208
        else:
2224
2209
            self.lock_tree_write()
2225
2210
            update_branch = False
2227
2212
            if update_branch:
2228
2213
                old_tip = self.branch.update(possible_transports)
2229
2214
            else:
2230
 
                if old_tip is self._marker:
2231
 
                    old_tip = None
2232
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2215
                old_tip = None
 
2216
            return self._update_tree(old_tip, change_reporter)
2233
2217
        finally:
2234
2218
            self.unlock()
2235
2219
 
2236
2220
    @needs_tree_write_lock
2237
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2221
    def _update_tree(self, old_tip=None, change_reporter=None):
2238
2222
        """Update a tree to the master branch.
2239
2223
 
2240
2224
        :param old_tip: if supplied, the previous tip revision the branch,
2250
2234
        # We MUST save it even if an error occurs, because otherwise the users
2251
2235
        # local work is unreferenced and will appear to have been lost.
2252
2236
        #
2253
 
        nb_conflicts = 0
 
2237
        result = 0
2254
2238
        try:
2255
2239
            last_rev = self.get_parent_ids()[0]
2256
2240
        except IndexError:
2257
2241
            last_rev = _mod_revision.NULL_REVISION
2258
 
        if revision is None:
2259
 
            revision = self.branch.last_revision()
2260
 
        else:
2261
 
            if revision not in self.branch.revision_history():
2262
 
                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
 
 
2279
 
        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
 
 
 
2242
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2243
            # merge tree state up to new branch tip.
2285
2244
            basis = self.basis_tree()
2286
2245
            basis.lock_read()
2287
2246
            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)
 
2247
                to_tree = self.branch.basis_tree()
 
2248
                if basis.inventory.root is None:
 
2249
                    self.set_root_id(to_tree.get_root_id())
2291
2250
                    self.flush()
 
2251
                result += merge.merge_inner(
 
2252
                                      self.branch,
 
2253
                                      to_tree,
 
2254
                                      basis,
 
2255
                                      this_tree=self,
 
2256
                                      change_reporter=change_reporter)
2292
2257
            finally:
2293
2258
                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
2259
            # TODO - dedup parents list with things merged by pull ?
2306
2260
            # reuse the tree we've updated to to set the basis:
2307
 
            parent_trees = [(revision, to_tree)]
 
2261
            parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2262
            merges = self.get_parent_ids()[1:]
2309
2263
            # Ideally we ask the tree for the trees here, that way the working
2310
2264
            # tree can decide whether to give us the entire tree or give us a
2314
2268
            for parent in merges:
2315
2269
                parent_trees.append(
2316
2270
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2271
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2272
                parent_trees.append(
2319
2273
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2274
            self.set_parent_trees(parent_trees)
2321
2275
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2276
        else:
 
2277
            # the working tree had the same last-revision as the master
 
2278
            # branch did. We may still have pivot local work from the local
 
2279
            # branch into old_tip:
 
2280
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2281
                self.add_parent_tree_id(old_tip)
 
2282
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2283
            and old_tip != last_rev):
 
2284
            # our last revision was not the prior branch last revision
 
2285
            # and we have converted that last revision to a pending merge.
 
2286
            # base is somewhere between the branch tip now
 
2287
            # and the now pending merge
 
2288
 
 
2289
            # Since we just modified the working tree and inventory, flush out
 
2290
            # the current state, before we modify it again.
 
2291
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2292
            #       requires it only because TreeTransform directly munges the
 
2293
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2294
            #       should be able to remove this extra flush.
 
2295
            self.flush()
 
2296
            graph = self.branch.repository.get_graph()
 
2297
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2298
                                                old_tip)
 
2299
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2300
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2301
            result += merge.merge_inner(
 
2302
                                  self.branch,
 
2303
                                  other_tree,
 
2304
                                  base_tree,
 
2305
                                  this_tree=self,
 
2306
                                  change_reporter=change_reporter)
 
2307
        return result
2323
2308
 
2324
2309
    def _write_hashcache_if_dirty(self):
2325
2310
        """Write out the hashcache if it is dirty."""
2595
2580
        """
2596
2581
        return
2597
2582
 
 
2583
    @needs_read_lock
2598
2584
    def _get_rules_searcher(self, default_searcher):
2599
2585
        """See Tree._get_rules_searcher."""
2600
2586
        if self._rules_searcher is None:
2779
2765
        """Return the format for the working tree object in a_bzrdir."""
2780
2766
        try:
2781
2767
            transport = a_bzrdir.get_workingtree_transport(None)
2782
 
            format_string = transport.get_bytes("format")
 
2768
            format_string = transport.get("format").read()
2783
2769
            return klass._formats[format_string]
2784
2770
        except errors.NoSuchFile:
2785
2771
            raise errors.NoWorkingTree(base=transport.base)