← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
101
101
from bzrlib.filters import filtered_input_file
102
102
from bzrlib.trace import mutter, note
103
103
from bzrlib.transport.local import LocalTransport
104
 
from bzrlib.progress import DummyProgress, ProgressPhase
 
104
from bzrlib.progress import ProgressPhase
105
105
from bzrlib.revision import CURRENT_REVISION
106
106
from bzrlib.rio import RioReader, rio_file, Stanza
107
107
from bzrlib.symbol_versioning import (
111
111
 
112
112
 
113
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.
114
117
CONFLICT_HEADER_1 = "BZR conflict list format 1"
115
118
 
116
119
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
909
912
            branch.last_revision().
910
913
        """
911
914
        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()
 
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()
949
945
        return conflicts
950
946
 
951
947
    @needs_read_lock
1098
1094
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1099
1095
        if tree_transport.base != branch_transport.base:
1100
1096
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1101
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
 
1097
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
 
1098
                target_branch=new_branch)
1102
1099
        else:
1103
1100
            tree_bzrdir = branch_bzrdir
1104
1101
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1139
        This does not include files that have been deleted in this
1143
1140
        tree. Skips the control directory.
1144
1141
 
1145
 
        :param include_root: if True, do not return an entry for the root
 
1142
        :param include_root: if True, return an entry for the root
1146
1143
        :param from_dir: start from this directory or None for the root
1147
1144
        :param recursive: whether to recurse into subdirectories or not
1148
1145
        """
1602
1599
    @needs_write_lock
1603
1600
    def pull(self, source, overwrite=False, stop_revision=None,
1604
1601
             change_reporter=None, possible_transports=None, local=False):
1605
 
        top_pb = ui.ui_factory.nested_progress_bar()
1606
1602
        source.lock_read()
1607
1603
        try:
1608
 
            pp = ProgressPhase("Pull phase", 2, top_pb)
1609
 
            pp.next_phase()
1610
1604
            old_revision_info = self.branch.last_revision_info()
1611
1605
            basis_tree = self.basis_tree()
1612
1606
            count = self.branch.pull(source, overwrite, stop_revision,
1614
1608
                                     local=local)
1615
1609
            new_revision_info = self.branch.last_revision_info()
1616
1610
            if new_revision_info != old_revision_info:
1617
 
                pp.next_phase()
1618
1611
                repository = self.branch.repository
1619
 
                pb = ui.ui_factory.nested_progress_bar()
1620
1612
                basis_tree.lock_read()
1621
1613
                try:
1622
1614
                    new_basis_tree = self.branch.basis_tree()
1625
1617
                                new_basis_tree,
1626
1618
                                basis_tree,
1627
1619
                                this_tree=self,
1628
 
                                pb=pb,
 
1620
                                pb=None,
1629
1621
                                change_reporter=change_reporter)
1630
1622
                    basis_root_id = basis_tree.get_root_id()
1631
1623
                    new_root_id = new_basis_tree.get_root_id()
1632
1624
                    if basis_root_id != new_root_id:
1633
1625
                        self.set_root_id(new_root_id)
1634
1626
                finally:
1635
 
                    pb.finished()
1636
1627
                    basis_tree.unlock()
1637
1628
                # TODO - dedup parents list with things merged by pull ?
1638
1629
                # reuse the revisiontree we merged against to set the new
1651
1642
            return count
1652
1643
        finally:
1653
1644
            source.unlock()
1654
 
            top_pb.finished()
1655
1645
 
1656
1646
    @needs_write_lock
1657
1647
    def put_file_bytes_non_atomic(self, file_id, bytes):
1904
1894
            # revision_id is set. We must check for this full string, because a
1905
1895
            # root node id can legitimately look like 'revision_id' but cannot
1906
1896
            # contain a '"'.
1907
 
            xml = self.branch.repository.get_inventory_xml(new_revision)
 
1897
            xml = self.branch.repository._get_inventory_xml(new_revision)
1908
1898
            firstline = xml.split('\n', 1)[0]
1909
1899
            if (not 'revision_id="' in firstline or
1910
1900
                'format="7"' not in firstline):
2066
2056
 
2067
2057
    @needs_tree_write_lock
2068
2058
    def revert(self, filenames=None, old_tree=None, backups=True,
2069
 
               pb=DummyProgress(), report_changes=False):
 
2059
               pb=None, report_changes=False):
2070
2060
        from bzrlib.conflicts import resolve
2071
2061
        if filenames == []:
2072
2062
            filenames = None
2261
2251
        # We MUST save it even if an error occurs, because otherwise the users
2262
2252
        # local work is unreferenced and will appear to have been lost.
2263
2253
        #
2264
 
        result = 0
 
2254
        nb_conflicts = 0
2265
2255
        try:
2266
2256
            last_rev = self.get_parent_ids()[0]
2267
2257
        except IndexError:
2271
2261
        else:
2272
2262
            if revision not in self.branch.revision_history():
2273
2263
                raise errors.NoSuchRevision(self.branch, revision)
 
2264
 
 
2265
        old_tip = old_tip or _mod_revision.NULL_REVISION
 
2266
 
 
2267
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
 
2268
            # the branch we are bound to was updated
 
2269
            # merge those changes in first
 
2270
            base_tree  = self.basis_tree()
 
2271
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2272
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
 
2273
                                             base_tree, this_tree=self,
 
2274
                                             change_reporter=change_reporter)
 
2275
            if nb_conflicts:
 
2276
                self.add_parent_tree((old_tip, other_tree))
 
2277
                trace.note('Rerun update after fixing the conflicts.')
 
2278
                return nb_conflicts
 
2279
 
2274
2280
        if last_rev != _mod_revision.ensure_null(revision):
2275
 
            # merge tree state up to specified revision.
 
2281
            # the working tree is up to date with the branch
 
2282
            # we can merge the specified revision from master
 
2283
            to_tree = self.branch.repository.revision_tree(revision)
 
2284
            to_root_id = to_tree.get_root_id()
 
2285
 
2276
2286
            basis = self.basis_tree()
2277
2287
            basis.lock_read()
2278
2288
            try:
2279
 
                to_tree = self.branch.repository.revision_tree(revision)
2280
 
                to_root_id = to_tree.get_root_id()
2281
2289
                if (basis.inventory.root is None
2282
2290
                    or basis.inventory.root.file_id != to_root_id):
2283
2291
                    self.set_root_id(to_root_id)
2284
2292
                    self.flush()
2285
 
                result += merge.merge_inner(
2286
 
                                      self.branch,
2287
 
                                      to_tree,
2288
 
                                      basis,
2289
 
                                      this_tree=self,
2290
 
                                      change_reporter=change_reporter)
2291
 
                self.set_last_revision(revision)
2292
2293
            finally:
2293
2294
                basis.unlock()
 
2295
 
 
2296
            # determine the branch point
 
2297
            graph = self.branch.repository.get_graph()
 
2298
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2299
                                                last_rev)
 
2300
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2301
 
 
2302
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
 
2303
                                             this_tree=self,
 
2304
                                             change_reporter=change_reporter)
 
2305
            self.set_last_revision(revision)
2294
2306
            # TODO - dedup parents list with things merged by pull ?
2295
2307
            # reuse the tree we've updated to to set the basis:
2296
2308
            parent_trees = [(revision, to_tree)]
2303
2315
            for parent in merges:
2304
2316
                parent_trees.append(
2305
2317
                    (parent, self.branch.repository.revision_tree(parent)))
2306
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2318
            if not _mod_revision.is_null(old_tip):
2307
2319
                parent_trees.append(
2308
2320
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2309
2321
            self.set_parent_trees(parent_trees)
2310
2322
            last_rev = parent_trees[0][0]
2311
 
        else:
2312
 
            # the working tree had the same last-revision as the master
2313
 
            # branch did. We may still have pivot local work from the local
2314
 
            # branch into old_tip:
2315
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2316
 
                self.add_parent_tree_id(old_tip)
2317
 
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
2318
 
            and old_tip != last_rev):
2319
 
            # our last revision was not the prior branch last revision
2320
 
            # and we have converted that last revision to a pending merge.
2321
 
            # base is somewhere between the branch tip now
2322
 
            # and the now pending merge
2323
 
 
2324
 
            # Since we just modified the working tree and inventory, flush out
2325
 
            # the current state, before we modify it again.
2326
 
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2327
 
            #       requires it only because TreeTransform directly munges the
2328
 
            #       inventory and calls tree._write_inventory(). Ultimately we
2329
 
            #       should be able to remove this extra flush.
2330
 
            self.flush()
2331
 
            graph = self.branch.repository.get_graph()
2332
 
            base_rev_id = graph.find_unique_lca(revision, old_tip)
2333
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2334
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2335
 
            result += merge.merge_inner(
2336
 
                                  self.branch,
2337
 
                                  other_tree,
2338
 
                                  base_tree,
2339
 
                                  this_tree=self,
2340
 
                                  change_reporter=change_reporter)
2341
 
        return result
 
2323
        return nb_conflicts
2342
2324
 
2343
2325
    def _write_hashcache_if_dirty(self):
2344
2326
        """Write out the hashcache if it is dirty."""