← 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-02 12:52:13 UTC
  • mto: (5008.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20100202125213-h08auwpb9zbtvjmb
Settle with --take-this and --take-other as action names.

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 (
912
912
            branch.last_revision().
913
913
        """
914
914
        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()
 
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()
945
952
        return conflicts
946
953
 
947
954
    @needs_read_lock
1598
1605
    @needs_write_lock
1599
1606
    def pull(self, source, overwrite=False, stop_revision=None,
1600
1607
             change_reporter=None, possible_transports=None, local=False):
 
1608
        top_pb = ui.ui_factory.nested_progress_bar()
1601
1609
        source.lock_read()
1602
1610
        try:
 
1611
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1612
            pp.next_phase()
1603
1613
            old_revision_info = self.branch.last_revision_info()
1604
1614
            basis_tree = self.basis_tree()
1605
1615
            count = self.branch.pull(source, overwrite, stop_revision,
1607
1617
                                     local=local)
1608
1618
            new_revision_info = self.branch.last_revision_info()
1609
1619
            if new_revision_info != old_revision_info:
 
1620
                pp.next_phase()
1610
1621
                repository = self.branch.repository
 
1622
                pb = ui.ui_factory.nested_progress_bar()
1611
1623
                basis_tree.lock_read()
1612
1624
                try:
1613
1625
                    new_basis_tree = self.branch.basis_tree()
1616
1628
                                new_basis_tree,
1617
1629
                                basis_tree,
1618
1630
                                this_tree=self,
1619
 
                                pb=None,
 
1631
                                pb=pb,
1620
1632
                                change_reporter=change_reporter)
1621
1633
                    basis_root_id = basis_tree.get_root_id()
1622
1634
                    new_root_id = new_basis_tree.get_root_id()
1623
1635
                    if basis_root_id != new_root_id:
1624
1636
                        self.set_root_id(new_root_id)
1625
1637
                finally:
 
1638
                    pb.finished()
1626
1639
                    basis_tree.unlock()
1627
1640
                # TODO - dedup parents list with things merged by pull ?
1628
1641
                # reuse the revisiontree we merged against to set the new
1641
1654
            return count
1642
1655
        finally:
1643
1656
            source.unlock()
 
1657
            top_pb.finished()
1644
1658
 
1645
1659
    @needs_write_lock
1646
1660
    def put_file_bytes_non_atomic(self, file_id, bytes):
1731
1745
        r"""Check whether the filename matches an ignore pattern.
1732
1746
 
1733
1747
        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.
 
1748
        others match against only the last component.
1737
1749
 
1738
1750
        If the file is ignored, returns the pattern which caused it to
1739
1751
        be ignored, otherwise None.  So this can simply be used as a
1740
1752
        boolean if desired."""
1741
1753
        if getattr(self, '_ignoreglobster', None) is None:
1742
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1754
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1743
1755
        return self._ignoreglobster.match(filename)
1744
1756
 
1745
1757
    def kind(self, file_id):
1893
1905
            # revision_id is set. We must check for this full string, because a
1894
1906
            # root node id can legitimately look like 'revision_id' but cannot
1895
1907
            # contain a '"'.
1896
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1908
            xml = self.branch.repository.get_inventory_xml(new_revision)
1897
1909
            firstline = xml.split('\n', 1)[0]
1898
1910
            if (not 'revision_id="' in firstline or
1899
1911
                'format="7"' not in firstline):
2055
2067
 
2056
2068
    @needs_tree_write_lock
2057
2069
    def revert(self, filenames=None, old_tree=None, backups=True,
2058
 
               pb=None, report_changes=False):
 
2070
               pb=DummyProgress(), report_changes=False):
2059
2071
        from bzrlib.conflicts import resolve
2060
2072
        if filenames == []:
2061
2073
            filenames = None
2250
2262
        # We MUST save it even if an error occurs, because otherwise the users
2251
2263
        # local work is unreferenced and will appear to have been lost.
2252
2264
        #
2253
 
        nb_conflicts = 0
 
2265
        result = 0
2254
2266
        try:
2255
2267
            last_rev = self.get_parent_ids()[0]
2256
2268
        except IndexError:
2260
2272
        else:
2261
2273
            if revision not in self.branch.revision_history():
2262
2274
                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
2275
        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
 
 
 
2276
            # merge tree state up to specified revision.
2285
2277
            basis = self.basis_tree()
2286
2278
            basis.lock_read()
2287
2279
            try:
 
2280
                to_tree = self.branch.repository.revision_tree(revision)
 
2281
                to_root_id = to_tree.get_root_id()
2288
2282
                if (basis.inventory.root is None
2289
2283
                    or basis.inventory.root.file_id != to_root_id):
2290
2284
                    self.set_root_id(to_root_id)
2291
2285
                    self.flush()
 
2286
                result += merge.merge_inner(
 
2287
                                      self.branch,
 
2288
                                      to_tree,
 
2289
                                      basis,
 
2290
                                      this_tree=self,
 
2291
                                      change_reporter=change_reporter)
 
2292
                self.set_last_revision(revision)
2292
2293
            finally:
2293
2294
                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
2295
            # TODO - dedup parents list with things merged by pull ?
2306
2296
            # reuse the tree we've updated to to set the basis:
2307
2297
            parent_trees = [(revision, to_tree)]
2314
2304
            for parent in merges:
2315
2305
                parent_trees.append(
2316
2306
                    (parent, self.branch.repository.revision_tree(parent)))
2317
 
            if not _mod_revision.is_null(old_tip):
 
2307
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2308
                parent_trees.append(
2319
2309
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2310
            self.set_parent_trees(parent_trees)
2321
2311
            last_rev = parent_trees[0][0]
2322
 
        return nb_conflicts
 
2312
        else:
 
2313
            # the working tree had the same last-revision as the master
 
2314
            # branch did. We may still have pivot local work from the local
 
2315
            # branch into old_tip:
 
2316
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2317
                self.add_parent_tree_id(old_tip)
 
2318
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2319
            and old_tip != last_rev):
 
2320
            # our last revision was not the prior branch last revision
 
2321
            # and we have converted that last revision to a pending merge.
 
2322
            # base is somewhere between the branch tip now
 
2323
            # and the now pending merge
 
2324
 
 
2325
            # Since we just modified the working tree and inventory, flush out
 
2326
            # the current state, before we modify it again.
 
2327
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2328
            #       requires it only because TreeTransform directly munges the
 
2329
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2330
            #       should be able to remove this extra flush.
 
2331
            self.flush()
 
2332
            graph = self.branch.repository.get_graph()
 
2333
            base_rev_id = graph.find_unique_lca(revision, old_tip)
 
2334
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2335
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2336
            result += merge.merge_inner(
 
2337
                                  self.branch,
 
2338
                                  other_tree,
 
2339
                                  base_tree,
 
2340
                                  this_tree=self,
 
2341
                                  change_reporter=change_reporter)
 
2342
        return result
2323
2343
 
2324
2344
    def _write_hashcache_if_dirty(self):
2325
2345
        """Write out the hashcache if it is dirty."""