← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-11 09:27:55 UTC
  • mfrom: (5017.3.46 test-servers)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100211092755-3vvu4vbwiwjjte3s
Move tests servers from bzrlib.transport to bzrlib.tests.test_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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,
69
68
    trace,
70
69
    transform,
71
70
    ui,
102
101
from bzrlib.filters import filtered_input_file
103
102
from bzrlib.trace import mutter, note
104
103
from bzrlib.transport.local import LocalTransport
105
 
from bzrlib.progress import DummyProgress, ProgressPhase
 
104
from bzrlib.progress import ProgressPhase
106
105
from bzrlib.revision import CURRENT_REVISION
107
106
from bzrlib.rio import RioReader, rio_file, Stanza
108
107
from bzrlib.symbol_versioning import (
112
111
 
113
112
 
114
113
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.
115
117
CONFLICT_HEADER_1 = "BZR conflict list format 1"
116
118
 
117
119
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
544
546
        else:
545
547
            parents = [last_rev]
546
548
        try:
547
 
            merges_file = self._transport.get('pending-merges')
 
549
            merges_bytes = self._transport.get_bytes('pending-merges')
548
550
        except errors.NoSuchFile:
549
551
            pass
550
552
        else:
551
 
            for l in merges_file.readlines():
 
553
            for l in osutils.split_lines(merges_bytes):
552
554
                revision_id = l.rstrip('\n')
553
555
                parents.append(revision_id)
554
556
        return parents
613
615
 
614
616
    def get_file_size(self, file_id):
615
617
        """See Tree.get_file_size"""
 
618
        # XXX: this returns the on-disk size; it should probably return the
 
619
        # canonical size
616
620
        try:
617
621
            return os.path.getsize(self.id2abspath(file_id))
618
622
        except OSError, e:
634
638
 
635
639
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
636
640
        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
637
645
        return self._inventory[file_id].executable
638
646
 
639
647
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
749
757
            raise
750
758
        kind = _mapper(stat_result.st_mode)
751
759
        if kind == 'file':
752
 
            size = stat_result.st_size
753
 
            # try for a stat cache lookup
754
 
            executable = self._is_executable_from_path_and_stat(path, stat_result)
755
 
            return (kind, size, executable, self._sha_from_stat(
756
 
                path, stat_result))
 
760
            return self._file_content_summary(path, stat_result)
757
761
        elif kind == 'directory':
758
762
            # perhaps it looks like a plain directory, but it's really a
759
763
            # reference.
766
770
        else:
767
771
            return (kind, None, None, None)
768
772
 
 
773
    def _file_content_summary(self, path, stat_result):
 
774
        size = stat_result.st_size
 
775
        executable = self._is_executable_from_path_and_stat(path, stat_result)
 
776
        # try for a stat cache lookup
 
777
        return ('file', size, executable, self._sha_from_stat(
 
778
            path, stat_result))
 
779
 
769
780
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
770
781
        """Common ghost checking functionality from set_parent_*.
771
782
 
891
902
 
892
903
    @needs_write_lock # because merge pulls data into the branch.
893
904
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
894
 
        merge_type=None):
 
905
                          merge_type=None, force=False):
895
906
        """Merge from a branch into this working tree.
896
907
 
897
908
        :param branch: The branch to merge from.
901
912
            branch.last_revision().
902
913
        """
903
914
        from bzrlib.merge import Merger, Merge3Merger
904
 
        pb = ui.ui_factory.nested_progress_bar()
905
 
        try:
906
 
            merger = Merger(self.branch, this_tree=self, pb=pb)
907
 
            merger.pp = ProgressPhase("Merge phase", 5, pb)
908
 
            merger.pp.next_phase()
909
 
            # check that there are no
910
 
            # local alterations
911
 
            merger.check_basis(check_clean=True, require_commits=False)
912
 
            if to_revision is None:
913
 
                to_revision = _mod_revision.ensure_null(branch.last_revision())
914
 
            merger.other_rev_id = to_revision
915
 
            if _mod_revision.is_null(merger.other_rev_id):
916
 
                raise errors.NoCommits(branch)
917
 
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
918
 
            merger.other_basis = merger.other_rev_id
919
 
            merger.other_tree = self.branch.repository.revision_tree(
920
 
                merger.other_rev_id)
921
 
            merger.other_branch = branch
922
 
            merger.pp.next_phase()
923
 
            if from_revision is None:
924
 
                merger.find_base()
925
 
            else:
926
 
                merger.set_base_revision(from_revision, branch)
927
 
            if merger.base_rev_id == merger.other_rev_id:
928
 
                raise errors.PointlessMerge
929
 
            merger.backup_files = False
930
 
            if merge_type is None:
931
 
                merger.merge_type = Merge3Merger
932
 
            else:
933
 
                merger.merge_type = merge_type
934
 
            merger.set_interesting_files(None)
935
 
            merger.show_base = False
936
 
            merger.reprocess = False
937
 
            conflicts = merger.do_merge()
938
 
            merger.set_pending()
939
 
        finally:
940
 
            pb.finished()
 
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()
941
945
        return conflicts
942
946
 
943
947
    @needs_read_lock
1594
1598
    @needs_write_lock
1595
1599
    def pull(self, source, overwrite=False, stop_revision=None,
1596
1600
             change_reporter=None, possible_transports=None, local=False):
1597
 
        top_pb = ui.ui_factory.nested_progress_bar()
1598
1601
        source.lock_read()
1599
1602
        try:
1600
 
            pp = ProgressPhase("Pull phase", 2, top_pb)
1601
 
            pp.next_phase()
1602
1603
            old_revision_info = self.branch.last_revision_info()
1603
1604
            basis_tree = self.basis_tree()
1604
1605
            count = self.branch.pull(source, overwrite, stop_revision,
1606
1607
                                     local=local)
1607
1608
            new_revision_info = self.branch.last_revision_info()
1608
1609
            if new_revision_info != old_revision_info:
1609
 
                pp.next_phase()
1610
1610
                repository = self.branch.repository
1611
 
                pb = ui.ui_factory.nested_progress_bar()
1612
1611
                basis_tree.lock_read()
1613
1612
                try:
1614
1613
                    new_basis_tree = self.branch.basis_tree()
1617
1616
                                new_basis_tree,
1618
1617
                                basis_tree,
1619
1618
                                this_tree=self,
1620
 
                                pb=pb,
 
1619
                                pb=None,
1621
1620
                                change_reporter=change_reporter)
1622
 
                    if (basis_tree.inventory.root is None and
1623
 
                        new_basis_tree.inventory.root is not None):
1624
 
                        self.set_root_id(new_basis_tree.get_root_id())
 
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)
1625
1625
                finally:
1626
 
                    pb.finished()
1627
1626
                    basis_tree.unlock()
1628
1627
                # TODO - dedup parents list with things merged by pull ?
1629
1628
                # reuse the revisiontree we merged against to set the new
1642
1641
            return count
1643
1642
        finally:
1644
1643
            source.unlock()
1645
 
            top_pb.finished()
1646
1644
 
1647
1645
    @needs_write_lock
1648
1646
    def put_file_bytes_non_atomic(self, file_id, bytes):
1733
1731
        r"""Check whether the filename matches an ignore pattern.
1734
1732
 
1735
1733
        Patterns containing '/' or '\' need to match the whole path;
1736
 
        others match against only the last component.
 
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.
1737
1737
 
1738
1738
        If the file is ignored, returns the pattern which caused it to
1739
1739
        be ignored, otherwise None.  So this can simply be used as a
1740
1740
        boolean if desired."""
1741
1741
        if getattr(self, '_ignoreglobster', None) is None:
1742
 
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
 
1742
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1743
1743
        return self._ignoreglobster.match(filename)
1744
1744
 
1745
1745
    def kind(self, file_id):
1836
1836
    def _reset_data(self):
1837
1837
        """Reset transient data that cannot be revalidated."""
1838
1838
        self._inventory_is_modified = False
1839
 
        result = self._deserialize(self._transport.get('inventory'))
 
1839
        f = self._transport.get('inventory')
 
1840
        try:
 
1841
            result = self._deserialize(f)
 
1842
        finally:
 
1843
            f.close()
1840
1844
        self._set_inventory(result, dirty=False)
1841
1845
 
1842
1846
    @needs_tree_write_lock
1889
1893
            # revision_id is set. We must check for this full string, because a
1890
1894
            # root node id can legitimately look like 'revision_id' but cannot
1891
1895
            # contain a '"'.
1892
 
            xml = self.branch.repository.get_inventory_xml(new_revision)
 
1896
            xml = self.branch.repository._get_inventory_xml(new_revision)
1893
1897
            firstline = xml.split('\n', 1)[0]
1894
1898
            if (not 'revision_id="' in firstline or
1895
1899
                'format="7"' not in firstline):
1896
 
                inv = self.branch.repository.deserialise_inventory(
1897
 
                    new_revision, xml)
 
1900
                inv = self.branch.repository._serializer.read_inventory_from_string(
 
1901
                    xml, new_revision)
1898
1902
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1899
1903
            self._write_basis_inventory(xml)
1900
1904
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1918
1922
        # binary.
1919
1923
        if self._inventory_is_modified:
1920
1924
            raise errors.InventoryModified(self)
1921
 
        result = self._deserialize(self._transport.get('inventory'))
 
1925
        f = self._transport.get('inventory')
 
1926
        try:
 
1927
            result = self._deserialize(f)
 
1928
        finally:
 
1929
            f.close()
1922
1930
        self._set_inventory(result, dirty=False)
1923
1931
        return result
1924
1932
 
1939
1947
 
1940
1948
        new_files=set()
1941
1949
        unknown_nested_files=set()
 
1950
        if to_file is None:
 
1951
            to_file = sys.stdout
1942
1952
 
1943
1953
        def recurse_directory_to_add_files(directory):
1944
1954
            # Recurse directory and add all files
2014
2024
                        new_status = 'I'
2015
2025
                    else:
2016
2026
                        new_status = '?'
2017
 
                    textui.show_status(new_status, self.kind(fid), f,
2018
 
                                       to_file=to_file)
 
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')
2019
2030
                # Unversion file
2020
2031
                inv_delta.append((f, None, fid, None))
2021
2032
                message = "removed %s" % (f,)
2044
2055
 
2045
2056
    @needs_tree_write_lock
2046
2057
    def revert(self, filenames=None, old_tree=None, backups=True,
2047
 
               pb=DummyProgress(), report_changes=False):
 
2058
               pb=None, report_changes=False):
2048
2059
        from bzrlib.conflicts import resolve
2049
2060
        if filenames == []:
2050
2061
            filenames = None
2172
2183
        """
2173
2184
        raise NotImplementedError(self.unlock)
2174
2185
 
2175
 
    def update(self, change_reporter=None, possible_transports=None):
 
2186
    _marker = object()
 
2187
 
 
2188
    def update(self, change_reporter=None, possible_transports=None,
 
2189
               revision=None, old_tip=_marker):
2176
2190
        """Update a working tree along its branch.
2177
2191
 
2178
2192
        This will update the branch if its bound too, which means we have
2196
2210
        - Merge current state -> basis tree of the master w.r.t. the old tree
2197
2211
          basis.
2198
2212
        - 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.
2199
2219
        """
2200
2220
        if self.branch.get_bound_location() is not None:
2201
2221
            self.lock_write()
2202
 
            update_branch = True
 
2222
            update_branch = (old_tip is self._marker)
2203
2223
        else:
2204
2224
            self.lock_tree_write()
2205
2225
            update_branch = False
2207
2227
            if update_branch:
2208
2228
                old_tip = self.branch.update(possible_transports)
2209
2229
            else:
2210
 
                old_tip = None
2211
 
            return self._update_tree(old_tip, change_reporter)
 
2230
                if old_tip is self._marker:
 
2231
                    old_tip = None
 
2232
            return self._update_tree(old_tip, change_reporter, revision)
2212
2233
        finally:
2213
2234
            self.unlock()
2214
2235
 
2215
2236
    @needs_tree_write_lock
2216
 
    def _update_tree(self, old_tip=None, change_reporter=None):
 
2237
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2217
2238
        """Update a tree to the master branch.
2218
2239
 
2219
2240
        :param old_tip: if supplied, the previous tip revision the branch,
2229
2250
        # We MUST save it even if an error occurs, because otherwise the users
2230
2251
        # local work is unreferenced and will appear to have been lost.
2231
2252
        #
2232
 
        result = 0
 
2253
        nb_conflicts = 0
2233
2254
        try:
2234
2255
            last_rev = self.get_parent_ids()[0]
2235
2256
        except IndexError:
2236
2257
            last_rev = _mod_revision.NULL_REVISION
2237
 
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2238
 
            # merge tree state up to new branch tip.
 
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
 
2239
2285
            basis = self.basis_tree()
2240
2286
            basis.lock_read()
2241
2287
            try:
2242
 
                to_tree = self.branch.basis_tree()
2243
 
                if basis.inventory.root is None:
2244
 
                    self.set_root_id(to_tree.get_root_id())
 
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)
2245
2291
                    self.flush()
2246
 
                result += merge.merge_inner(
2247
 
                                      self.branch,
2248
 
                                      to_tree,
2249
 
                                      basis,
2250
 
                                      this_tree=self,
2251
 
                                      change_reporter=change_reporter)
2252
2292
            finally:
2253
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)
2254
2305
            # TODO - dedup parents list with things merged by pull ?
2255
2306
            # reuse the tree we've updated to to set the basis:
2256
 
            parent_trees = [(self.branch.last_revision(), to_tree)]
 
2307
            parent_trees = [(revision, to_tree)]
2257
2308
            merges = self.get_parent_ids()[1:]
2258
2309
            # Ideally we ask the tree for the trees here, that way the working
2259
2310
            # tree can decide whether to give us the entire tree or give us a
2263
2314
            for parent in merges:
2264
2315
                parent_trees.append(
2265
2316
                    (parent, self.branch.repository.revision_tree(parent)))
2266
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2317
            if not _mod_revision.is_null(old_tip):
2267
2318
                parent_trees.append(
2268
2319
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2269
2320
            self.set_parent_trees(parent_trees)
2270
2321
            last_rev = parent_trees[0][0]
2271
 
        else:
2272
 
            # the working tree had the same last-revision as the master
2273
 
            # branch did. We may still have pivot local work from the local
2274
 
            # branch into old_tip:
2275
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2276
 
                self.add_parent_tree_id(old_tip)
2277
 
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
2278
 
            and old_tip != last_rev):
2279
 
            # our last revision was not the prior branch last revision
2280
 
            # and we have converted that last revision to a pending merge.
2281
 
            # base is somewhere between the branch tip now
2282
 
            # and the now pending merge
2283
 
 
2284
 
            # Since we just modified the working tree and inventory, flush out
2285
 
            # the current state, before we modify it again.
2286
 
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2287
 
            #       requires it only because TreeTransform directly munges the
2288
 
            #       inventory and calls tree._write_inventory(). Ultimately we
2289
 
            #       should be able to remove this extra flush.
2290
 
            self.flush()
2291
 
            graph = self.branch.repository.get_graph()
2292
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2293
 
                                                old_tip)
2294
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2295
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2296
 
            result += merge.merge_inner(
2297
 
                                  self.branch,
2298
 
                                  other_tree,
2299
 
                                  base_tree,
2300
 
                                  this_tree=self,
2301
 
                                  change_reporter=change_reporter)
2302
 
        return result
 
2322
        return nb_conflicts
2303
2323
 
2304
2324
    def _write_hashcache_if_dirty(self):
2305
2325
        """Write out the hashcache if it is dirty."""
2575
2595
        """
2576
2596
        return
2577
2597
 
2578
 
    @needs_read_lock
2579
2598
    def _get_rules_searcher(self, default_searcher):
2580
2599
        """See Tree._get_rules_searcher."""
2581
2600
        if self._rules_searcher is None:
2760
2779
        """Return the format for the working tree object in a_bzrdir."""
2761
2780
        try:
2762
2781
            transport = a_bzrdir.get_workingtree_transport(None)
2763
 
            format_string = transport.get("format").read()
 
2782
            format_string = transport.get_bytes("format")
2764
2783
            return klass._formats[format_string]
2765
2784
        except errors.NoSuchFile:
2766
2785
            raise errors.NoWorkingTree(base=transport.base)
3030
3049
        return self.get_format_string()
3031
3050
 
3032
3051
 
3033
 
__default_format = WorkingTreeFormat4()
 
3052
__default_format = WorkingTreeFormat6()
3034
3053
WorkingTreeFormat.register_format(__default_format)
3035
 
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3036
3054
WorkingTreeFormat.register_format(WorkingTreeFormat5())
 
3055
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3037
3056
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3038
3057
WorkingTreeFormat.set_default_format(__default_format)
3039
3058
# formats which have no format string are not discoverable