/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2009-12-23 16:02:27 UTC
  • mto: (4597.3.46 description)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20091223160227-g74kl2zokg92zsmk
doc/es/user-guide/resolving_conflicts.txt is really the translation of
bzrlib/help-topics/en/conflicts.txt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 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
29
29
WorkingTree.open(dir).
30
30
"""
31
31
 
 
32
# TODO: Give the workingtree sole responsibility for the working inventory;
 
33
# remove the variable and references to it from the branch.  This may require
 
34
# updating the commit code so as to update the inventory within the working
 
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
 
36
# At the moment they may alias the inventory and have old copies of it in
 
37
# memory.  (Now done? -- mbp 20060309)
32
38
 
33
39
from cStringIO import StringIO
34
40
import os
77
83
 
78
84
from bzrlib import symbol_versioning
79
85
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
 
from bzrlib.lock import LogicalLockResult
81
86
from bzrlib.lockable_files import LockableFiles
82
87
from bzrlib.lockdir import LockDir
83
88
import bzrlib.mutabletree
96
101
from bzrlib.filters import filtered_input_file
97
102
from bzrlib.trace import mutter, note
98
103
from bzrlib.transport.local import LocalTransport
 
104
from bzrlib.progress import DummyProgress, ProgressPhase
99
105
from bzrlib.revision import CURRENT_REVISION
100
106
from bzrlib.rio import RioReader, rio_file, Stanza
101
107
from bzrlib.symbol_versioning import (
105
111
 
106
112
 
107
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
 
# TODO: Modifying the conflict objects or their type is currently nearly
109
 
# impossible as there is no clear relationship between the working tree format
110
 
# and the conflict list file format.
111
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
115
 
113
116
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
168
171
        return ''
169
172
 
170
173
 
171
 
class WorkingTree(bzrlib.mutabletree.MutableTree,
172
 
    bzrdir.ControlComponent):
 
174
class WorkingTree(bzrlib.mutabletree.MutableTree):
173
175
    """Working copy tree.
174
176
 
175
177
    The inventory is held in the `Branch` working-inventory, and the
248
250
        self._rules_searcher = None
249
251
        self.views = self._make_views()
250
252
 
251
 
    @property
252
 
    def user_transport(self):
253
 
        return self.bzrdir.user_transport
254
 
 
255
 
    @property
256
 
    def control_transport(self):
257
 
        return self._transport
258
 
 
259
253
    def _detect_case_handling(self):
260
254
        wt_trans = self.bzrdir.get_workingtree_transport(None)
261
255
        try:
915
909
            branch.last_revision().
916
910
        """
917
911
        from bzrlib.merge import Merger, Merge3Merger
918
 
        merger = Merger(self.branch, this_tree=self)
919
 
        # check that there are no local alterations
920
 
        if not force and self.has_changes():
921
 
            raise errors.UncommittedChanges(self)
922
 
        if to_revision is None:
923
 
            to_revision = _mod_revision.ensure_null(branch.last_revision())
924
 
        merger.other_rev_id = to_revision
925
 
        if _mod_revision.is_null(merger.other_rev_id):
926
 
            raise errors.NoCommits(branch)
927
 
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
928
 
        merger.other_basis = merger.other_rev_id
929
 
        merger.other_tree = self.branch.repository.revision_tree(
930
 
            merger.other_rev_id)
931
 
        merger.other_branch = branch
932
 
        if from_revision is None:
933
 
            merger.find_base()
934
 
        else:
935
 
            merger.set_base_revision(from_revision, branch)
936
 
        if merger.base_rev_id == merger.other_rev_id:
937
 
            raise errors.PointlessMerge
938
 
        merger.backup_files = False
939
 
        if merge_type is None:
940
 
            merger.merge_type = Merge3Merger
941
 
        else:
942
 
            merger.merge_type = merge_type
943
 
        merger.set_interesting_files(None)
944
 
        merger.show_base = False
945
 
        merger.reprocess = False
946
 
        conflicts = merger.do_merge()
947
 
        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()
948
949
        return conflicts
949
950
 
950
951
    @needs_read_lock
1097
1098
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1099
        if tree_transport.base != branch_transport.base:
1099
1100
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
 
                target_branch=new_branch)
 
1101
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1102
        else:
1103
1103
            tree_bzrdir = branch_bzrdir
1104
1104
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1142
        This does not include files that have been deleted in this
1143
1143
        tree. Skips the control directory.
1144
1144
 
1145
 
        :param include_root: if True, return an entry for the root
 
1145
        :param include_root: if True, do not return an entry for the root
1146
1146
        :param from_dir: start from this directory or None for the root
1147
1147
        :param recursive: whether to recurse into subdirectories or not
1148
1148
        """
1602
1602
    @needs_write_lock
1603
1603
    def pull(self, source, overwrite=False, stop_revision=None,
1604
1604
             change_reporter=None, possible_transports=None, local=False):
 
1605
        top_pb = ui.ui_factory.nested_progress_bar()
1605
1606
        source.lock_read()
1606
1607
        try:
 
1608
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
1609
            pp.next_phase()
1607
1610
            old_revision_info = self.branch.last_revision_info()
1608
1611
            basis_tree = self.basis_tree()
1609
1612
            count = self.branch.pull(source, overwrite, stop_revision,
1611
1614
                                     local=local)
1612
1615
            new_revision_info = self.branch.last_revision_info()
1613
1616
            if new_revision_info != old_revision_info:
 
1617
                pp.next_phase()
1614
1618
                repository = self.branch.repository
 
1619
                pb = ui.ui_factory.nested_progress_bar()
1615
1620
                basis_tree.lock_read()
1616
1621
                try:
1617
1622
                    new_basis_tree = self.branch.basis_tree()
1620
1625
                                new_basis_tree,
1621
1626
                                basis_tree,
1622
1627
                                this_tree=self,
1623
 
                                pb=None,
 
1628
                                pb=pb,
1624
1629
                                change_reporter=change_reporter)
1625
 
                    basis_root_id = basis_tree.get_root_id()
1626
 
                    new_root_id = new_basis_tree.get_root_id()
1627
 
                    if basis_root_id != new_root_id:
1628
 
                        self.set_root_id(new_root_id)
 
1630
                    if (basis_tree.inventory.root is None and
 
1631
                        new_basis_tree.inventory.root is not None):
 
1632
                        self.set_root_id(new_basis_tree.get_root_id())
1629
1633
                finally:
 
1634
                    pb.finished()
1630
1635
                    basis_tree.unlock()
1631
1636
                # TODO - dedup parents list with things merged by pull ?
1632
1637
                # reuse the revisiontree we merged against to set the new
1645
1650
            return count
1646
1651
        finally:
1647
1652
            source.unlock()
 
1653
            top_pb.finished()
1648
1654
 
1649
1655
    @needs_write_lock
1650
1656
    def put_file_bytes_non_atomic(self, file_id, bytes):
1735
1741
        r"""Check whether the filename matches an ignore pattern.
1736
1742
 
1737
1743
        Patterns containing '/' or '\' need to match the whole path;
1738
 
        others match against only the last component.  Patterns starting
1739
 
        with '!' are ignore exceptions.  Exceptions take precedence
1740
 
        over regular patterns and cause the filename to not be ignored.
 
1744
        others match against only the last component.
1741
1745
 
1742
1746
        If the file is ignored, returns the pattern which caused it to
1743
1747
        be ignored, otherwise None.  So this can simply be used as a
1744
1748
        boolean if desired."""
1745
1749
        if getattr(self, '_ignoreglobster', None) is None:
1746
 
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
 
1750
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1751
        return self._ignoreglobster.match(filename)
1748
1752
 
1749
1753
    def kind(self, file_id):
1799
1803
            raise errors.ObjectNotLocked(self)
1800
1804
 
1801
1805
    def lock_read(self):
1802
 
        """Lock the tree for reading.
1803
 
 
1804
 
        This also locks the branch, and can be unlocked via self.unlock().
1805
 
 
1806
 
        :return: A bzrlib.lock.LogicalLockResult.
1807
 
        """
 
1806
        """See Branch.lock_read, and WorkingTree.unlock."""
1808
1807
        if not self.is_locked():
1809
1808
            self._reset_data()
1810
1809
        self.branch.lock_read()
1811
1810
        try:
1812
 
            self._control_files.lock_read()
1813
 
            return LogicalLockResult(self.unlock)
 
1811
            return self._control_files.lock_read()
1814
1812
        except:
1815
1813
            self.branch.unlock()
1816
1814
            raise
1817
1815
 
1818
1816
    def lock_tree_write(self):
1819
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1820
 
 
1821
 
        :return: A bzrlib.lock.LogicalLockResult.
1822
 
        """
 
1817
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1818
        if not self.is_locked():
1824
1819
            self._reset_data()
1825
1820
        self.branch.lock_read()
1826
1821
        try:
1827
 
            self._control_files.lock_write()
1828
 
            return LogicalLockResult(self.unlock)
 
1822
            return self._control_files.lock_write()
1829
1823
        except:
1830
1824
            self.branch.unlock()
1831
1825
            raise
1832
1826
 
1833
1827
    def lock_write(self):
1834
 
        """See MutableTree.lock_write, and WorkingTree.unlock.
1835
 
 
1836
 
        :return: A bzrlib.lock.LogicalLockResult.
1837
 
        """
 
1828
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1829
        if not self.is_locked():
1839
1830
            self._reset_data()
1840
1831
        self.branch.lock_write()
1841
1832
        try:
1842
 
            self._control_files.lock_write()
1843
 
            return LogicalLockResult(self.unlock)
 
1833
            return self._control_files.lock_write()
1844
1834
        except:
1845
1835
            self.branch.unlock()
1846
1836
            raise
1911
1901
            # revision_id is set. We must check for this full string, because a
1912
1902
            # root node id can legitimately look like 'revision_id' but cannot
1913
1903
            # contain a '"'.
1914
 
            xml = self.branch.repository._get_inventory_xml(new_revision)
 
1904
            xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1905
            firstline = xml.split('\n', 1)[0]
1916
1906
            if (not 'revision_id="' in firstline or
1917
1907
                'format="7"' not in firstline):
2073
2063
 
2074
2064
    @needs_tree_write_lock
2075
2065
    def revert(self, filenames=None, old_tree=None, backups=True,
2076
 
               pb=None, report_changes=False):
 
2066
               pb=DummyProgress(), report_changes=False):
2077
2067
        from bzrlib.conflicts import resolve
2078
2068
        if filenames == []:
2079
2069
            filenames = None
2201
2191
        """
2202
2192
        raise NotImplementedError(self.unlock)
2203
2193
 
2204
 
    _marker = object()
2205
 
 
2206
 
    def update(self, change_reporter=None, possible_transports=None,
2207
 
               revision=None, old_tip=_marker):
 
2194
    def update(self, change_reporter=None, possible_transports=None):
2208
2195
        """Update a working tree along its branch.
2209
2196
 
2210
2197
        This will update the branch if its bound too, which means we have
2228
2215
        - Merge current state -> basis tree of the master w.r.t. the old tree
2229
2216
          basis.
2230
2217
        - Do a 'normal' merge of the old branch basis if it is relevant.
2231
 
 
2232
 
        :param revision: The target revision to update to. Must be in the
2233
 
            revision history.
2234
 
        :param old_tip: If branch.update() has already been run, the value it
2235
 
            returned (old tip of the branch or None). _marker is used
2236
 
            otherwise.
2237
2218
        """
2238
2219
        if self.branch.get_bound_location() is not None:
2239
2220
            self.lock_write()
2240
 
            update_branch = (old_tip is self._marker)
 
2221
            update_branch = True
2241
2222
        else:
2242
2223
            self.lock_tree_write()
2243
2224
            update_branch = False
2245
2226
            if update_branch:
2246
2227
                old_tip = self.branch.update(possible_transports)
2247
2228
            else:
2248
 
                if old_tip is self._marker:
2249
 
                    old_tip = None
2250
 
            return self._update_tree(old_tip, change_reporter, revision)
 
2229
                old_tip = None
 
2230
            return self._update_tree(old_tip, change_reporter)
2251
2231
        finally:
2252
2232
            self.unlock()
2253
2233
 
2254
2234
    @needs_tree_write_lock
2255
 
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
 
2235
    def _update_tree(self, old_tip=None, change_reporter=None):
2256
2236
        """Update a tree to the master branch.
2257
2237
 
2258
2238
        :param old_tip: if supplied, the previous tip revision the branch,
2268
2248
        # We MUST save it even if an error occurs, because otherwise the users
2269
2249
        # local work is unreferenced and will appear to have been lost.
2270
2250
        #
2271
 
        nb_conflicts = 0
 
2251
        result = 0
2272
2252
        try:
2273
2253
            last_rev = self.get_parent_ids()[0]
2274
2254
        except IndexError:
2275
2255
            last_rev = _mod_revision.NULL_REVISION
2276
 
        if revision is None:
2277
 
            revision = self.branch.last_revision()
2278
 
 
2279
 
        old_tip = old_tip or _mod_revision.NULL_REVISION
2280
 
 
2281
 
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2282
 
            # the branch we are bound to was updated
2283
 
            # merge those changes in first
2284
 
            base_tree  = self.basis_tree()
2285
 
            other_tree = self.branch.repository.revision_tree(old_tip)
2286
 
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2287
 
                                             base_tree, this_tree=self,
2288
 
                                             change_reporter=change_reporter)
2289
 
            if nb_conflicts:
2290
 
                self.add_parent_tree((old_tip, other_tree))
2291
 
                trace.note('Rerun update after fixing the conflicts.')
2292
 
                return nb_conflicts
2293
 
 
2294
 
        if last_rev != _mod_revision.ensure_null(revision):
2295
 
            # the working tree is up to date with the branch
2296
 
            # we can merge the specified revision from master
2297
 
            to_tree = self.branch.repository.revision_tree(revision)
2298
 
            to_root_id = to_tree.get_root_id()
2299
 
 
 
2256
        if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
 
2257
            # merge tree state up to new branch tip.
2300
2258
            basis = self.basis_tree()
2301
2259
            basis.lock_read()
2302
2260
            try:
2303
 
                if (basis.inventory.root is None
2304
 
                    or basis.inventory.root.file_id != to_root_id):
2305
 
                    self.set_root_id(to_root_id)
 
2261
                to_tree = self.branch.basis_tree()
 
2262
                if basis.inventory.root is None:
 
2263
                    self.set_root_id(to_tree.get_root_id())
2306
2264
                    self.flush()
 
2265
                result += merge.merge_inner(
 
2266
                                      self.branch,
 
2267
                                      to_tree,
 
2268
                                      basis,
 
2269
                                      this_tree=self,
 
2270
                                      change_reporter=change_reporter)
2307
2271
            finally:
2308
2272
                basis.unlock()
2309
 
 
2310
 
            # determine the branch point
2311
 
            graph = self.branch.repository.get_graph()
2312
 
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2313
 
                                                last_rev)
2314
 
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2315
 
 
2316
 
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2317
 
                                             this_tree=self,
2318
 
                                             change_reporter=change_reporter)
2319
 
            self.set_last_revision(revision)
2320
2273
            # TODO - dedup parents list with things merged by pull ?
2321
2274
            # reuse the tree we've updated to to set the basis:
2322
 
            parent_trees = [(revision, to_tree)]
 
2275
            parent_trees = [(self.branch.last_revision(), to_tree)]
2323
2276
            merges = self.get_parent_ids()[1:]
2324
2277
            # Ideally we ask the tree for the trees here, that way the working
2325
2278
            # tree can decide whether to give us the entire tree or give us a
2329
2282
            for parent in merges:
2330
2283
                parent_trees.append(
2331
2284
                    (parent, self.branch.repository.revision_tree(parent)))
2332
 
            if not _mod_revision.is_null(old_tip):
 
2285
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2333
2286
                parent_trees.append(
2334
2287
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
2335
2288
            self.set_parent_trees(parent_trees)
2336
2289
            last_rev = parent_trees[0][0]
2337
 
        return nb_conflicts
 
2290
        else:
 
2291
            # the working tree had the same last-revision as the master
 
2292
            # branch did. We may still have pivot local work from the local
 
2293
            # branch into old_tip:
 
2294
            if (old_tip is not None and not _mod_revision.is_null(old_tip)):
 
2295
                self.add_parent_tree_id(old_tip)
 
2296
        if (old_tip is not None and not _mod_revision.is_null(old_tip)
 
2297
            and old_tip != last_rev):
 
2298
            # our last revision was not the prior branch last revision
 
2299
            # and we have converted that last revision to a pending merge.
 
2300
            # base is somewhere between the branch tip now
 
2301
            # and the now pending merge
 
2302
 
 
2303
            # Since we just modified the working tree and inventory, flush out
 
2304
            # the current state, before we modify it again.
 
2305
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 
2306
            #       requires it only because TreeTransform directly munges the
 
2307
            #       inventory and calls tree._write_inventory(). Ultimately we
 
2308
            #       should be able to remove this extra flush.
 
2309
            self.flush()
 
2310
            graph = self.branch.repository.get_graph()
 
2311
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
 
2312
                                                old_tip)
 
2313
            base_tree = self.branch.repository.revision_tree(base_rev_id)
 
2314
            other_tree = self.branch.repository.revision_tree(old_tip)
 
2315
            result += merge.merge_inner(
 
2316
                                  self.branch,
 
2317
                                  other_tree,
 
2318
                                  base_tree,
 
2319
                                  this_tree=self,
 
2320
                                  change_reporter=change_reporter)
 
2321
        return result
2338
2322
 
2339
2323
    def _write_hashcache_if_dirty(self):
2340
2324
        """Write out the hashcache if it is dirty."""
2651
2635
 
2652
2636
        In Format2 WorkingTrees we have a single lock for the branch and tree
2653
2637
        so lock_tree_write() degrades to lock_write().
2654
 
 
2655
 
        :return: An object with an unlock method which will release the lock
2656
 
            obtained.
2657
2638
        """
2658
2639
        self.branch.lock_write()
2659
2640
        try:
2660
 
            self._control_files.lock_write()
2661
 
            return self
 
2641
            return self._control_files.lock_write()
2662
2642
        except:
2663
2643
            self.branch.unlock()
2664
2644
            raise