← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2010-02-23 07:43:11 UTC
  • mfrom: (4797.2.20 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: mbp@sourcefrog.net-20100223074311-gnj55xdhrgz9l94e
Merge 2.1 back 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 (
912
912
            branch.last_revision().
913
913
        """
914
914
        from bzrlib.merge import Merger, Merge3Merger
915
 
        pb = ui.ui_factory.nested_progress_bar()
916
 
        try:
917
 
            merger = Merger(self.branch, this_tree=self, pb=pb)
918
 
            merger.pp = ProgressPhase("Merge phase", 5, pb)
919
 
            merger.pp.next_phase()
920
 
            # check that there are no local alterations
921
 
            if not force and self.has_changes():
922
 
                raise errors.UncommittedChanges(self)
923
 
            if to_revision is None:
924
 
                to_revision = _mod_revision.ensure_null(branch.last_revision())
925
 
            merger.other_rev_id = to_revision
926
 
            if _mod_revision.is_null(merger.other_rev_id):
927
 
                raise errors.NoCommits(branch)
928
 
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
929
 
            merger.other_basis = merger.other_rev_id
930
 
            merger.other_tree = self.branch.repository.revision_tree(
931
 
                merger.other_rev_id)
932
 
            merger.other_branch = branch
933
 
            merger.pp.next_phase()
934
 
            if from_revision is None:
935
 
                merger.find_base()
936
 
            else:
937
 
                merger.set_base_revision(from_revision, branch)
938
 
            if merger.base_rev_id == merger.other_rev_id:
939
 
                raise errors.PointlessMerge
940
 
            merger.backup_files = False
941
 
            if merge_type is None:
942
 
                merger.merge_type = Merge3Merger
943
 
            else:
944
 
                merger.merge_type = merge_type
945
 
            merger.set_interesting_files(None)
946
 
            merger.show_base = False
947
 
            merger.reprocess = False
948
 
            conflicts = merger.do_merge()
949
 
            merger.set_pending()
950
 
        finally:
951
 
            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()
952
945
        return conflicts
953
946
 
954
947
    @needs_read_lock
1605
1598
    @needs_write_lock
1606
1599
    def pull(self, source, overwrite=False, stop_revision=None,
1607
1600
             change_reporter=None, possible_transports=None, local=False):
1608
 
        top_pb = ui.ui_factory.nested_progress_bar()
1609
1601
        source.lock_read()
1610
1602
        try:
1611
 
            pp = ProgressPhase("Pull phase", 2, top_pb)
1612
 
            pp.next_phase()
1613
1603
            old_revision_info = self.branch.last_revision_info()
1614
1604
            basis_tree = self.basis_tree()
1615
1605
            count = self.branch.pull(source, overwrite, stop_revision,
1617
1607
                                     local=local)
1618
1608
            new_revision_info = self.branch.last_revision_info()
1619
1609
            if new_revision_info != old_revision_info:
1620
 
                pp.next_phase()
1621
1610
                repository = self.branch.repository
1622
 
                pb = ui.ui_factory.nested_progress_bar()
1623
1611
                basis_tree.lock_read()
1624
1612
                try:
1625
1613
                    new_basis_tree = self.branch.basis_tree()
1628
1616
                                new_basis_tree,
1629
1617
                                basis_tree,
1630
1618
                                this_tree=self,
1631
 
                                pb=pb,
 
1619
                                pb=None,
1632
1620
                                change_reporter=change_reporter)
1633
1621
                    basis_root_id = basis_tree.get_root_id()
1634
1622
                    new_root_id = new_basis_tree.get_root_id()
1635
1623
                    if basis_root_id != new_root_id:
1636
1624
                        self.set_root_id(new_root_id)
1637
1625
                finally:
1638
 
                    pb.finished()
1639
1626
                    basis_tree.unlock()
1640
1627
                # TODO - dedup parents list with things merged by pull ?
1641
1628
                # reuse the revisiontree we merged against to set the new
1654
1641
            return count
1655
1642
        finally:
1656
1643
            source.unlock()
1657
 
            top_pb.finished()
1658
1644
 
1659
1645
    @needs_write_lock
1660
1646
    def put_file_bytes_non_atomic(self, file_id, bytes):
2069
2055
 
2070
2056
    @needs_tree_write_lock
2071
2057
    def revert(self, filenames=None, old_tree=None, backups=True,
2072
 
               pb=DummyProgress(), report_changes=False):
 
2058
               pb=None, report_changes=False):
2073
2059
        from bzrlib.conflicts import resolve
2074
2060
        if filenames == []:
2075
2061
            filenames = None
2264
2250
        # We MUST save it even if an error occurs, because otherwise the users
2265
2251
        # local work is unreferenced and will appear to have been lost.
2266
2252
        #
2267
 
        result = 0
 
2253
        nb_conflicts = 0
2268
2254
        try:
2269
2255
            last_rev = self.get_parent_ids()[0]
2270
2256
        except IndexError:
2274
2260
        else:
2275
2261
            if revision not in self.branch.revision_history():
2276
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
 
2277
2279
        if last_rev != _mod_revision.ensure_null(revision):
2278
 
            # merge tree state up to specified 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
 
2279
2285
            basis = self.basis_tree()
2280
2286
            basis.lock_read()
2281
2287
            try:
2282
 
                to_tree = self.branch.repository.revision_tree(revision)
2283
 
                to_root_id = to_tree.get_root_id()
2284
2288
                if (basis.inventory.root is None
2285
2289
                    or basis.inventory.root.file_id != to_root_id):
2286
2290
                    self.set_root_id(to_root_id)
2287
2291
                    self.flush()
2288
 
                result += merge.merge_inner(
2289
 
                                      self.branch,
2290
 
                                      to_tree,
2291
 
                                      basis,
2292
 
                                      this_tree=self,
2293
 
                                      change_reporter=change_reporter)
2294
 
                self.set_last_revision(revision)
2295
2292
            finally:
2296
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)
2297
2305
            # TODO - dedup parents list with things merged by pull ?
2298
2306
            # reuse the tree we've updated to to set the basis:
2299
2307
            parent_trees = [(revision, to_tree)]
2306
2314
            for parent in merges:
2307
2315
                parent_trees.append(
2308
2316
                    (parent, self.branch.repository.revision_tree(parent)))
2309
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2317
            if not _mod_revision.is_null(old_tip):
2310
2318
                parent_trees.append(
2311
2319
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2312
2320
            self.set_parent_trees(parent_trees)
2313
2321
            last_rev = parent_trees[0][0]
2314
 
        else:
2315
 
            # the working tree had the same last-revision as the master
2316
 
            # branch did. We may still have pivot local work from the local
2317
 
            # branch into old_tip:
2318
 
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2319
 
                self.add_parent_tree_id(old_tip)
2320
 
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
2321
 
            and old_tip != last_rev):
2322
 
            # our last revision was not the prior branch last revision
2323
 
            # and we have converted that last revision to a pending merge.
2324
 
            # base is somewhere between the branch tip now
2325
 
            # and the now pending merge
2326
 
 
2327
 
            # Since we just modified the working tree and inventory, flush out
2328
 
            # the current state, before we modify it again.
2329
 
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2330
 
            #       requires it only because TreeTransform directly munges the
2331
 
            #       inventory and calls tree._write_inventory(). Ultimately we
2332
 
            #       should be able to remove this extra flush.
2333
 
            self.flush()
2334
 
            graph = self.branch.repository.get_graph()
2335
 
            base_rev_id = graph.find_unique_lca(revision, old_tip)
2336
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2337
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2338
 
            result += merge.merge_inner(
2339
 
                                  self.branch,
2340
 
                                  other_tree,
2341
 
                                  base_tree,
2342
 
                                  this_tree=self,
2343
 
                                  change_reporter=change_reporter)
2344
 
        return result
 
2322
        return nb_conflicts
2345
2323
 
2346
2324
    def _write_hashcache_if_dirty(self):
2347
2325
        """Write out the hashcache if it is dirty."""