← 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-04-23 07:03:49 UTC
  • mto: (5176.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5177.
  • Revision ID: v.ladeuil+lp@free.fr-20100423070349-a1teldjccr9xthwa
Fixed as per Andrew's review.

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 ProgressPhase
 
104
from bzrlib.progress import DummyProgress, 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.
117
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
118
115
 
119
116
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
912
909
            branch.last_revision().
913
910
        """
914
911
        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()
 
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()
945
949
        return conflicts
946
950
 
947
951
    @needs_read_lock
1598
1602
    @needs_write_lock
1599
1603
    def pull(self, source, overwrite=False, stop_revision=None,
1600
1604
             change_reporter=None, possible_transports=None, local=False):
 
1605
        top_pb = ui.ui_factory.nested_progress_bar()
1601
1606
        source.lock_read()
1602
1607
        try:
 
1608
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1609
            pp.next_phase()
1603
1610
            old_revision_info = self.branch.last_revision_info()
1604
1611
            basis_tree = self.basis_tree()
1605
1612
            count = self.branch.pull(source, overwrite, stop_revision,
1607
1614
                                     local=local)
1608
1615
            new_revision_info = self.branch.last_revision_info()
1609
1616
            if new_revision_info != old_revision_info:
 
1617
                pp.next_phase()
1610
1618
                repository = self.branch.repository
 
1619
                pb = ui.ui_factory.nested_progress_bar()
1611
1620
                basis_tree.lock_read()
1612
1621
                try:
1613
1622
                    new_basis_tree = self.branch.basis_tree()
1616
1625
                                new_basis_tree,
1617
1626
                                basis_tree,
1618
1627
                                this_tree=self,
1619
 
                                pb=None,
 
1628
                                pb=pb,
1620
1629
                                change_reporter=change_reporter)
1621
1630
                    basis_root_id = basis_tree.get_root_id()
1622
1631
                    new_root_id = new_basis_tree.get_root_id()
1623
1632
                    if basis_root_id != new_root_id:
1624
1633
                        self.set_root_id(new_root_id)
1625
1634
                finally:
 
1635
                    pb.finished()
1626
1636
                    basis_tree.unlock()
1627
1637
                # TODO - dedup parents list with things merged by pull ?
1628
1638
                # reuse the revisiontree we merged against to set the new
1641
1651
            return count
1642
1652
        finally:
1643
1653
            source.unlock()
 
1654
            top_pb.finished()
1644
1655
 
1645
1656
    @needs_write_lock
1646
1657
    def put_file_bytes_non_atomic(self, file_id, bytes):
1893
1904
            # revision_id is set. We must check for this full string, because a
1894
1905
            # root node id can legitimately look like 'revision_id' but cannot
1895
1906
            # contain a '"'.
1896
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1907
            xml = self.branch.repository.get_inventory_xml(new_revision)
1897
1908
            firstline = xml.split('\n', 1)[0]
1898
1909
            if (not 'revision_id="' in firstline or
1899
1910
                'format="7"' not in firstline):
2055
2066
 
2056
2067
    @needs_tree_write_lock
2057
2068
    def revert(self, filenames=None, old_tree=None, backups=True,
2058
 
               pb=None, report_changes=False):
 
2069
               pb=DummyProgress(), report_changes=False):
2059
2070
        from bzrlib.conflicts import resolve
2060
2071
        if filenames == []:
2061
2072
            filenames = None
2250
2261
        # We MUST save it even if an error occurs, because otherwise the users
2251
2262
        # local work is unreferenced and will appear to have been lost.
2252
2263
        #
2253
 
        nb_conflicts = 0
 
2264
        result = 0
2254
2265
        try:
2255
2266
            last_rev = self.get_parent_ids()[0]
2256
2267
        except IndexError:
2260
2271
        else:
2261
2272
            if revision not in self.branch.revision_history():
2262
2273
                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
2274
        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
 
 
 
2275
            # merge tree state up to specified revision.
2285
2276
            basis = self.basis_tree()
2286
2277
            basis.lock_read()
2287
2278
            try:
 
2279
                to_tree = self.branch.repository.revision_tree(revision)
 
2280
                to_root_id = to_tree.get_root_id()
2288
2281
                if (basis.inventory.root is None
2289
2282
                    or basis.inventory.root.file_id != to_root_id):
2290
2283
                    self.set_root_id(to_root_id)
2291
2284
                    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
2292
            finally:
2293
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)
2305
2294
            # TODO - dedup parents list with things merged by pull ?
2306
2295
            # reuse the tree we've updated to to set the basis:
2307
2296
            parent_trees = [(revision, to_tree)]
2314
2303
            for parent in merges:
2315
2304
                parent_trees.append(
2316
2305
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2306
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2307
                parent_trees.append(
2319
2308
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2309
            self.set_parent_trees(parent_trees)
2321
2310
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
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
2342
 
2324
2343
    def _write_hashcache_if_dirty(self):
2325
2344
        """Write out the hashcache if it is dirty."""