/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5630.2.2 by John Arbash Meinel
Start fleshing out the design. Something weird is causing my tests to all fail.
1
# Copyright (C) 2005-2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
453 by Martin Pool
- Split WorkingTree into its own file
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
453 by Martin Pool
- Split WorkingTree into its own file
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
453 by Martin Pool
- Split WorkingTree into its own file
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
453 by Martin Pool
- Split WorkingTree into its own file
16
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
17
"""WorkingTree object and friends.
18
19
A WorkingTree represents the editable working copy of a branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files.  The WorkingTree has an inventory
22
which is updated by these operations.  A commit produces a
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
23
new revision based on the workingtree and its inventory.
24
25
At the moment every WorkingTree has its own branch.  Remote
26
WorkingTrees aren't supported.
27
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
28
To get a WorkingTree, call bzrdir.open_workingtree() or
29
WorkingTree.open(dir).
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
30
"""
31
956 by Martin Pool
doc
32
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
33
from cStringIO import StringIO
34
import os
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
35
import sys
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
36
37
from bzrlib.lazy_import import lazy_import
38
lazy_import(globals(), """
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
39
from bisect import bisect_left
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
40
import collections
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
41
import errno
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
42
import itertools
43
import operator
1398 by Robert Collins
integrate in Gustavos x-bit patch
44
import stat
2120.7.5 by Aaron Bentley
Merge bzr.dev
45
import re
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
46
1836.1.21 by John Arbash Meinel
Restore the ability to ignore items by modifying DEFAULT_IGNORE
47
import bzrlib
1731.2.17 by Aaron Bentley
Support extracting with checkouts
48
from bzrlib import (
49
    branch,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
50
    bzrdir,
51
    conflicts as _mod_conflicts,
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
52
    controldir,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
53
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
54
    generate_ids,
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
55
    globbing,
4454.3.67 by John Arbash Meinel
Implement RevisionTree.annotate_iter and WT.annotate_iter
56
    graph as _mod_graph,
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
57
    hashcache,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
58
    ignores,
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
59
    inventory,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
60
    merge,
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
61
    registry,
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
62
    revision as _mod_revision,
1908.11.5 by John Arbash Meinel
[merge] bzr.dev 2240
63
    revisiontree,
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
64
    trace,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
65
    transform,
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
66
    transport,
2323.6.2 by Martin Pool
Move responsibility for suggesting upgrades to ui object
67
    ui,
3586.1.3 by Ian Clatworthy
add views attribute to working trees
68
    views,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
69
    xml5,
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
70
    xml7,
1731.2.17 by Aaron Bentley
Support extracting with checkouts
71
    )
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
72
from bzrlib.workingtree_4 import (
5582.10.72 by Jelmer Vernooij
Some test fixes.
73
    WorkingTreeFormat4,
74
    WorkingTreeFormat5,
4210.4.2 by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6
75
    WorkingTreeFormat6,
76
    )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
77
""")
78
1986.5.6 by Robert Collins
Merge bzr.dev.
79
from bzrlib import symbol_versioning
1534.4.28 by Robert Collins
first cut at merge from integration.
80
from bzrlib.decorators import needs_read_lock, needs_write_lock
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
81
from bzrlib.lock import LogicalLockResult
3834.2.1 by Martin Pool
Remove dead exports
82
from bzrlib.lockable_files import LockableFiles
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
83
from bzrlib.lockdir import LockDir
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
84
import bzrlib.mutabletree
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
85
from bzrlib.mutabletree import needs_tree_write_lock
2949.6.2 by Alexander Belchenko
more changes osutils.lstat -> os.lstat
86
from bzrlib import osutils
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
87
from bzrlib.osutils import (
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
88
    file_kind,
89
    isdir,
2206.1.8 by Marius Kruger
Converted move/rename error messages to show source => target.
90
    normpath,
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
91
    pathjoin,
2206.1.8 by Marius Kruger
Converted move/rename error messages to show source => target.
92
    realpath,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
93
    safe_unicode,
94
    splitpath,
95
    supports_executable,
96
    )
3368.2.4 by Ian Clatworthy
make content filter lookup a tree responsibility
97
from bzrlib.filters import filtered_input_file
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
98
from bzrlib.trace import mutter, note
99
from bzrlib.transport.local import LocalTransport
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
100
from bzrlib.revision import CURRENT_REVISION
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
101
from bzrlib.rio import RioReader, rio_file, Stanza
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
102
from bzrlib.symbol_versioning import (
103
    deprecated_passed,
104
    DEPRECATED_PARAMETER,
105
    )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
106
107
108
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
4597.3.48 by Vincent Ladeuil
Start cleaning BRANCH.TODO by pushing changes to either the python modules or the documentation.
109
# TODO: Modifying the conflict objects or their type is currently nearly
110
# impossible as there is no clear relationship between the working tree format
111
# and the conflict list file format.
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
112
CONFLICT_HEADER_1 = "BZR conflict list format 1"
1685.1.30 by John Arbash Meinel
PEP8 for workingtree.py
113
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
114
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
115
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
116
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
117
class TreeEntry(object):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
118
    """An entry that implements the minimum interface used by commands.
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
119
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
120
    This needs further inspection, it may be better to have
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
121
    InventoryEntries without ids - though that seems wrong. For now,
122
    this is a parallel hierarchy to InventoryEntry, and needs to become
123
    one of several things: decorates to that hierarchy, children of, or
124
    parents of it.
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
125
    Another note is that these objects are currently only used when there is
126
    no InventoryEntry available - i.e. for unversioned objects.
127
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
128
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
129
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
130
    def __eq__(self, other):
131
        # yes, this us ugly, TODO: best practice __eq__ style.
132
        return (isinstance(other, TreeEntry)
133
                and other.__class__ == self.__class__)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
134
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
135
    def kind_character(self):
136
        return "???"
137
138
139
class TreeDirectory(TreeEntry):
140
    """See TreeEntry. This is a directory in a working tree."""
141
142
    def __eq__(self, other):
143
        return (isinstance(other, TreeDirectory)
144
                and other.__class__ == self.__class__)
145
146
    def kind_character(self):
147
        return "/"
148
149
150
class TreeFile(TreeEntry):
151
    """See TreeEntry. This is a regular file in a working tree."""
152
153
    def __eq__(self, other):
154
        return (isinstance(other, TreeFile)
155
                and other.__class__ == self.__class__)
156
157
    def kind_character(self):
158
        return ''
159
160
161
class TreeLink(TreeEntry):
162
    """See TreeEntry. This is a symlink in a working tree."""
163
164
    def __eq__(self, other):
165
        return (isinstance(other, TreeLink)
166
                and other.__class__ == self.__class__)
167
168
    def kind_character(self):
169
        return ''
170
171
5158.6.5 by Martin Pool
Implement ControlComponent on WorkingTree
172
class WorkingTree(bzrlib.mutabletree.MutableTree,
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
173
    controldir.ControlComponent):
453 by Martin Pool
- Split WorkingTree into its own file
174
    """Working copy tree.
175
176
    The inventory is held in the `Branch` working-inventory, and the
177
    files are in a directory on disk.
178
179
    It is possible for a `WorkingTree` to have a filename which is
180
    not listed in the Inventory and vice versa.
5335.1.1 by Robert Collins
Document the basedir on WorkingTree.
181
5335.1.2 by Robert Collins
Add note that basedir is a unicode object as per John's review.
182
    :ivar basedir: The root of the tree on disk. This is a unicode path object
183
        (as opposed to a URL).
453 by Martin Pool
- Split WorkingTree into its own file
184
    """
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
185
3586.1.3 by Ian Clatworthy
add views attribute to working trees
186
    # override this to set the strategy for storing views
187
    def _make_views(self):
188
        return views.DisabledViews(self)
189
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
190
    def __init__(self, basedir='.',
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
191
                 branch=DEPRECATED_PARAMETER,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
192
                 _inventory=None,
193
                 _control_files=None,
194
                 _internal=False,
195
                 _format=None,
196
                 _bzrdir=None):
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
197
        """Construct a WorkingTree instance. This is not a public API.
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
198
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
199
        :param branch: A branch to override probing for the branch.
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
200
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
201
        self._format = _format
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
202
        self.bzrdir = _bzrdir
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
203
        if not _internal:
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
204
            raise errors.BzrError("Please use bzrdir.open_workingtree or "
205
                "WorkingTree.open() to obtain a WorkingTree.")
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
206
        basedir = safe_unicode(basedir)
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
207
        mutter("opening working tree %r", basedir)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
208
        if deprecated_passed(branch):
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
209
            self._branch = branch
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
210
        else:
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
211
            self._branch = self.bzrdir.open_branch()
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
212
        self.basedir = realpath(basedir)
5582.9.4 by Jelmer Vernooij
Remove hack for loading version 2 working trees from WorkingTree.
213
        self._control_files = _control_files
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
214
        self._transport = self._control_files._transport
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
215
        # update the whole cache up front and write to disk if anything changed;
216
        # in the future we might want to do this more selectively
1467 by Robert Collins
WorkingTree.__del__ has been removed.
217
        # two possible ways offer themselves : in self._unlock, write the cache
218
        # if needed, or, when the cache sees a change, append it to the hash
219
        # cache file, and have the parser take the most recent entry for a
220
        # given path only.
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
221
        wt_trans = self.bzrdir.get_workingtree_transport(None)
222
        cache_filename = wt_trans.local_abspath('stat-cache')
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
223
        self._hashcache = hashcache.HashCache(basedir, cache_filename,
3368.2.27 by Ian Clatworthy
merge bzr.dev r3564
224
            self.bzrdir._get_file_mode(),
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
225
            self._content_filter_stack_provider())
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
226
        hc = self._hashcache
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
227
        hc.read()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
228
        # is this scan needed ? it makes things kinda slow.
1732.1.20 by John Arbash Meinel
hash cache pre-scan cost us ~500ms on a kernel sized tree
229
        #hc.scan()
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
230
231
        if hc.needs_write:
232
            mutter("write hc")
233
            hc.write()
453 by Martin Pool
- Split WorkingTree into its own file
234
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
235
        if _inventory is None:
2334.1.1 by John Arbash Meinel
Lazily read working inventory in workingtree.py,
236
            # This will be acquired on lock_read() or lock_write()
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
237
            self._inventory_is_modified = False
2334.1.1 by John Arbash Meinel
Lazily read working inventory in workingtree.py,
238
            self._inventory = None
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
239
        else:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
240
            # the caller of __init__ has provided an inventory,
241
            # we assume they know what they are doing - as its only
242
            # the Format factory and creation methods that are
243
            # permitted to do this.
244
            self._set_inventory(_inventory, dirty=False)
3034.4.3 by Aaron Bentley
Add case-sensitivity handling to WorkingTree
245
        self._detect_case_handling()
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
246
        self._rules_searcher = None
3586.1.3 by Ian Clatworthy
add views attribute to working trees
247
        self.views = self._make_views()
3034.4.3 by Aaron Bentley
Add case-sensitivity handling to WorkingTree
248
5158.6.5 by Martin Pool
Implement ControlComponent on WorkingTree
249
    @property
250
    def user_transport(self):
251
        return self.bzrdir.user_transport
252
253
    @property
254
    def control_transport(self):
255
        return self._transport
256
5699.2.1 by Jelmer Vernooij
Move is_control_filename() from Tree to MutableTree.
257
    def is_control_filename(self, filename):
258
        """True if filename is the name of a control file in this tree.
259
260
        :param filename: A filename within the tree. This is a relative path
261
        from the root of this tree.
262
263
        This is true IF and ONLY IF the filename is part of the meta data
264
        that bzr controls in this tree. I.E. a random .bzr directory placed
265
        on disk will not be a control file for this tree.
266
        """
267
        return self.bzrdir.is_control_filename(filename)
268
3034.4.3 by Aaron Bentley
Add case-sensitivity handling to WorkingTree
269
    def _detect_case_handling(self):
270
        wt_trans = self.bzrdir.get_workingtree_transport(None)
271
        try:
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
272
            wt_trans.stat(self._format.case_sensitive_filename)
3034.4.4 by Aaron Bentley
Fix case-sensitivity detection
273
        except errors.NoSuchFile:
3034.4.3 by Aaron Bentley
Add case-sensitivity handling to WorkingTree
274
            self.case_sensitive = True
275
        else:
276
            self.case_sensitive = False
1185.60.6 by Aaron Bentley
Fixed hashcache
277
2974.2.2 by John Arbash Meinel
Only one test failed, because it was incorrectly succeeding.
278
        self._setup_directory_is_tree_reference()
279
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
280
    branch = property(
281
        fget=lambda self: self._branch,
282
        doc="""The branch this WorkingTree is connected to.
283
284
            This cannot be set - it is reflective of the actual disk structure
285
            the working tree has been constructed from.
286
            """)
287
1687.1.9 by Robert Collins
Teach WorkingTree about break-lock.
288
    def break_lock(self):
289
        """Break a lock if one is present from another instance.
290
291
        Uses the ui factory to ask for confirmation if the lock may be from
292
        an active process.
293
294
        This will probe the repository for its lock as well.
295
        """
296
        self._control_files.break_lock()
297
        self.branch.break_lock()
298
4332.3.2 by Robert Collins
Extract repository access in WorkingTree._check to be data driven, adding a new _get_check_refs method to support this.
299
    def _get_check_refs(self):
300
        """Return the references needed to perform a check of this tree.
301
        
302
        The default implementation returns no refs, and is only suitable for
303
        trees that have no local caching and can commit on ghosts at any time.
304
305
        :seealso: bzrlib.check for details about check_refs.
306
        """
307
        return []
308
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
309
    def requires_rich_root(self):
310
        return self._format.requires_rich_root
311
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
312
    def supports_tree_reference(self):
2255.2.232 by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities.
313
        return False
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
314
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
315
    def supports_content_filtering(self):
316
        return self._format.supports_content_filtering()
317
3586.1.3 by Ian Clatworthy
add views attribute to working trees
318
    def supports_views(self):
319
        return self.views.supports_views()
320
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
321
    def _set_inventory(self, inv, dirty):
322
        """Set the internal cached inventory.
323
324
        :param inv: The inventory to set.
325
        :param dirty: A boolean indicating whether the inventory is the same
326
            logical inventory as whats on disk. If True the inventory is not
327
            the same and should be written to disk or data will be lost, if
328
            False then the inventory is the same as that on disk and any
329
            serialisation would be unneeded overhead.
330
        """
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
331
        self._inventory = inv
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
332
        self._inventory_is_modified = dirty
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
333
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
334
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
335
    def open(path=None, _unsupported=False):
336
        """Open an existing working tree at path.
337
338
        """
339
        if path is None:
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
340
            path = osutils.getcwd()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
341
        control = bzrdir.BzrDir.open(path, _unsupported)
342
        return control.open_workingtree(_unsupported)
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
343
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
344
    @staticmethod
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
345
    def open_containing(path=None):
346
        """Open an existing working tree which has its root about path.
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
347
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
348
        This probes for a working tree at path and searches upwards from there.
349
350
        Basically we keep looking up until we find the control directory or
351
        run into /.  If there isn't one, raises NotBranchError.
352
        TODO: give this a new exception.
353
        If there is one, it is returned, along with the unused portion of path.
1685.1.27 by John Arbash Meinel
BzrDir works in URLs, but WorkingTree works in unicode paths
354
355
        :return: The WorkingTree that contains 'path', and the rest of path
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
356
        """
357
        if path is None:
1830.3.14 by John Arbash Meinel
WorkingTree.open_containing() was directly calling os.getcwdu(), which on mac returns the wrong normalization, and on win32 would have the wrong slashes
358
            path = osutils.getcwd()
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
359
        control, relpath = bzrdir.BzrDir.open_containing(path)
360
        return control.open_workingtree(), relpath
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
361
362
    @staticmethod
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
363
    def open_containing_paths(file_list, default_directory=None,
364
                              canonicalize=True, apply_view=True):
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
365
        """Open the WorkingTree that contains a set of paths.
366
367
        Fail if the paths given are not all in a single tree.
368
369
        This is used for the many command-line interfaces that take a list of
370
        any number of files and that require they all be in the same tree.
371
        """
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
372
        if default_directory is None:
373
            default_directory = u'.'
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
374
        # recommended replacement for builtins.internal_tree_files
375
        if file_list is None or len(file_list) == 0:
376
            tree = WorkingTree.open_containing(default_directory)[0]
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
377
            # XXX: doesn't really belong here, and seems to have the strange
378
            # side effect of making it return a bunch of files, not the whole
379
            # tree -- mbp 20100716
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
380
            if tree.supports_views() and apply_view:
381
                view_files = tree.views.lookup_view()
382
                if view_files:
383
                    file_list = view_files
384
                    view_str = views.view_display_str(view_files)
385
                    note("Ignoring files outside view. View is %s" % view_str)
386
            return tree, file_list
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
387
        if default_directory == u'.':
388
            seed = file_list[0]
389
        else:
390
            seed = default_directory
391
            file_list = [osutils.pathjoin(default_directory, f)
392
                         for f in file_list]
393
        tree = WorkingTree.open_containing(seed)[0]
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
394
        return tree, tree.safe_relpath_files(file_list, canonicalize,
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
395
                                             apply_view=apply_view)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
396
397
    def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
398
        """Convert file_list into a list of relpaths in tree.
399
400
        :param self: A tree to operate on.
401
        :param file_list: A list of user provided paths or None.
402
        :param apply_view: if True and a view is set, apply it or check that
403
            specified files are within it
404
        :return: A list of relative paths.
405
        :raises errors.PathNotChild: When a provided path is in a different self
406
            than self.
407
        """
408
        if file_list is None:
409
            return None
410
        if self.supports_views() and apply_view:
411
            view_files = self.views.lookup_view()
412
        else:
413
            view_files = []
414
        new_list = []
415
        # self.relpath exists as a "thunk" to osutils, but canonical_relpath
416
        # doesn't - fix that up here before we enter the loop.
417
        if canonicalize:
418
            fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
419
        else:
420
            fixer = self.relpath
421
        for filename in file_list:
5346.4.3 by Martin Pool
PathNotChild should not give a traceback.
422
            relpath = fixer(osutils.dereference_path(filename))
423
            if view_files and not osutils.is_inside_any(view_files, relpath):
424
                raise errors.FileOutsideView(filename, view_files)
425
            new_list.append(relpath)
5346.4.2 by Martin Pool
Move internal_tree_files and safe_relpath_files onto WorkingTree
426
        return new_list
427
428
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
429
    def open_downlevel(path=None):
430
        """Open an unsupported working tree.
431
432
        Only intended for advanced situations like upgrading part of a bzrdir.
433
        """
434
        return WorkingTree.open(path, _unsupported=True)
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
435
3140.1.4 by Aaron Bentley
Add WorkingTree.find_trees
436
    @staticmethod
437
    def find_trees(location):
438
        def list_current(transport):
439
            return [d for d in transport.list_dir('') if d != '.bzr']
440
        def evaluate(bzrdir):
441
            try:
442
                tree = bzrdir.open_workingtree()
443
            except errors.NoWorkingTree:
444
                return True, None
445
            else:
446
                return True, tree
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
447
        t = transport.get_transport(location)
448
        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
3140.1.4 by Aaron Bentley
Add WorkingTree.find_trees
449
                                              list_current=list_current)
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
450
        return [tr for tr in iterator if tr is not None]
3140.1.4 by Aaron Bentley
Add WorkingTree.find_trees
451
2255.2.170 by Martin Pool
merge dirstate
452
    # should be deprecated - this is slow and in any case treating them as a
453
    # container is (we now know) bad style -- mbp 20070302
454
    ## @deprecated_method(zero_fifteen)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
455
    def __iter__(self):
456
        """Iterate through file_ids for this tree.
457
458
        file_ids are in a WorkingTree if they are in the working inventory
459
        and the working file exists.
460
        """
461
        inv = self._inventory
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
462
        for path, ie in inv.iter_entries():
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
463
            if osutils.lexists(self.abspath(path)):
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
464
                yield ie.file_id
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
465
3146.8.16 by Aaron Bentley
Updates from review
466
    def all_file_ids(self):
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
467
        """See Tree.iter_all_file_ids"""
3146.8.16 by Aaron Bentley
Updates from review
468
        return set(self.inventory)
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
469
453 by Martin Pool
- Split WorkingTree into its own file
470
    def __repr__(self):
471
        return "<%s of %s>" % (self.__class__.__name__,
954 by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly
472
                               getattr(self, 'basedir', None))
453 by Martin Pool
- Split WorkingTree into its own file
473
474
    def abspath(self, filename):
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
475
        return pathjoin(self.basedir, filename)
2292.1.30 by Marius Kruger
* Minor text fixes.
476
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
477
    def basis_tree(self):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
478
        """Return RevisionTree for the current last revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
479
1927.2.3 by Robert Collins
review comment application - paired with Martin.
480
        If the left most parent is a ghost then the returned tree will be an
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
481
        empty tree - one obtained by calling
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
482
        repository.revision_tree(NULL_REVISION).
1927.2.3 by Robert Collins
review comment application - paired with Martin.
483
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
484
        try:
485
            revision_id = self.get_parent_ids()[0]
486
        except IndexError:
487
            # no parents, return an empty revision tree.
488
            # in the future this should return the tree for
489
            # 'empty:' - the implicit root empty tree.
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
490
            return self.branch.repository.revision_tree(
491
                       _mod_revision.NULL_REVISION)
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
492
        try:
493
            return self.revision_tree(revision_id)
494
        except errors.NoSuchRevision:
495
            pass
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
496
        # No cached copy available, retrieve from the repository.
497
        # FIXME? RBC 20060403 should we cache the inventory locally
498
        # at this point ?
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
499
        try:
500
            return self.branch.repository.revision_tree(revision_id)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
501
        except (errors.RevisionNotPresent, errors.NoSuchRevision):
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
502
            # the basis tree *may* be a ghost or a low level error may have
4031.3.1 by Frank Aspell
Fixing various typos
503
            # occurred. If the revision is present, its a problem, if its not
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
504
            # its a ghost.
505
            if self.branch.repository.has_revision(revision_id):
506
                raise
1927.2.3 by Robert Collins
review comment application - paired with Martin.
507
            # the basis tree is a ghost so return an empty tree.
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
508
            return self.branch.repository.revision_tree(
509
                       _mod_revision.NULL_REVISION)
453 by Martin Pool
- Split WorkingTree into its own file
510
2665.3.2 by Daniel Watkins
Created _cleanup() method in WorkingTree.
511
    def _cleanup(self):
512
        self._flush_ignore_list_cache()
513
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
514
    def relpath(self, path):
515
        """Return the local path portion from a given path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
516
517
        The path may be absolute or relative. If its a relative path it is
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
518
        interpreted relative to the python current working directory.
519
        """
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
520
        return osutils.relpath(self.basedir, path)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
521
453 by Martin Pool
- Split WorkingTree into its own file
522
    def has_filename(self, filename):
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
523
        return osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
524
3368.2.11 by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py
525
    def get_file(self, file_id, path=None, filtered=True):
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
526
        return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
3709.3.2 by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat.
527
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
528
    def get_file_with_stat(self, file_id, path=None, filtered=True,
529
        _fstat=os.fstat):
4354.4.7 by Aaron Bentley
Move MutableTree.get_file_with_stat to Tree.get_file_with_stat.
530
        """See Tree.get_file_with_stat."""
2743.3.3 by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path
531
        if path is None:
532
            path = self.id2path(file_id)
3368.2.41 by Ian Clatworthy
1st cut merge of bzr.dev r3907
533
        file_obj = self.get_file_byname(path, filtered=False)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
534
        stat_value = _fstat(file_obj.fileno())
4413.4.3 by John Arbash Meinel
Move the boolean check to the first part of the if statement
535
        if filtered and self.supports_content_filtering():
3368.2.46 by Ian Clatworthy
minor fix
536
            filters = self._content_filter_stack(path)
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
537
            file_obj = filtered_input_file(file_obj, filters)
538
        return (file_obj, stat_value)
453 by Martin Pool
- Split WorkingTree into its own file
539
3368.2.41 by Ian Clatworthy
1st cut merge of bzr.dev r3907
540
    def get_file_text(self, file_id, path=None, filtered=True):
5236.1.1 by Tim Penhey
Close the file after read.
541
        my_file = self.get_file(file_id, path=path, filtered=filtered)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
542
        try:
5236.1.1 by Tim Penhey
Close the file after read.
543
            return my_file.read()
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
544
        finally:
5236.1.1 by Tim Penhey
Close the file after read.
545
            my_file.close()
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
546
3368.2.11 by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py
547
    def get_file_byname(self, filename, filtered=True):
3368.2.1 by Ian Clatworthy
first cut at working tree content filtering
548
        path = self.abspath(filename)
3368.2.11 by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py
549
        f = file(path, 'rb')
4413.4.3 by John Arbash Meinel
Move the boolean check to the first part of the if statement
550
        if filtered and self.supports_content_filtering():
3368.2.11 by Ian Clatworthy
add filtered option to get_file and get_file_byname in workingtree.py
551
            filters = self._content_filter_stack(filename)
552
            return filtered_input_file(f, filters)
553
        else:
554
            return f
453 by Martin Pool
- Split WorkingTree into its own file
555
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
556
    def get_file_lines(self, file_id, path=None, filtered=True):
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
557
        """See Tree.get_file_lines()"""
3368.2.45 by Ian Clatworthy
add and use supports_content_filtering API
558
        file = self.get_file(file_id, path, filtered=filtered)
3774.1.4 by Aaron Bentley
Use file.readlines on working trees.
559
        try:
560
            return file.readlines()
561
        finally:
562
            file.close()
563
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
564
    @needs_read_lock
1551.15.46 by Aaron Bentley
Move plan merge to tree
565
    def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
566
        """See Tree.annotate_iter
567
568
        This implementation will use the basis tree implementation if possible.
569
        Lines not in the basis are attributed to CURRENT_REVISION
570
571
        If there are pending merges, lines added by those merges will be
572
        incorrectly attributed to CURRENT_REVISION (but after committing, the
573
        attribution will be correct).
574
        """
4454.3.67 by John Arbash Meinel
Implement RevisionTree.annotate_iter and WT.annotate_iter
575
        maybe_file_parent_keys = []
576
        for parent_id in self.get_parent_ids():
577
            try:
578
                parent_tree = self.revision_tree(parent_id)
579
            except errors.NoSuchRevisionInTree:
580
                parent_tree = self.branch.repository.revision_tree(parent_id)
581
            parent_tree.lock_read()
582
            try:
583
                if file_id not in parent_tree:
2255.2.238 by Robert Collins
Fix annotate_iter to lock the basis tree appropriately.
584
                    continue
4454.3.67 by John Arbash Meinel
Implement RevisionTree.annotate_iter and WT.annotate_iter
585
                ie = parent_tree.inventory[file_id]
4454.3.68 by John Arbash Meinel
Add some tests that we can handle doing annotations even when
586
                if ie.kind != 'file':
587
                    # Note: this is slightly unnecessary, because symlinks and
588
                    # directories have a "text" which is the empty text, and we
589
                    # know that won't mess up annotations. But it seems cleaner
590
                    continue
4454.3.67 by John Arbash Meinel
Implement RevisionTree.annotate_iter and WT.annotate_iter
591
                parent_text_key = (file_id, ie.revision)
592
                if parent_text_key not in maybe_file_parent_keys:
593
                    maybe_file_parent_keys.append(parent_text_key)
594
            finally:
595
                parent_tree.unlock()
596
        graph = _mod_graph.Graph(self.branch.repository.texts)
597
        heads = graph.heads(maybe_file_parent_keys)
598
        file_parent_keys = []
599
        for key in maybe_file_parent_keys:
600
            if key in heads:
601
                file_parent_keys.append(key)
602
603
        # Now we have the parents of this content
604
        annotator = self.branch.repository.texts.get_annotator()
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
605
        text = self.get_file_text(file_id)
4454.3.67 by John Arbash Meinel
Implement RevisionTree.annotate_iter and WT.annotate_iter
606
        this_key =(file_id, default_revision)
607
        annotator.add_special_text(this_key, file_parent_keys, text)
608
        annotations = [(key[-1], line)
609
                       for key, line in annotator.annotate_flat(this_key)]
610
        return annotations
1551.9.18 by Aaron Bentley
Updates from review comments
611
1551.15.46 by Aaron Bentley
Move plan merge to tree
612
    def _get_ancestors(self, default_revision):
613
        ancestors = set([default_revision])
614
        for parent_id in self.get_parent_ids():
615
            ancestors.update(self.branch.repository.get_ancestry(
616
                             parent_id, topo_sorted=False))
617
        return ancestors
618
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
619
    def get_parent_ids(self):
620
        """See Tree.get_parent_ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
621
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
622
        This implementation reads the pending merges list and last_revision
623
        value and uses that to decide what the parents list should be.
624
        """
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
625
        last_rev = _mod_revision.ensure_null(self._last_revision())
2598.5.7 by Aaron Bentley
Updates from review
626
        if _mod_revision.NULL_REVISION == last_rev:
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
627
            parents = []
628
        else:
629
            parents = [last_rev]
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
630
        try:
4852.1.7 by John Arbash Meinel
Lots of tweaks in WorkingTree.
631
            merges_bytes = self._transport.get_bytes('pending-merges')
2206.1.7 by Marius Kruger
* errors
632
        except errors.NoSuchFile:
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
633
            pass
634
        else:
4852.1.9 by John Arbash Meinel
Minor typo fix.
635
            for l in osutils.split_lines(merges_bytes):
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
636
                revision_id = l.rstrip('\n')
2249.5.9 by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate
637
                parents.append(revision_id)
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
638
        return parents
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
639
1986.5.1 by Robert Collins
(Robert Collins, John Meinel) Change WorkingTree.get_root_id to not trigger read_working_inventory and instead use the one inside the current transaction.
640
    @needs_read_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
641
    def get_root_id(self):
642
        """Return the id of this trees root"""
1986.5.1 by Robert Collins
(Robert Collins, John Meinel) Change WorkingTree.get_root_id to not trigger read_working_inventory and instead use the one inside the current transaction.
643
        return self._inventory.root.file_id
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
644
453 by Martin Pool
- Split WorkingTree into its own file
645
    def _get_store_filename(self, file_id):
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
646
        ## XXX: badly named; this is not in the store at all
453 by Martin Pool
- Split WorkingTree into its own file
647
        return self.abspath(self.id2path(file_id))
648
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
649
    @needs_read_lock
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
650
    def clone(self, to_bzrdir, revision_id=None):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
651
        """Duplicate this working tree into to_bzr, including all state.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
652
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
653
        Specifically modified files are kept as modified, but
654
        ignored and unknown files are discarded.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
655
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
656
        If you want to make a new line of development, see bzrdir.sprout()
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
657
658
        revision
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
659
            If not None, the cloned tree will have its last revision set to
4031.3.1 by Frank Aspell
Fixing various typos
660
            revision, and difference between the source trees last revision
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
661
            and this one merged in.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
662
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
663
        # assumes the target bzr dir format is compatible.
3650.5.5 by Aaron Bentley
Make WorkingTree.clone use bzrdir's format
664
        result = to_bzrdir.create_workingtree()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
665
        self.copy_content_into(result, revision_id)
666
        return result
667
668
    @needs_read_lock
669
    def copy_content_into(self, tree, revision_id=None):
670
        """Copy the current content and user files of this tree into tree."""
1731.1.33 by Aaron Bentley
Revert no-special-root changes
671
        tree.set_root_id(self.get_root_id())
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
672
        if revision_id is None:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
673
            merge.transform_tree(tree, self)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
674
        else:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
675
            # TODO now merge from tree.last_revision to revision (to preserve
676
            # user local changes)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
677
            merge.transform_tree(tree, self)
1908.6.3 by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.
678
            tree.set_parent_ids([revision_id])
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
679
1248 by Martin Pool
- new weave based cleanup [broken]
680
    def id2abspath(self, file_id):
681
        return self.abspath(self.id2path(file_id))
682
1185.12.39 by abentley
Propogated has_or_had_id to Tree
683
    def has_id(self, file_id):
453 by Martin Pool
- Split WorkingTree into its own file
684
        # files that have been deleted are excluded
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
685
        inv = self.inventory
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
686
        if not inv.has_id(file_id):
453 by Martin Pool
- Split WorkingTree into its own file
687
            return False
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
688
        path = inv.id2path(file_id)
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
689
        return osutils.lexists(self.abspath(path))
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
690
1185.12.39 by abentley
Propogated has_or_had_id to Tree
691
    def has_or_had_id(self, file_id):
692
        if file_id == self.inventory.root.file_id:
693
            return True
694
        return self.inventory.has_id(file_id)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
695
696
    __contains__ = has_id
697
453 by Martin Pool
- Split WorkingTree into its own file
698
    def get_file_size(self, file_id):
3363.3.4 by Aaron Bentley
Add get_file_size to Tree interface
699
        """See Tree.get_file_size"""
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
700
        # XXX: this returns the on-disk size; it should probably return the
701
        # canonical size
3363.2.7 by Aaron Bentley
Implement alterntative-to-inventory tests
702
        try:
703
            return os.path.getsize(self.id2abspath(file_id))
704
        except OSError, e:
705
            if e.errno != errno.ENOENT:
706
                raise
707
            else:
708
                return None
453 by Martin Pool
- Split WorkingTree into its own file
709
1185.60.6 by Aaron Bentley
Fixed hashcache
710
    @needs_read_lock
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
711
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
712
        if not path:
713
            path = self._inventory.id2path(file_id)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
714
        return self._hashcache.get_sha1(path, stat_value)
453 by Martin Pool
- Split WorkingTree into its own file
715
1740.2.5 by Aaron Bentley
Merge from bzr.dev
716
    def get_file_mtime(self, file_id, path=None):
717
        if not path:
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
718
            path = self.inventory.id2path(file_id)
1740.2.5 by Aaron Bentley
Merge from bzr.dev
719
        return os.lstat(self.abspath(path)).st_mtime
720
2911.5.2 by John Arbash Meinel
Ensure that WT3 properly extracts the executable bit from the basis inventory.
721
    def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
722
        file_id = self.path2id(path)
4789.15.1 by John Arbash Meinel
Have a defined result for Tree.path_content_summary() for unversioned files.
723
        if file_id is None:
724
            # For unversioned files on win32, we just assume they are not
725
            # executable
726
            return False
2911.5.2 by John Arbash Meinel
Ensure that WT3 properly extracts the executable bit from the basis inventory.
727
        return self._inventory[file_id].executable
728
729
    def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
730
        mode = stat_result.st_mode
731
        return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
732
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
733
    if not supports_executable():
734
        def is_executable(self, file_id, path=None):
1398 by Robert Collins
integrate in Gustavos x-bit patch
735
            return self._inventory[file_id].executable
2911.5.2 by John Arbash Meinel
Ensure that WT3 properly extracts the executable bit from the basis inventory.
736
737
        _is_executable_from_path_and_stat = \
2911.5.4 by John Arbash Meinel
Switch around to properly look up the executable bit in the basis.
738
            _is_executable_from_path_and_stat_from_basis
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
739
    else:
740
        def is_executable(self, file_id, path=None):
741
            if not path:
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
742
                path = self.id2path(file_id)
1398 by Robert Collins
integrate in Gustavos x-bit patch
743
            mode = os.lstat(self.abspath(path)).st_mode
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
744
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1398 by Robert Collins
integrate in Gustavos x-bit patch
745
2911.5.2 by John Arbash Meinel
Ensure that WT3 properly extracts the executable bit from the basis inventory.
746
        _is_executable_from_path_and_stat = \
2911.5.4 by John Arbash Meinel
Switch around to properly look up the executable bit in the basis.
747
            _is_executable_from_path_and_stat_from_stat
2911.5.2 by John Arbash Meinel
Ensure that WT3 properly extracts the executable bit from the basis inventory.
748
2255.2.168 by Martin Pool
merge robert, debugging
749
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
750
    def _add(self, files, ids, kinds):
751
        """See MutableTree._add."""
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
752
        # TODO: Re-adding a file that is removed in the working copy
753
        # should probably put it back with the previous ID.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
754
        # the read and write working inventory should not occur in this
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
755
        # function - they should be part of lock_write and unlock.
2568.2.3 by Robert Collins
Fix WorkingTree(3).add to not reset the entire inventory but modify the existing one.
756
        inv = self.inventory
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
757
        for f, file_id, kind in zip(files, ids, kinds):
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
758
            if file_id is None:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
759
                inv.add_path(f, kind=kind)
760
            else:
761
                inv.add_path(f, kind=kind, file_id=file_id)
2568.2.3 by Robert Collins
Fix WorkingTree(3).add to not reset the entire inventory but modify the existing one.
762
            self._inventory_is_modified = True
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
763
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
764
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
765
    def _gather_kinds(self, files, kinds):
766
        """See MutableTree._gather_kinds."""
767
        for pos, f in enumerate(files):
768
            if kinds[pos] is None:
769
                fullpath = normpath(self.abspath(f))
770
                try:
771
                    kinds[pos] = file_kind(fullpath)
772
                except OSError, e:
773
                    if e.errno == errno.ENOENT:
2206.1.7 by Marius Kruger
* errors
774
                        raise errors.NoSuchFile(fullpath)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
775
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
776
    @needs_write_lock
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
777
    def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
778
        """Add revision_id as a parent.
779
780
        This is equivalent to retrieving the current list of parent ids
781
        and setting the list to its value plus revision_id.
782
783
        :param revision_id: The revision id to add to the parent list. It may
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
784
        be a ghost revision as long as its not the first parent to be added,
785
        or the allow_leftmost_as_ghost parameter is set True.
786
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
787
        """
1908.5.13 by Robert Collins
Adding a parent when the first is a ghost already should not require forcing it.
788
        parents = self.get_parent_ids() + [revision_id]
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
789
        self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
2206.1.7 by Marius Kruger
* errors
790
            or allow_leftmost_as_ghost)
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
791
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
792
    @needs_tree_write_lock
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
793
    def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
794
        """Add revision_id, tree tuple as a parent.
795
796
        This is equivalent to retrieving the current list of parent trees
797
        and setting the list to its value plus parent_tuple. See also
798
        add_parent_tree_id - if you only have a parent id available it will be
799
        simpler to use that api. If you have the parent already available, using
800
        this api is preferred.
801
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
802
        :param parent_tuple: The (revision id, tree) to add to the parent list.
803
            If the revision_id is a ghost, pass None for the tree.
804
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
805
        """
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
806
        parent_ids = self.get_parent_ids() + [parent_tuple[0]]
807
        if len(parent_ids) > 1:
808
            # the leftmost may have already been a ghost, preserve that if it
809
            # was.
810
            allow_leftmost_as_ghost = True
811
        self.set_parent_ids(parent_ids,
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
812
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
813
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
814
    @needs_tree_write_lock
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
815
    def add_pending_merge(self, *revision_ids):
816
        # TODO: Perhaps should check at this point that the
817
        # history of the revision is actually present?
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
818
        parents = self.get_parent_ids()
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
819
        updated = False
820
        for rev_id in revision_ids:
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
821
            if rev_id in parents:
822
                continue
823
            parents.append(rev_id)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
824
            updated = True
825
        if updated:
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
826
            self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
827
2949.6.2 by Alexander Belchenko
more changes osutils.lstat -> os.lstat
828
    def path_content_summary(self, path, _lstat=os.lstat,
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
829
        _mapper=osutils.file_kind_from_stat_mode):
830
        """See Tree.path_content_summary."""
831
        abspath = self.abspath(path)
832
        try:
833
            stat_result = _lstat(abspath)
834
        except OSError, e:
835
            if getattr(e, 'errno', None) == errno.ENOENT:
836
                # no file.
837
                return ('missing', None, None, None)
2776.1.9 by Robert Collins
Review feedback.
838
            # propagate other errors
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
839
            raise
840
        kind = _mapper(stat_result.st_mode)
841
        if kind == 'file':
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
842
            return self._file_content_summary(path, stat_result)
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
843
        elif kind == 'directory':
844
            # perhaps it looks like a plain directory, but it's really a
845
            # reference.
846
            if self._directory_is_tree_reference(path):
847
                kind = 'tree-reference'
848
            return kind, None, None, None
849
        elif kind == 'symlink':
4241.14.18 by Vincent Ladeuil
Use better fixes for unicode symlinks handling in WTs.
850
            target = osutils.readlink(abspath)
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
851
            return ('symlink', None, None, target)
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
852
        else:
853
            return (kind, None, None, None)
854
4595.11.11 by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size
855
    def _file_content_summary(self, path, stat_result):
856
        size = stat_result.st_size
857
        executable = self._is_executable_from_path_and_stat(path, stat_result)
858
        # try for a stat cache lookup
859
        return ('file', size, executable, self._sha_from_stat(
860
            path, stat_result))
861
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
862
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
863
        """Common ghost checking functionality from set_parent_*.
864
865
        This checks that the left hand-parent exists if there are any
866
        revisions present.
867
        """
868
        if len(revision_ids) > 0:
869
            leftmost_id = revision_ids[0]
870
            if (not allow_leftmost_as_ghost and not
871
                self.branch.repository.has_revision(leftmost_id)):
872
                raise errors.GhostRevisionUnusableHere(leftmost_id)
873
874
    def _set_merges_from_parent_ids(self, parent_ids):
875
        merges = parent_ids[1:]
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
876
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
877
            mode=self.bzrdir._get_file_mode())
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
878
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
879
    def _filter_parent_ids_by_ancestry(self, revision_ids):
880
        """Check that all merged revisions are proper 'heads'.
881
882
        This will always return the first revision_id, and any merged revisions
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
883
        which are
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
884
        """
885
        if len(revision_ids) == 0:
886
            return revision_ids
887
        graph = self.branch.repository.get_graph()
888
        heads = graph.heads(revision_ids)
889
        new_revision_ids = revision_ids[:1]
890
        for revision_id in revision_ids[1:]:
891
            if revision_id in heads and revision_id not in new_revision_ids:
892
                new_revision_ids.append(revision_id)
893
        if new_revision_ids != revision_ids:
894
            trace.mutter('requested to set revision_ids = %s,'
895
                         ' but filtered to %s', revision_ids, new_revision_ids)
896
        return new_revision_ids
897
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
898
    @needs_tree_write_lock
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
899
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
900
        """Set the parent ids to revision_ids.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
901
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
902
        See also set_parent_trees. This api will try to retrieve the tree data
903
        for each element of revision_ids from the trees repository. If you have
904
        tree data already available, it is more efficient to use
905
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
906
        an easier API to use.
907
908
        :param revision_ids: The revision_ids to set as the parent ids of this
909
            working tree. Any of these may be ghosts.
910
        """
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
911
        self._check_parents_for_ghosts(revision_ids,
912
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
913
        for revision_id in revision_ids:
914
            _mod_revision.check_not_reserved_id(revision_id)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
915
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
916
        revision_ids = self._filter_parent_ids_by_ancestry(revision_ids)
917
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
918
        if len(revision_ids) > 0:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
919
            self.set_last_revision(revision_ids[0])
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
920
        else:
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
921
            self.set_last_revision(_mod_revision.NULL_REVISION)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
922
923
        self._set_merges_from_parent_ids(revision_ids)
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
924
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
925
    @needs_tree_write_lock
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
926
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
927
        """See MutableTree.set_parent_trees."""
2858.2.1 by Martin Pool
Remove most calls to safe_file_id and safe_revision_id.
928
        parent_ids = [rev for (rev, tree) in parents_list]
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
929
        for revision_id in parent_ids:
930
            _mod_revision.check_not_reserved_id(revision_id)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
931
932
        self._check_parents_for_ghosts(parent_ids,
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
933
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.2 by Robert Collins
Create and test set_parent_trees.
934
3462.1.2 by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors.
935
        parent_ids = self._filter_parent_ids_by_ancestry(parent_ids)
936
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
937
        if len(parent_ids) == 0:
2598.5.3 by Aaron Bentley
Push NULL_REVISION deeper
938
            leftmost_parent_id = _mod_revision.NULL_REVISION
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
939
            leftmost_parent_tree = None
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
940
        else:
941
            leftmost_parent_id, leftmost_parent_tree = parents_list[0]
942
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
943
        if self._change_last_revision(leftmost_parent_id):
944
            if leftmost_parent_tree is None:
2041.1.4 by John Arbash Meinel
NEWS and documentation
945
                # If we don't have a tree, fall back to reading the
946
                # parent tree from the repository.
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
947
                self._cache_basis_inventory(leftmost_parent_id)
948
            else:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
949
                inv = leftmost_parent_tree.inventory
950
                xml = self._create_basis_xml_from_inventory(
951
                                        leftmost_parent_id, inv)
952
                self._write_basis_inventory(xml)
953
        self._set_merges_from_parent_ids(parent_ids)
954
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
955
    @needs_tree_write_lock
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
956
    def set_pending_merges(self, rev_list):
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
957
        parents = self.get_parent_ids()
958
        leftmost = parents[:1]
959
        new_parents = leftmost + rev_list
960
        self.set_parent_ids(new_parents)
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
961
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
962
    @needs_tree_write_lock
1534.7.192 by Aaron Bentley
Record hashes produced by merges
963
    def set_merge_modified(self, modified_hashes):
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
964
        def iter_stanzas():
965
            for file_id, hash in modified_hashes.iteritems():
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
966
                yield Stanza(file_id=file_id.decode('utf8'), hash=hash)
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
967
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
968
2776.1.8 by Robert Collins
Retrieve the sha from the dirstate for path_content_summary on hash cache hits; slight performance hit but a big win for incremental commits.
969
    def _sha_from_stat(self, path, stat_result):
970
        """Get a sha digest from the tree's stat cache.
971
972
        The default implementation assumes no stat cache is present.
973
974
        :param path: The path.
975
        :param stat_result: The stat result being looked up.
976
        """
977
        return None
978
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
979
    def _put_rio(self, filename, stanzas, header):
2298.1.1 by Martin Pool
Add test for merge_modified
980
        self._must_be_locked()
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
981
        my_file = rio_file(stanzas, header)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
982
        self._transport.put_file(filename, my_file,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
983
            mode=self.bzrdir._get_file_mode())
1534.7.192 by Aaron Bentley
Record hashes produced by merges
984
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
985
    @needs_write_lock # because merge pulls data into the branch.
1551.15.69 by Aaron Bentley
Add merge_type to merge_from_branch
986
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
4721.3.2 by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites.
987
                          merge_type=None, force=False):
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
988
        """Merge from a branch into this working tree.
989
990
        :param branch: The branch to merge from.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
991
        :param to_revision: If non-None, the merge will merge to to_revision,
992
            but not beyond it. to_revision does not need to be in the history
2206.1.7 by Marius Kruger
* errors
993
            of the branch when it is supplied. If None, to_revision defaults to
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
994
            branch.last_revision().
995
        """
996
        from bzrlib.merge import Merger, Merge3Merger
4961.2.10 by Martin Pool
No longer need to pass pb in to Merger
997
        merger = Merger(self.branch, this_tree=self)
998
        # check that there are no local alterations
999
        if not force and self.has_changes():
1000
            raise errors.UncommittedChanges(self)
1001
        if to_revision is None:
1002
            to_revision = _mod_revision.ensure_null(branch.last_revision())
1003
        merger.other_rev_id = to_revision
1004
        if _mod_revision.is_null(merger.other_rev_id):
1005
            raise errors.NoCommits(branch)
1006
        self.branch.fetch(branch, last_revision=merger.other_rev_id)
1007
        merger.other_basis = merger.other_rev_id
1008
        merger.other_tree = self.branch.repository.revision_tree(
1009
            merger.other_rev_id)
1010
        merger.other_branch = branch
1011
        if from_revision is None:
1012
            merger.find_base()
1013
        else:
1014
            merger.set_base_revision(from_revision, branch)
1015
        if merger.base_rev_id == merger.other_rev_id:
1016
            raise errors.PointlessMerge
1017
        merger.backup_files = False
1018
        if merge_type is None:
1019
            merger.merge_type = Merge3Merger
1020
        else:
1021
            merger.merge_type = merge_type
1022
        merger.set_interesting_files(None)
1023
        merger.show_base = False
1024
        merger.reprocess = False
1025
        conflicts = merger.do_merge()
1026
        merger.set_pending()
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
1027
        return conflicts
1028
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
1029
    @needs_read_lock
1030
    def merge_modified(self):
2298.1.1 by Martin Pool
Add test for merge_modified
1031
        """Return a dictionary of files modified by a merge.
1032
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1033
        The list is initialized by WorkingTree.set_merge_modified, which is
2298.1.1 by Martin Pool
Add test for merge_modified
1034
        typically called after we make some automatic updates to the tree
1035
        because of a merge.
1036
1037
        This returns a map of file_id->sha1, containing only files which are
1038
        still in the working inventory and have that text hash.
1039
        """
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
1040
        try:
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
1041
            hashfile = self._transport.get('merge-hashes')
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
1042
        except errors.NoSuchFile:
1043
            return {}
1044
        try:
3619.6.5 by Mark Hammond
ensure merge_modified() closes the hash file.
1045
            merge_hashes = {}
1046
            try:
1047
                if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
1048
                    raise errors.MergeModifiedFormatError()
1049
            except StopIteration:
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
1050
                raise errors.MergeModifiedFormatError()
3619.6.5 by Mark Hammond
ensure merge_modified() closes the hash file.
1051
            for s in RioReader(hashfile):
1052
                # RioReader reads in Unicode, so convert file_ids back to utf8
1053
                file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
1054
                if file_id not in self.inventory:
1055
                    continue
1056
                text_hash = s.get("hash")
1057
                if text_hash == self.get_file_sha1(file_id):
1058
                    merge_hashes[file_id] = text_hash
1059
            return merge_hashes
1060
        finally:
1061
            hashfile.close()
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
1062
1063
    @needs_write_lock
1064
    def mkdir(self, path, file_id=None):
1065
        """See MutableTree.mkdir()."""
1066
        if file_id is None:
1067
            file_id = generate_ids.gen_file_id(os.path.basename(path))
1068
        os.mkdir(self.abspath(path))
1069
        self.add(path, file_id, 'directory')
1070
        return file_id
1071
1072
    def get_symlink_target(self, file_id):
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
1073
        abspath = self.id2abspath(file_id)
4241.14.18 by Vincent Ladeuil
Use better fixes for unicode symlinks handling in WTs.
1074
        target = osutils.readlink(abspath)
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
1075
        return target
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
1076
1731.2.1 by Aaron Bentley
Initial subsume implementation
1077
    @needs_write_lock
1078
    def subsume(self, other_tree):
1731.2.4 by Aaron Bentley
Ensure subsume works with Knit2 repos
1079
        def add_children(inventory, entry):
1080
            for child_entry in entry.children.values():
1081
                inventory._byid[child_entry.file_id] = child_entry
1082
                if child_entry.kind == 'directory':
1083
                    add_children(inventory, child_entry)
1731.2.2 by Aaron Bentley
Test subsume failure modes
1084
        if other_tree.get_root_id() == self.get_root_id():
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1085
            raise errors.BadSubsumeSource(self, other_tree,
1731.2.2 by Aaron Bentley
Test subsume failure modes
1086
                                          'Trees have the same root')
1087
        try:
1088
            other_tree_path = self.relpath(other_tree.basedir)
1089
        except errors.PathNotChild:
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1090
            raise errors.BadSubsumeSource(self, other_tree,
1731.2.2 by Aaron Bentley
Test subsume failure modes
1091
                'Tree is not contained by the other')
1731.2.4 by Aaron Bentley
Ensure subsume works with Knit2 repos
1092
        new_root_parent = self.path2id(osutils.dirname(other_tree_path))
1093
        if new_root_parent is None:
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1094
            raise errors.BadSubsumeSource(self, other_tree,
1731.2.3 by Aaron Bentley
Handle unversioned parents during subsume
1095
                'Parent directory is not versioned.')
1731.2.5 by Aaron Bentley
Ensure versionedfile will be produced for subsumed tree root
1096
        # We need to ensure that the result of a fetch will have a
1097
        # versionedfile for the other_tree root, and only fetching into
1098
        # RepositoryKnit2 guarantees that.
1731.2.10 by Aaron Bentley
Change test for rich root data
1099
        if not self.branch.repository.supports_rich_root():
1731.2.5 by Aaron Bentley
Ensure versionedfile will be produced for subsumed tree root
1100
            raise errors.SubsumeTargetNeedsUpgrade(other_tree)
1731.2.4 by Aaron Bentley
Ensure subsume works with Knit2 repos
1101
        other_tree.lock_tree_write()
1102
        try:
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1103
            new_parents = other_tree.get_parent_ids()
1731.2.4 by Aaron Bentley
Ensure subsume works with Knit2 repos
1104
            other_root = other_tree.inventory.root
1105
            other_root.parent_id = new_root_parent
1106
            other_root.name = osutils.basename(other_tree_path)
1107
            self.inventory.add(other_root)
1108
            add_children(self.inventory, other_root)
1109
            self._write_inventory(self.inventory)
2255.14.1 by Martin Pool
Add BzrDir.retire_bzrdir and partly fix subsume
1110
            # normally we don't want to fetch whole repositories, but i think
1111
            # here we really do want to consolidate the whole thing.
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1112
            for parent_id in other_tree.get_parent_ids():
1113
                self.branch.fetch(other_tree.branch, parent_id)
1114
                self.add_parent_tree_id(parent_id)
1731.2.4 by Aaron Bentley
Ensure subsume works with Knit2 repos
1115
        finally:
1116
            other_tree.unlock()
2255.2.214 by Robert Collins
Get _iter_changes on dirstate passing the subtree tests.
1117
        other_tree.bzrdir.retire_bzrdir()
1731.2.1 by Aaron Bentley
Initial subsume implementation
1118
2974.2.2 by John Arbash Meinel
Only one test failed, because it was incorrectly succeeding.
1119
    def _setup_directory_is_tree_reference(self):
1120
        if self._branch.repository._format.supports_tree_reference:
1121
            self._directory_is_tree_reference = \
1122
                self._directory_may_be_tree_reference
1123
        else:
1124
            self._directory_is_tree_reference = \
1125
                self._directory_is_never_tree_reference
1126
1127
    def _directory_is_never_tree_reference(self, relpath):
1128
        return False
1129
1130
    def _directory_may_be_tree_reference(self, relpath):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1131
        # as a special case, if a directory contains control files then
2776.1.7 by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
1132
        # it's a tree reference, except that the root of the tree is not
1133
        return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")
1134
        # TODO: We could ask all the control formats whether they
1135
        # recognize this directory, but at the moment there's no cheap api
1136
        # to do that.  Since we probably can only nest bzr checkouts and
1137
        # they always use this name it's ok for now.  -- mbp 20060306
1138
        #
1139
        # FIXME: There is an unhandled case here of a subdirectory
1140
        # containing .bzr but not a branch; that will probably blow up
1141
        # when you try to commit it.  It might happen if there is a
1142
        # checkout in a subdirectory.  This can be avoided by not adding
1143
        # it.  mbp 20070306
1144
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1145
    @needs_tree_write_lock
1731.2.17 by Aaron Bentley
Support extracting with checkouts
1146
    def extract(self, file_id, format=None):
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1147
        """Extract a subtree from this tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1148
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1149
        A new branch will be created, relative to the path for this tree.
1150
        """
1551.10.26 by Aaron Bentley
Allow extract when tree is locked
1151
        self.flush()
1731.2.17 by Aaron Bentley
Support extracting with checkouts
1152
        def mkdirs(path):
1153
            segments = osutils.splitpath(path)
1154
            transport = self.branch.bzrdir.root_transport
1155
            for name in segments:
1156
                transport = transport.clone(name)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1157
                transport.ensure_base()
1731.2.17 by Aaron Bentley
Support extracting with checkouts
1158
            return transport
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1159
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1160
        sub_path = self.id2path(file_id)
1731.2.17 by Aaron Bentley
Support extracting with checkouts
1161
        branch_transport = mkdirs(sub_path)
1162
        if format is None:
3113.6.1 by Aaron Bentley
Use source format where available for splitting
1163
            format = self.bzrdir.cloning_metadir()
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1164
        branch_transport.ensure_base()
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1165
        branch_bzrdir = format.initialize_on_transport(branch_transport)
1166
        try:
1167
            repo = branch_bzrdir.find_repository()
1168
        except errors.NoRepositoryPresent:
1169
            repo = branch_bzrdir.create_repository()
3113.6.4 by Aaron Bentley
Require the user to upgrade if they run split in a non-rich-root tree.
1170
        if not repo.supports_rich_root():
1171
            raise errors.RootNotRich()
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1172
        new_branch = branch_bzrdir.create_branch()
1731.2.21 by Aaron Bentley
Ensure extracting a subtree dupes the branch
1173
        new_branch.pull(self.branch)
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1174
        for parent_id in self.get_parent_ids():
1175
            new_branch.fetch(self.branch, parent_id)
1176
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1177
        if tree_transport.base != branch_transport.base:
1178
            tree_bzrdir = format.initialize_on_transport(tree_transport)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1179
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1180
                target_branch=new_branch)
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1181
        else:
1182
            tree_bzrdir = branch_bzrdir
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
1183
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1184
        wt.set_parent_ids(self.get_parent_ids())
1185
        my_inv = self.inventory
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
1186
        child_inv = inventory.Inventory(root_id=None)
1731.2.16 by Aaron Bentley
Get extract working for standalone trees
1187
        new_root = my_inv[file_id]
1188
        my_inv.remove_recursive_id(file_id)
1189
        new_root.parent_id = None
1190
        child_inv.add(new_root)
1191
        self._write_inventory(my_inv)
1192
        wt._write_inventory(child_inv)
1193
        return wt
1194
2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
1195
    def _serialize(self, inventory, out_file):
2817.2.1 by Robert Collins
* Inventory serialisation no longer double-sha's the content.
1196
        xml5.serializer_v5.write_inventory(self._inventory, out_file,
1197
            working=True)
2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
1198
1199
    def _deserialize(selt, in_file):
1200
        return xml5.serializer_v5.read_inventory(in_file)
453 by Martin Pool
- Split WorkingTree into its own file
1201
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1202
    def flush(self):
1203
        """Write the in memory inventory to disk."""
1204
        # TODO: Maybe this should only write on dirty ?
1205
        if self._control_files._lock_mode != 'w':
1206
            raise errors.NotWriteLocked(self)
1207
        sio = StringIO()
2100.3.10 by Aaron Bentley
Ensure added references are serialized properly, beef up Workingtreee3
1208
        self._serialize(self._inventory, sio)
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1209
        sio.seek(0)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
1210
        self._transport.put_file('inventory', sio,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
1211
            mode=self.bzrdir._get_file_mode())
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1212
        self._inventory_is_modified = False
1213
1551.10.29 by Aaron Bentley
Fix tree.list_files when file kind changes
1214
    def _kind(self, relpath):
1215
        return osutils.file_kind(self.abspath(relpath))
1216
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1217
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1218
        """List all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
1219
1220
        Lists, but does not descend into unversioned directories.
1221
        This does not include files that have been deleted in this
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1222
        tree. Skips the control directory.
453 by Martin Pool
- Split WorkingTree into its own file
1223
5128.1.1 by Vincent Ladeuil
Uncontroversial cleanups, mostly comments
1224
        :param include_root: if True, return an entry for the root
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1225
        :param from_dir: start from this directory or None for the root
1226
        :param recursive: whether to recurse into subdirectories or not
453 by Martin Pool
- Split WorkingTree into its own file
1227
        """
2255.2.60 by John Arbash Meinel
Add an explicit exception since tree.list_files() requires a lock (at least for dirstate
1228
        # list_files is an iterator, so @needs_read_lock doesn't work properly
1229
        # with it. So callers should be careful to always read_lock the tree.
1230
        if not self.is_locked():
1231
            raise errors.ObjectNotLocked(self)
1232
2255.2.52 by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.
1233
        inv = self.inventory
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1234
        if from_dir is None and include_root is True:
1910.2.56 by Aaron Bentley
More work on bundles
1235
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1236
        # Convert these into local objects to save lookup times
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
1237
        pathjoin = osutils.pathjoin
1551.10.29 by Aaron Bentley
Fix tree.list_files when file kind changes
1238
        file_kind = self._kind
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1239
1240
        # transport.base ends in a slash, we want the piece
1241
        # between the last two slashes
1242
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
1243
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1244
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1245
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1246
        # directory file_id, relative path, absolute path, reverse sorted children
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1247
        if from_dir is not None:
1248
            from_dir_id = inv.path2id(from_dir)
4370.5.3 by Ian Clatworthy
handle unversioned directories
1249
            if from_dir_id is None:
1250
                # Directory not versioned
1251
                return
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1252
            from_dir_abspath = pathjoin(self.basedir, from_dir)
1253
        else:
1254
            from_dir_id = inv.root.file_id
1255
            from_dir_abspath = self.basedir
1256
        children = os.listdir(from_dir_abspath)
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1257
        children.sort()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1258
        # jam 20060527 The kernel sized tree seems equivalent whether we
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
1259
        # use a deque and popleft to keep them sorted, or if we use a plain
1260
        # list and just reverse() them.
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1261
        children = collections.deque(children)
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1262
        stack = [(from_dir_id, u'', from_dir_abspath, children)]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1263
        while stack:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1264
            from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1265
1266
            while children:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1267
                f = children.popleft()
453 by Martin Pool
- Split WorkingTree into its own file
1268
                ## TODO: If we find a subdirectory with its own .bzr
1269
                ## directory, then that is a separate tree and we
1270
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1271
1272
                # the bzrdir for this tree
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
1273
                if transport_base_dir == f:
453 by Martin Pool
- Split WorkingTree into its own file
1274
                    continue
1275
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
1276
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
1277
                # and 'f' doesn't begin with one, we can do a string op, rather
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
1278
                # than the checks of pathjoin(), all relative paths will have an extra slash
1279
                # at the beginning
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
1280
                fp = from_dir_relpath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
1281
1282
                # absolute path
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
1283
                fap = from_dir_abspath + '/' + f
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1284
5050.24.2 by Andrew Bennetts
Minimal fix for test_symlink_changes_to_dir test failure.
1285
                dir_ie = inv[from_dir_id]
1286
                if dir_ie.kind == 'directory':
1287
                    f_ie = dir_ie.children.get(f)
1288
                else:
1289
                    f_ie = None
453 by Martin Pool
- Split WorkingTree into its own file
1290
                if f_ie:
1291
                    c = 'V'
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1292
                elif self.is_ignored(fp[1:]):
1293
                    c = 'I'
453 by Martin Pool
- Split WorkingTree into its own file
1294
                else:
5050.24.2 by Andrew Bennetts
Minimal fix for test_symlink_changes_to_dir test failure.
1295
                    # we may not have found this file, because of a unicode
1296
                    # issue, or because the directory was actually a symlink.
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1297
                    f_norm, can_access = osutils.normalized_filename(f)
1298
                    if f == f_norm or not can_access:
1299
                        # No change, so treat this file normally
1300
                        c = '?'
1301
                    else:
1302
                        # this file can be accessed by a normalized path
1303
                        # check again if it is versioned
1304
                        # these lines are repeated here for performance
1305
                        f = f_norm
1306
                        fp = from_dir_relpath + '/' + f
1307
                        fap = from_dir_abspath + '/' + f
1308
                        f_ie = inv.get_child(from_dir_id, f)
1309
                        if f_ie:
1310
                            c = 'V'
1311
                        elif self.is_ignored(fp[1:]):
1312
                            c = 'I'
1313
                        else:
1314
                            c = '?'
453 by Martin Pool
- Split WorkingTree into its own file
1315
1316
                fk = file_kind(fap)
1317
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1318
                # make a last minute entry
1319
                if f_ie:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
1320
                    yield fp[1:], c, fk, f_ie.file_id, f_ie
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1321
                else:
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1322
                    try:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
1323
                        yield fp[1:], c, fk, None, fk_entries[fk]()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1324
                    except KeyError:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
1325
                        yield fp[1:], c, fk, None, TreeEntry()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1326
                    continue
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1327
453 by Martin Pool
- Split WorkingTree into its own file
1328
                if fk != 'directory':
1329
                    continue
1330
4370.5.2 by Ian Clatworthy
extend list_files() with from_dir and recursive parameters
1331
                # But do this child first if recursing down
1332
                if recursive:
1333
                    new_children = os.listdir(fap)
1334
                    new_children.sort()
1335
                    new_children = collections.deque(new_children)
1336
                    stack.append((f_ie.file_id, fp, fap, new_children))
1337
                    # Break out of inner loop,
1338
                    # so that we start outer loop with child
1339
                    break
1732.1.22 by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory
1340
            else:
1341
                # if we finished all children, pop it off the stack
1732.1.25 by John Arbash Meinel
Fix list_files test, we don't need to check if children are empty if we fall off the loop.
1342
                stack.pop()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
1343
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1344
    @needs_tree_write_lock
5346.1.5 by Vincent Ladeuil
Delete the to_name parameter from WorkingTree.move()
1345
    def move(self, from_paths, to_dir=None, after=False):
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1346
        """Rename files.
1347
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1348
        to_dir must exist in the inventory.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1349
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1350
        If to_dir exists and is a directory, the files are moved into
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1351
        it, keeping their old names.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1352
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1353
        Note that to_dir is only the last component of the new name;
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1354
        this doesn't change the directory.
1355
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1356
        For each entry in from_paths the move mode will be determined
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1357
        independently.
1358
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1359
        The first mode moves the file in the filesystem and updates the
1360
        inventory. The second mode only updates the inventory without
1361
        touching the file on the filesystem. This is the new mode introduced
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
1362
        in version 0.15.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1363
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1364
        move uses the second mode if 'after == True' and the target is not
1365
        versioned but present in the working tree.
1366
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1367
        move uses the second mode if 'after == False' and the source is
1368
        versioned but no longer in the working tree, and the target is not
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1369
        versioned but present in the working tree.
1370
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1371
        move uses the first mode if 'after == False' and the source is
1372
        versioned and present in the working tree, and the target is not
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1373
        versioned and not present in the working tree.
1374
1375
        Everything else results in an error.
1376
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1377
        This returns a list of (from_path, to_path) pairs for each
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
1378
        entry that is moved.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1379
        """
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1380
        rename_entries = []
1381
        rename_tuples = []
1382
1383
        # check for deprecated use of signature
1384
        if to_dir is None:
5346.1.5 by Vincent Ladeuil
Delete the to_name parameter from WorkingTree.move()
1385
            raise TypeError('You must supply a target directory')
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1386
        # check destination directory
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1387
        if isinstance(from_paths, basestring):
1388
            raise ValueError()
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1389
        inv = self.inventory
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1390
        to_abs = self.abspath(to_dir)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1391
        if not isdir(to_abs):
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1392
            raise errors.BzrMoveFailedError('',to_dir,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1393
                errors.NotADirectory(to_abs))
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1394
        if not self.has_filename(to_dir):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1395
            raise errors.BzrMoveFailedError('',to_dir,
1396
                errors.NotInWorkingDirectory(to_dir))
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1397
        to_dir_id = inv.path2id(to_dir)
2123.3.6 by Steffen Eichenberg
unified error messages
1398
        if to_dir_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1399
            raise errors.BzrMoveFailedError('',to_dir,
5609.8.4 by Martin
Don't cast paths to str in mv exception cases
1400
                errors.NotVersionedError(path=to_dir))
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1401
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1402
        to_dir_ie = inv[to_dir_id]
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
1403
        if to_dir_ie.kind != 'directory':
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1404
            raise errors.BzrMoveFailedError('',to_dir,
1405
                errors.NotADirectory(to_abs))
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1406
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1407
        # create rename entries and tuples
1408
        for from_rel in from_paths:
1409
            from_tail = splitpath(from_rel)[-1]
1410
            from_id = inv.path2id(from_rel)
1411
            if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1412
                raise errors.BzrMoveFailedError(from_rel,to_dir,
5609.8.4 by Martin
Don't cast paths to str in mv exception cases
1413
                    errors.NotVersionedError(path=from_rel))
2206.1.4 by Marius Kruger
Improved WorkingTree.move excptions. (as requested)
1414
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1415
            from_entry = inv[from_id]
1416
            from_parent_id = from_entry.parent_id
1417
            to_rel = pathjoin(to_dir, from_tail)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1418
            rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1419
                                         from_id=from_id,
1420
                                         from_tail=from_tail,
1421
                                         from_parent_id=from_parent_id,
1422
                                         to_rel=to_rel, to_tail=from_tail,
1423
                                         to_parent_id=to_dir_id)
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1424
            rename_entries.append(rename_entry)
1425
            rename_tuples.append((from_rel, to_rel))
1426
1427
        # determine which move mode to use. checks also for movability
1428
        rename_entries = self._determine_mv_mode(rename_entries, after)
1429
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1430
        original_modified = self._inventory_is_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1431
        try:
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
1432
            if len(from_paths):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1433
                self._inventory_is_modified = True
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1434
            self._move(rename_entries)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1435
        except:
1436
            # restore the inventory on error
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1437
            self._inventory_is_modified = original_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1438
            raise
1439
        self._write_inventory(inv)
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1440
        return rename_tuples
1441
1442
    def _determine_mv_mode(self, rename_entries, after=False):
1443
        """Determines for each from-to pair if both inventory and working tree
1444
        or only the inventory has to be changed.
1445
1446
        Also does basic plausability tests.
1447
        """
1448
        inv = self.inventory
1449
1450
        for rename_entry in rename_entries:
1451
            # store to local variables for easier reference
1452
            from_rel = rename_entry.from_rel
1453
            from_id = rename_entry.from_id
1454
            to_rel = rename_entry.to_rel
1455
            to_id = inv.path2id(to_rel)
1456
            only_change_inv = False
1457
1458
            # check the inventory for source and destination
1459
            if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1460
                raise errors.BzrMoveFailedError(from_rel,to_rel,
5609.8.4 by Martin
Don't cast paths to str in mv exception cases
1461
                    errors.NotVersionedError(path=from_rel))
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1462
            if to_id is not None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1463
                raise errors.BzrMoveFailedError(from_rel,to_rel,
5609.8.4 by Martin
Don't cast paths to str in mv exception cases
1464
                    errors.AlreadyVersionedError(path=to_rel))
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1465
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1466
            # try to determine the mode for rename (only change inv or change
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1467
            # inv and file system)
1468
            if after:
1469
                if not self.has_filename(to_rel):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1470
                    raise errors.BzrMoveFailedError(from_id,to_rel,
5609.8.4 by Martin
Don't cast paths to str in mv exception cases
1471
                        errors.NoSuchFile(path=to_rel,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1472
                        extra="New file has not been created yet"))
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1473
                only_change_inv = True
1474
            elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1475
                only_change_inv = True
1476
            elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1477
                only_change_inv = False
3638.3.3 by Vincent Ladeuil
OSX too needs to accept 'bzr mv foo Foo' when foo and Foo are the same file.
1478
            elif (not self.case_sensitive
1479
                  and from_rel.lower() == to_rel.lower()
1480
                  and self.has_filename(from_rel)):
2978.8.1 by Alexander Belchenko
Rename on Windows is able to change filename case. (#77740)
1481
                only_change_inv = False
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1482
            else:
1483
                # something is wrong, so lets determine what exactly
1484
                if not self.has_filename(from_rel) and \
1485
                   not self.has_filename(to_rel):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1486
                    raise errors.BzrRenameFailedError(from_rel,to_rel,
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1487
                        errors.PathsDoNotExist(paths=(str(from_rel),
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1488
                        str(to_rel))))
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1489
                else:
2967.3.6 by Daniel Watkins
Extracted the string from every use of RenameFailedFilesExist to RenameFailedFilesExist itself.
1490
                    raise errors.RenameFailedFilesExist(from_rel, to_rel)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1491
            rename_entry.only_change_inv = only_change_inv
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1492
        return rename_entries
1493
1494
    def _move(self, rename_entries):
1495
        """Moves a list of files.
1496
1497
        Depending on the value of the flag 'only_change_inv', the
1498
        file will be moved on the file system or not.
1499
        """
1500
        inv = self.inventory
1501
        moved = []
1502
1503
        for entry in rename_entries:
1504
            try:
1505
                self._move_entry(entry)
2220.1.12 by Marius Kruger
* Fix errors.py import order
1506
            except:
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1507
                self._rollback_move(moved)
1508
                raise
1509
            moved.append(entry)
1510
1511
    def _rollback_move(self, moved):
2220.1.12 by Marius Kruger
* Fix errors.py import order
1512
        """Try to rollback a previous move in case of an filesystem error."""
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1513
        inv = self.inventory
1514
        for entry in moved:
1515
            try:
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
1516
                self._move_entry(WorkingTree._RenameEntry(
1517
                    entry.to_rel, entry.from_id,
2220.1.12 by Marius Kruger
* Fix errors.py import order
1518
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1519
                    entry.from_tail, entry.from_parent_id,
1520
                    entry.only_change_inv))
2220.1.14 by Aaron Bentley
Cleanup formatting and error handling
1521
            except errors.BzrMoveFailedError, e:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1522
                raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1523
                        " The working tree is in an inconsistent state."
1524
                        " Please consider doing a 'bzr revert'."
2220.1.14 by Aaron Bentley
Cleanup formatting and error handling
1525
                        " Error message is: %s" % e)
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1526
2220.1.12 by Marius Kruger
* Fix errors.py import order
1527
    def _move_entry(self, entry):
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1528
        inv = self.inventory
1529
        from_rel_abs = self.abspath(entry.from_rel)
1530
        to_rel_abs = self.abspath(entry.to_rel)
1531
        if from_rel_abs == to_rel_abs:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1532
            raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1533
                "Source and target are identical.")
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1534
2220.1.12 by Marius Kruger
* Fix errors.py import order
1535
        if not entry.only_change_inv:
1536
            try:
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1537
                osutils.rename(from_rel_abs, to_rel_abs)
2220.1.12 by Marius Kruger
* Fix errors.py import order
1538
            except OSError, e:
1539
                raise errors.BzrMoveFailedError(entry.from_rel,
1540
                    entry.to_rel, e[1])
1541
        inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1542
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1543
    @needs_tree_write_lock
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1544
    def rename_one(self, from_rel, to_rel, after=False):
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1545
        """Rename one file.
1546
1547
        This can change the directory or the filename or both.
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1548
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1549
        rename_one has several 'modes' to work. First, it can rename a physical
1550
        file and change the file_id. That is the normal mode. Second, it can
1551
        only change the file_id without touching any physical file. This is
1552
        the new mode introduced in version 0.15.
1553
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1554
        rename_one uses the second mode if 'after == True' and 'to_rel' is not
1555
        versioned but present in the working tree.
1556
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1557
        rename_one uses the second mode if 'after == False' and 'from_rel' is
1558
        versioned but no longer in the working tree, and 'to_rel' is not
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1559
        versioned but present in the working tree.
1560
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1561
        rename_one uses the first mode if 'after == False' and 'from_rel' is
1562
        versioned and present in the working tree, and 'to_rel' is not
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1563
        versioned and not present in the working tree.
1564
1565
        Everything else results in an error.
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1566
        """
1567
        inv = self.inventory
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1568
        rename_entries = []
1569
1570
        # create rename entries and tuples
1571
        from_tail = splitpath(from_rel)[-1]
1572
        from_id = inv.path2id(from_rel)
1573
        if from_id is None:
4371.6.1 by Marius Kruger
Allow renaming of files already removed from the inventory
1574
            # if file is missing in the inventory maybe it's in the basis_tree
1575
            basis_tree = self.branch.basis_tree()
1576
            from_id = basis_tree.path2id(from_rel)
1577
            if from_id is None:
1578
                raise errors.BzrRenameFailedError(from_rel,to_rel,
5609.8.4 by Martin
Don't cast paths to str in mv exception cases
1579
                    errors.NotVersionedError(path=from_rel))
4371.6.1 by Marius Kruger
Allow renaming of files already removed from the inventory
1580
            # put entry back in the inventory so we can rename it
4371.6.5 by Marius Kruger
clone the the inventory entry when putting it back
1581
            from_entry = basis_tree.inventory[from_id].copy()
4371.6.1 by Marius Kruger
Allow renaming of files already removed from the inventory
1582
            inv.add(from_entry)
1583
        else:
1584
            from_entry = inv[from_id]
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1585
        from_parent_id = from_entry.parent_id
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1586
        to_dir, to_tail = os.path.split(to_rel)
1587
        to_dir_id = inv.path2id(to_dir)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1588
        rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1589
                                     from_id=from_id,
1590
                                     from_tail=from_tail,
1591
                                     from_parent_id=from_parent_id,
1592
                                     to_rel=to_rel, to_tail=to_tail,
1593
                                     to_parent_id=to_dir_id)
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1594
        rename_entries.append(rename_entry)
1595
1596
        # determine which move mode to use. checks also for movability
1597
        rename_entries = self._determine_mv_mode(rename_entries, after)
1598
1599
        # check if the target changed directory and if the target directory is
1600
        # versioned
2123.3.6 by Steffen Eichenberg
unified error messages
1601
        if to_dir_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1602
            raise errors.BzrMoveFailedError(from_rel,to_rel,
5609.8.4 by Martin
Don't cast paths to str in mv exception cases
1603
                errors.NotVersionedError(path=to_dir))
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1604
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1605
        # all checks done. now we can continue with our actual work
1606
        mutter('rename_one:\n'
1607
               '  from_id   {%s}\n'
1608
               '  from_rel: %r\n'
1609
               '  to_rel:   %r\n'
1610
               '  to_dir    %r\n'
1611
               '  to_dir_id {%s}\n',
1612
               from_id, from_rel, to_rel, to_dir, to_dir_id)
1613
1614
        self._move(rename_entries)
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1615
        self._write_inventory(inv)
1616
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1617
    class _RenameEntry(object):
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1618
        def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2220.1.12 by Marius Kruger
* Fix errors.py import order
1619
                     to_rel, to_tail, to_parent_id, only_change_inv=False):
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1620
            self.from_rel = from_rel
1621
            self.from_id = from_id
1622
            self.from_tail = from_tail
1623
            self.from_parent_id = from_parent_id
1624
            self.to_rel = to_rel
1625
            self.to_tail = to_tail
1626
            self.to_parent_id = to_parent_id
2220.1.12 by Marius Kruger
* Fix errors.py import order
1627
            self.only_change_inv = only_change_inv
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1628
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1629
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
1630
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
1631
        """Return all unknown files.
1632
1633
        These are files in the working directory that are not versioned or
1634
        control files or ignored.
1635
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1636
        # force the extras method to be fully executed before returning, to
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
1637
        # prevent race conditions with the lock
1638
        return iter(
1639
            [subp for subp in self.extras() if not self.is_ignored(subp)])
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
1640
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1641
    @needs_tree_write_lock
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1642
    def unversion(self, file_ids):
1643
        """Remove the file ids in file_ids from the current versioned set.
1644
1645
        When a file_id is unversioned, all of its children are automatically
1646
        unversioned.
1647
1648
        :param file_ids: The file ids to stop versioning.
1649
        :raises: NoSuchId if any fileid is not currently versioned.
1650
        """
1651
        for file_id in file_ids:
4183.5.5 by Robert Collins
Enable record_iter_changes for cases where it can work.
1652
            if file_id not in self._inventory:
1653
                raise errors.NoSuchId(self, file_id)
1654
        for file_id in file_ids:
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1655
            if self._inventory.has_id(file_id):
1988.2.6 by Robert Collins
Review feedback.
1656
                self._inventory.remove_recursive_id(file_id)
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1657
        if len(file_ids):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1658
            # in the future this should just set a dirty bit to wait for the
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1659
            # final unlock. However, until all methods of workingtree start
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1660
            # with the current in -memory inventory rather than triggering
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1661
            # a read, it is more complex - we need to teach read_inventory
1662
            # to know when to read, and when to not read first... and possibly
1663
            # to save first when the in memory one may be corrupted.
1664
            # so for now, we just only write it if it is indeed dirty.
1665
            # - RBC 20060907
1666
            self._write_inventory(self._inventory)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1667
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1668
    @needs_write_lock
1551.11.10 by Aaron Bentley
Add change reporting to pull
1669
    def pull(self, source, overwrite=False, stop_revision=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1670
             change_reporter=None, possible_transports=None, local=False,
1671
             show_base=False):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1672
        source.lock_read()
1673
        try:
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
1674
            old_revision_info = self.branch.last_revision_info()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
1675
            basis_tree = self.basis_tree()
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1676
            count = self.branch.pull(source, overwrite, stop_revision,
4056.6.4 by Gary van der Merwe
Implement pull --local.
1677
                                     possible_transports=possible_transports,
1678
                                     local=local)
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
1679
            new_revision_info = self.branch.last_revision_info()
1680
            if new_revision_info != old_revision_info:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1681
                repository = self.branch.repository
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1682
                basis_tree.lock_read()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1683
                try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1684
                    new_basis_tree = self.branch.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1685
                    merge.merge_inner(
1686
                                self.branch,
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1687
                                new_basis_tree,
1688
                                basis_tree,
1689
                                this_tree=self,
4961.2.11 by Martin Pool
Pull out pbs and ProgressPhases stored in object state; just use them in single functions
1690
                                pb=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1691
                                change_reporter=change_reporter,
1692
                                show_base=show_base)
4634.123.11 by John Arbash Meinel
fix 'pull' to also set the root id.
1693
                    basis_root_id = basis_tree.get_root_id()
1694
                    new_root_id = new_basis_tree.get_root_id()
1695
                    if basis_root_id != new_root_id:
1696
                        self.set_root_id(new_root_id)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1697
                finally:
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1698
                    basis_tree.unlock()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1699
                # TODO - dedup parents list with things merged by pull ?
1908.6.3 by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.
1700
                # reuse the revisiontree we merged against to set the new
1701
                # tree data.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1702
                parent_trees = [(self.branch.last_revision(), new_basis_tree)]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1703
                # we have to pull the merge trees out again, because
1704
                # merge_inner has set the ids. - this corner is not yet
1908.6.3 by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.
1705
                # layered well enough to prevent double handling.
2255.2.38 by Robert Collins
Fix WorkingTree4.pull to work.
1706
                # XXX TODO: Fix the double handling: telling the tree about
1707
                # the already known parent data is wasteful.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1708
                merges = self.get_parent_ids()[1:]
1709
                parent_trees.extend([
1710
                    (parent, repository.revision_tree(parent)) for
1711
                     parent in merges])
1712
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1713
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1714
        finally:
1715
            source.unlock()
1716
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1717
    @needs_write_lock
1718
    def put_file_bytes_non_atomic(self, file_id, bytes):
1719
        """See MutableTree.put_file_bytes_non_atomic."""
1720
        stream = file(self.id2abspath(file_id), 'wb')
1721
        try:
1722
            stream.write(bytes)
1723
        finally:
1724
            stream.close()
1725
        # TODO: update the hashcache here ?
1726
453 by Martin Pool
- Split WorkingTree into its own file
1727
    def extras(self):
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1728
        """Yield all unversioned files in this WorkingTree.
453 by Martin Pool
- Split WorkingTree into its own file
1729
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1730
        If there are any unversioned directories then only the directory is
1731
        returned, not all its children.  But if there are unversioned files
453 by Martin Pool
- Split WorkingTree into its own file
1732
        under a versioned subdirectory, they are returned.
1733
1734
        Currently returned depth-first, sorted by name within directories.
2255.7.85 by Robert Collins
Teach _iter_changes to gather unversioned path details upon request.
1735
        This is the same order used by 'osutils.walkdirs'.
453 by Martin Pool
- Split WorkingTree into its own file
1736
        """
1737
        ## TODO: Work from given directory downwards
1738
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1739
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1740
            dirabs = self.abspath(path)
1741
            if not isdir(dirabs):
1742
                # e.g. directory deleted
1743
                continue
1744
1745
            fl = []
1746
            for subf in os.listdir(dirabs):
4324.5.1 by Jelmer Vernooij
Use utility function to check for control filename rather than assuming it is '.bzr.'
1747
                if self.bzrdir.is_control_filename(subf):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1748
                    continue
1749
                if subf not in dir_entry.children:
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1750
                    try:
1751
                        (subf_norm,
3287.20.4 by John Arbash Meinel
fix trivial typo
1752
                         can_access) = osutils.normalized_filename(subf)
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1753
                    except UnicodeDecodeError:
1754
                        path_os_enc = path.encode(osutils._fs_enc)
1755
                        relpath = path_os_enc + '/' + subf
1756
                        raise errors.BadFilenameEncoding(relpath,
1757
                                                         osutils._fs_enc)
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1758
                    if subf_norm != subf and can_access:
1759
                        if subf_norm not in dir_entry.children:
1760
                            fl.append(subf_norm)
1761
                    else:
1762
                        fl.append(subf)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1763
453 by Martin Pool
- Split WorkingTree into its own file
1764
            fl.sort()
1765
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1766
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1767
                yield subp
1768
1769
    def ignored_files(self):
1770
        """Yield list of PATH, IGNORE_PATTERN"""
1771
        for subp in self.extras():
1772
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1773
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
1774
                yield subp, pat
1775
1776
    def get_ignore_list(self):
1777
        """Return list of ignore patterns.
1778
1779
        Cached in the Tree object after the first call.
1780
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1781
        ignoreset = getattr(self, '_ignoreset', None)
1782
        if ignoreset is not None:
1783
            return ignoreset
1784
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
1785
        ignore_globs = set()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1786
        ignore_globs.update(ignores.get_runtime_ignores())
1787
        ignore_globs.update(ignores.get_user_ignores())
453 by Martin Pool
- Split WorkingTree into its own file
1788
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1789
            f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1790
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1791
                ignore_globs.update(ignores.parse_ignore_file(f))
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1792
            finally:
1793
                f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1794
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1795
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1796
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1797
    def _flush_ignore_list_cache(self):
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1798
        """Resets the cached ignore list to force a cache rebuild."""
1799
        self._ignoreset = None
1800
        self._ignoreglobster = None
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1801
453 by Martin Pool
- Split WorkingTree into its own file
1802
    def is_ignored(self, filename):
1803
        r"""Check whether the filename matches an ignore pattern.
1804
1805
        Patterns containing '/' or '\' need to match the whole path;
4948.5.1 by John Whitley
Implementation of ignore exclusions and basic tests for same.
1806
        others match against only the last component.  Patterns starting
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
1807
        with '!' are ignore exceptions.  Exceptions take precedence
4948.5.1 by John Whitley
Implementation of ignore exclusions and basic tests for same.
1808
        over regular patterns and cause the filename to not be ignored.
453 by Martin Pool
- Split WorkingTree into its own file
1809
1810
        If the file is ignored, returns the pattern which caused it to
1811
        be ignored, otherwise None.  So this can simply be used as a
1812
        boolean if desired."""
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1813
        if getattr(self, '_ignoreglobster', None) is None:
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
1814
            self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
4948.5.3 by John Whitley
Refactor the exclusion handling functionality out of
1815
        return self._ignoreglobster.match(filename)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1816
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1817
    def kind(self, file_id):
1818
        return file_kind(self.id2abspath(file_id))
1819
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
1820
    def stored_kind(self, file_id):
1821
        """See Tree.stored_kind"""
1822
        return self.inventory[file_id].kind
1823
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1824
    def _comparison_data(self, entry, path):
1825
        abspath = self.abspath(path)
1826
        try:
1827
            stat_value = os.lstat(abspath)
1828
        except OSError, e:
1829
            if getattr(e, 'errno', None) == errno.ENOENT:
1830
                stat_value = None
1831
                kind = None
1832
                executable = False
1833
            else:
1834
                raise
1835
        else:
1836
            mode = stat_value.st_mode
1837
            kind = osutils.file_kind_from_stat_mode(mode)
1838
            if not supports_executable():
2409.1.2 by Dmitry Vasiliev
Used one-line conditional expression instead of the multi-line one
1839
                executable = entry is not None and entry.executable
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1840
            else:
1841
                executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1842
        return kind, executable, stat_value
1843
1844
    def _file_size(self, entry, stat_value):
1845
        return stat_value.st_size
1846
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1847
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1848
        """Return the last revision of the branch for this tree.
1849
1850
        This format tree does not support a separate marker for last-revision
1851
        compared to the branch.
1852
1853
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1854
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1855
        return self._last_revision()
1856
1857
    @needs_read_lock
1858
    def _last_revision(self):
1859
        """helper for get_parent_ids."""
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
1860
        return _mod_revision.ensure_null(self.branch.last_revision())
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1861
1694.2.6 by Martin Pool
[merge] bzr.dev
1862
    def is_locked(self):
1863
        return self._control_files.is_locked()
1864
2298.1.1 by Martin Pool
Add test for merge_modified
1865
    def _must_be_locked(self):
1866
        if not self.is_locked():
1867
            raise errors.ObjectNotLocked(self)
1868
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1869
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1870
        """Lock the tree for reading.
1871
1872
        This also locks the branch, and can be unlocked via self.unlock().
1873
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1874
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1875
        """
2255.2.204 by Robert Collins
Fix info and status again.
1876
        if not self.is_locked():
1877
            self._reset_data()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1878
        self.branch.lock_read()
1879
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1880
            self._control_files.lock_read()
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1881
            return LogicalLockResult(self.unlock)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1882
        except:
1883
            self.branch.unlock()
1884
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1885
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1886
    def lock_tree_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1887
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
1888
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1889
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1890
        """
2255.2.204 by Robert Collins
Fix info and status again.
1891
        if not self.is_locked():
1892
            self._reset_data()
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1893
        self.branch.lock_read()
1894
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1895
            self._control_files.lock_write()
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1896
            return LogicalLockResult(self.unlock)
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1897
        except:
1898
            self.branch.unlock()
1899
            raise
1900
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1901
    def lock_write(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1902
        """See MutableTree.lock_write, and WorkingTree.unlock.
1903
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1904
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1905
        """
2255.2.204 by Robert Collins
Fix info and status again.
1906
        if not self.is_locked():
1907
            self._reset_data()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1908
        self.branch.lock_write()
1909
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1910
            self._control_files.lock_write()
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1911
            return LogicalLockResult(self.unlock)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1912
        except:
1913
            self.branch.unlock()
1914
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1915
1694.2.6 by Martin Pool
[merge] bzr.dev
1916
    def get_physical_lock_status(self):
1917
        return self._control_files.get_physical_lock_status()
1918
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1919
    def _basis_inventory_name(self):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1920
        return 'basis-inventory-cache'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1921
2255.2.204 by Robert Collins
Fix info and status again.
1922
    def _reset_data(self):
1923
        """Reset transient data that cannot be revalidated."""
1924
        self._inventory_is_modified = False
4852.1.7 by John Arbash Meinel
Lots of tweaks in WorkingTree.
1925
        f = self._transport.get('inventory')
1926
        try:
1927
            result = self._deserialize(f)
1928
        finally:
1929
            f.close()
2255.2.204 by Robert Collins
Fix info and status again.
1930
        self._set_inventory(result, dirty=False)
1931
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1932
    @needs_tree_write_lock
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1933
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1934
        """Change the last revision in the working tree."""
1935
        if self._change_last_revision(new_revision):
1936
            self._cache_basis_inventory(new_revision)
1937
1938
    def _change_last_revision(self, new_revision):
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1939
        """Template method part of set_last_revision to perform the change.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1940
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1941
        This is used to allow WorkingTree3 instances to not affect branch
1942
        when their last revision is set.
1943
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1944
        if _mod_revision.is_null(new_revision):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1945
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1946
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1947
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1948
            self.branch.generate_revision_history(new_revision)
1949
        except errors.NoSuchRevision:
1950
            # not present in the repo - dont try to set it deeper than the tip
1951
            self.branch.set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1952
        return True
1953
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1954
    def _write_basis_inventory(self, xml):
1955
        """Write the basis inventory XML to the basis-inventory file"""
1956
        path = self._basis_inventory_name()
1957
        sio = StringIO(xml)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
1958
        self._transport.put_file(path, sio,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
1959
            mode=self.bzrdir._get_file_mode())
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1960
1961
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1962
        """Create the text that will be saved in basis-inventory"""
2858.2.3 by Martin Pool
Fix incorrect deletion from _create_basis_xml_from_inventory (thanks igc)
1963
        inventory.revision_id = revision_id
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
1964
        return xml7.serializer_v7.write_inventory_to_string(inventory)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1965
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1966
    def _cache_basis_inventory(self, new_revision):
1967
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1968
        # TODO: this should allow the ready-to-use inventory to be passed in,
1969
        # as commit already has that ready-to-use [while the format is the
1970
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1971
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1972
            # this double handles the inventory - unpack and repack -
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1973
            # but is easier to understand. We can/should put a conditional
1974
            # in here based on whether the inventory is in the latest format
1975
            # - perhaps we should repack all inventories on a repository
1976
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1977
            # the fast path is to copy the raw xml from the repository. If the
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1978
            # xml contains 'revision_id="', then we assume the right
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1979
            # revision_id is set. We must check for this full string, because a
1980
            # root node id can legitimately look like 'revision_id' but cannot
1981
            # contain a '"'.
4988.5.1 by Jelmer Vernooij
Rename Repository.get_inventory_xml -> Repository._get_inventory_xml.
1982
            xml = self.branch.repository._get_inventory_xml(new_revision)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1983
            firstline = xml.split('\n', 1)[0]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1984
            if (not 'revision_id="' in firstline or
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
1985
                'format="7"' not in firstline):
4606.5.1 by Robert Collins
Support get_inventory_xml on CHKRepository.
1986
                inv = self.branch.repository._serializer.read_inventory_from_string(
1987
                    xml, new_revision)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1988
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1989
            self._write_basis_inventory(xml)
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1990
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1991
            pass
1992
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1993
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1994
        """Read the cached basis inventory."""
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1995
        path = self._basis_inventory_name()
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
1996
        return self._transport.get_bytes(path)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1997
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1998
    @needs_read_lock
1999
    def read_working_inventory(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2000
        """Read the working inventory.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2001
1986.5.7 by Robert Collins
Merge reviews.
2002
        :raises errors.InventoryModified: read_working_inventory will fail
2003
            when the current in memory inventory has been modified.
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2004
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2005
        # conceptually this should be an implementation detail of the tree.
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2006
        # XXX: Deprecate this.
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2007
        # ElementTree does its own conversion from UTF-8, so open in
2008
        # binary.
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2009
        if self._inventory_is_modified:
2010
            raise errors.InventoryModified(self)
4852.1.7 by John Arbash Meinel
Lots of tweaks in WorkingTree.
2011
        f = self._transport.get('inventory')
2012
        try:
2013
            result = self._deserialize(f)
2014
        finally:
2015
            f.close()
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2016
        self._set_inventory(result, dirty=False)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2017
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2018
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2019
    @needs_tree_write_lock
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
2020
    def remove(self, files, verbose=False, to_file=None, keep_files=True,
2292.1.10 by Marius Kruger
* workingtree.remove
2021
        force=False):
2475.5.2 by Marius Kruger
* blackbox/test_remove
2022
        """Remove nominated files from the working inventory.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2023
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
2024
        :files: File paths relative to the basedir.
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
2025
        :keep_files: If true, the files will also be kept.
2292.1.10 by Marius Kruger
* workingtree.remove
2026
        :force: Delete files and directories, even if they are changed and
2027
            even if the directories are not empty.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2028
        """
2029
        if isinstance(files, basestring):
2030
            files = [files]
2031
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
2032
        inv_delta = []
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2033
5340.8.3 by Marius Kruger
new_files => all_files
2034
        all_files = set() # specified and nested files 
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2035
        unknown_nested_files=set()
4792.5.2 by Martin Pool
Move stubby show_status from bzrlib.textui into remove(), its only user
2036
        if to_file is None:
2037
            to_file = sys.stdout
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2038
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2039
        files_to_backup = []
2040
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2041
        def recurse_directory_to_add_files(directory):
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2042
            # Recurse directory and add all files
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2043
            # so we can check if they have changed.
5160.2.2 by Marius Kruger
check if changed file isStillInDirToBeRemoved before bailing out
2044
            for parent_info, file_infos in self.walkdirs(directory):
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
2045
                for relpath, basename, kind, lstat, fileid, kind in file_infos:
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2046
                    # Is it versioned or ignored?
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2047
                    if self.path2id(relpath):
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2048
                        # Add nested content for deletion.
5340.8.3 by Marius Kruger
new_files => all_files
2049
                        all_files.add(relpath)
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2050
                    else:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2051
                        # Files which are not versioned
2655.2.16 by Marius Kruger
* Rename `unknown_files_in_directory` to `unknown_nested_files`, which
2052
                        # should be treated as unknown.
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2053
                        files_to_backup.append(relpath)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2054
2055
        for filename in files:
2056
            # Get file name into canonical form.
1551.15.11 by Aaron Bentley
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees
2057
            abspath = self.abspath(filename)
2058
            filename = self.relpath(abspath)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2059
            if len(filename) > 0:
5340.8.3 by Marius Kruger
new_files => all_files
2060
                all_files.add(filename)
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
2061
                recurse_directory_to_add_files(filename)
2655.2.4 by Marius Kruger
* workingtree.remove
2062
5340.8.3 by Marius Kruger
new_files => all_files
2063
        files = list(all_files)
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
2064
2475.5.2 by Marius Kruger
* blackbox/test_remove
2065
        if len(files) == 0:
2066
            return # nothing to do
2067
2292.1.22 by Marius Kruger
Implement TODO: Normalize names.
2068
        # Sort needed to first handle directory content before the directory
2069
        files.sort(reverse=True)
2655.2.6 by Marius Kruger
* workingtree.remove
2070
2655.2.4 by Marius Kruger
* workingtree.remove
2071
        # Bail out if we are going to delete files we shouldn't
2292.1.11 by Marius Kruger
* workingtree.remove
2072
        if not keep_files and not force:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2073
            for (file_id, path, content_change, versioned, parent_id, name,
2074
                 kind, executable) in self.iter_changes(self.basis_tree(),
2075
                     include_unchanged=True, require_versioned=False,
2076
                     want_unversioned=True, specific_files=files):
2077
                if versioned[0] == False:
2078
                    # The record is unknown or newly added
2079
                    files_to_backup.append(path[1])
2080
                elif (content_change and (kind[1] is not None) and
2081
                        osutils.is_inside_any(files, path[1])):
2082
                    # Versioned and changed, but not deleted, and still
2083
                    # in one of the dirs to be deleted.
2084
                    files_to_backup.append(path[1])
2475.5.2 by Marius Kruger
* blackbox/test_remove
2085
5340.8.5 by Marius Kruger
* extract backup_files
2086
        def backup(file_to_backup):
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
2087
            backup_name = self.bzrdir._available_backup_name(file_to_backup)
5340.8.5 by Marius Kruger
* extract backup_files
2088
            osutils.rename(abs_path, self.abspath(backup_name))
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
2089
            return "removed %s (but kept a copy: %s)" % (file_to_backup,
2090
                                                         backup_name)
5340.8.5 by Marius Kruger
* extract backup_files
2091
4031.3.1 by Frank Aspell
Fixing various typos
2092
        # Build inv_delta and delete files where applicable,
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
2093
        # do this before any modifications to inventory.
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2094
        for f in files:
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
2095
            fid = self.path2id(f)
2655.2.4 by Marius Kruger
* workingtree.remove
2096
            message = None
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2097
            if not fid:
2655.2.4 by Marius Kruger
* workingtree.remove
2098
                message = "%s is not versioned." % (f,)
2245.5.1 by Marius Kruger
Let bzr rm rather give a warning than an error when trying to remove a non-versioned file.
2099
            else:
2100
                if verbose:
2292.1.10 by Marius Kruger
* workingtree.remove
2101
                    # having removed it, it must be either ignored or unknown
2245.5.1 by Marius Kruger
Let bzr rm rather give a warning than an error when trying to remove a non-versioned file.
2102
                    if self.is_ignored(f):
2103
                        new_status = 'I'
2104
                    else:
2105
                        new_status = '?'
4792.5.2 by Martin Pool
Move stubby show_status from bzrlib.textui into remove(), its only user
2106
                    # XXX: Really should be a more abstract reporter interface
4792.5.3 by Martin Pool
Further cleanup of removal reporting code
2107
                    kind_ch = osutils.kind_marker(self.kind(fid))
2108
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
2109
                # Unversion file
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
2110
                inv_delta.append((f, None, fid, None))
2655.2.4 by Marius Kruger
* workingtree.remove
2111
                message = "removed %s" % (f,)
2292.1.7 by Marius Kruger
First pass at only deleting files on 'bzr remove' when
2112
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
2113
            if not keep_files:
2292.1.30 by Marius Kruger
* Minor text fixes.
2114
                abs_path = self.abspath(f)
2115
                if osutils.lexists(abs_path):
2116
                    if (osutils.isdir(abs_path) and
2117
                        len(os.listdir(abs_path)) > 0):
2655.2.4 by Marius Kruger
* workingtree.remove
2118
                        if force:
2119
                            osutils.rmtree(abs_path)
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2120
                            message = "deleted %s" % (f,)
2655.2.4 by Marius Kruger
* workingtree.remove
2121
                        else:
5340.8.5 by Marius Kruger
* extract backup_files
2122
                            message = backup(f)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2123
                    else:
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2124
                        if f in files_to_backup:
5340.8.5 by Marius Kruger
* extract backup_files
2125
                            message = backup(f)
5340.8.1 by Marius Kruger
* make the backup file name generator in bzrdir available to others
2126
                        else:
2127
                            osutils.delete_any(abs_path)
2128
                            message = "deleted %s" % (f,)
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
2129
                elif message is not None:
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
2130
                    # Only care if we haven't done anything yet.
2131
                    message = "%s does not exist." % (f,)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2132
2655.2.17 by Marius Kruger
Minor doc and spacing updates.
2133
            # Print only one message (if any) per file.
2292.1.1 by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file.
2134
            if message is not None:
2135
                note(message)
1551.15.12 by Aaron Bentley
Stop using inventory directly in WorkingTree.remove
2136
        self.apply_inventory_delta(inv_delta)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2137
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2138
    @needs_tree_write_lock
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
2139
    def revert(self, filenames=None, old_tree=None, backups=True,
4961.2.9 by Martin Pool
Rip out most remaining uses of DummyProgressBar
2140
               pb=None, report_changes=False):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2141
        from bzrlib.conflicts import resolve
2748.3.3 by Aaron Bentley
Add a deprecation warning for revert([]), and handle as revert(None) for now
2142
        if filenames == []:
2143
            filenames = None
2144
            symbol_versioning.warn('Using [] to revert all files is deprecated'
2145
                ' as of bzr 0.91.  Please use None (the default) instead.',
2146
                DeprecationWarning, stacklevel=2)
1501 by Robert Collins
Move revert from Branch to WorkingTree.
2147
        if old_tree is None:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
2148
            basis_tree = self.basis_tree()
2149
            basis_tree.lock_read()
2150
            old_tree = basis_tree
1534.10.14 by Aaron Bentley
Made revert clear conflicts
2151
        else:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
2152
            basis_tree = None
2153
        try:
2154
            conflicts = transform.revert(self, old_tree, filenames, backups, pb,
2155
                                         report_changes)
2949.2.2 by Robert Collins
Avoid dirstate parent resetting when it is not needed during revert.
2156
            if filenames is None and len(self.get_parent_ids()) > 1:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
2157
                parent_trees = []
2158
                last_revision = self.last_revision()
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
2159
                if last_revision != _mod_revision.NULL_REVISION:
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
2160
                    if basis_tree is None:
2161
                        basis_tree = self.basis_tree()
2162
                        basis_tree.lock_read()
2163
                    parent_trees.append((last_revision, basis_tree))
2164
                self.set_parent_trees(parent_trees)
2165
                resolve(self)
2166
            else:
3017.2.1 by Aaron Bentley
Revert now resolves conflicts recursively (#102739)
2167
                resolve(self, filenames, ignore_misses=True, recursive=True)
2949.2.1 by Robert Collins
* Revert takes out an appropriate lock when reverting to a basis tree, and
2168
        finally:
2169
            if basis_tree is not None:
2170
                basis_tree.unlock()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
2171
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
2172
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2173
    def revision_tree(self, revision_id):
2174
        """See Tree.revision_tree.
2175
2176
        WorkingTree can supply revision_trees for the basis revision only
2177
        because there is only one cached inventory in the bzr directory.
2178
        """
2179
        if revision_id == self.last_revision():
2180
            try:
2181
                xml = self.read_basis_inventory()
1852.16.5 by John Arbash Meinel
[merge] bzr.dev 2255, resolve conflicts, update copyrights
2182
            except errors.NoSuchFile:
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2183
                pass
2184
            else:
1908.11.3 by Robert Collins
Merge bzr.dev
2185
                try:
2255.6.5 by Aaron Bentley
fix revision_tree tests
2186
                    inv = xml7.serializer_v7.read_inventory_from_string(xml)
1908.11.3 by Robert Collins
Merge bzr.dev
2187
                    # dont use the repository revision_tree api because we want
2188
                    # to supply the inventory.
2189
                    if inv.revision_id == revision_id:
1908.11.5 by John Arbash Meinel
[merge] bzr.dev 2240
2190
                        return revisiontree.RevisionTree(self.branch.repository,
1908.11.3 by Robert Collins
Merge bzr.dev
2191
                            inv, revision_id)
2192
                except errors.BadInventoryFormat:
2193
                    pass
1908.11.2 by Robert Collins
Implement WorkingTree interface conformance tests for
2194
        # raise if there was no inventory, or if we read the wrong inventory.
2195
        raise errors.NoSuchRevisionInTree(self, revision_id)
2196
1658.1.3 by Martin Pool
Doc
2197
    # XXX: This method should be deprecated in favour of taking in a proper
2198
    # new Inventory object.
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2199
    @needs_tree_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2200
    def set_inventory(self, new_inventory_list):
2201
        from bzrlib.inventory import (Inventory,
2202
                                      InventoryDirectory,
2203
                                      InventoryFile,
2204
                                      InventoryLink)
2205
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
2206
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2207
            name = os.path.basename(path)
2208
            if name == "":
2209
                continue
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2210
            # fixme, there should be a factory function inv,add_??
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2211
            if kind == 'directory':
2212
                inv.add(InventoryDirectory(file_id, name, parent))
2213
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
2214
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2215
            elif kind == 'symlink':
2216
                inv.add(InventoryLink(file_id, name, parent))
2217
            else:
2206.1.7 by Marius Kruger
* errors
2218
                raise errors.BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
2219
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
2220
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2221
    @needs_tree_write_lock
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2222
    def set_root_id(self, file_id):
2223
        """Set the root id for this tree."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2224
        # for compatability
2858.2.4 by Martin Pool
Restore deprecated behaviour of accepting None for WorkingTree.set_root_id (thanks igc)
2225
        if file_id is None:
3400.3.6 by Martin Pool
Remove code deprecated prior to 1.1 and its tests
2226
            raise ValueError(
2227
                'WorkingTree.set_root_id with fileid=None')
2228
        file_id = osutils.safe_file_id(file_id)
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
2229
        self._set_root_id(file_id)
2230
2231
    def _set_root_id(self, file_id):
2232
        """Set the root id for this tree, in a format specific manner.
2233
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2234
        :param file_id: The file id to assign to the root. It must not be
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
2235
            present in the current inventory or an error will occur. It must
2236
            not be None, but rather a valid file id.
2237
        """
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
2238
        inv = self._inventory
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2239
        orig_root_id = inv.root.file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2240
        # TODO: it might be nice to exit early if there was nothing
2241
        # to do, saving us from trigger a sync on unlock.
2242
        self._inventory_is_modified = True
2243
        # we preserve the root inventory entry object, but
2244
        # unlinkit from the byid index
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2245
        del inv._byid[inv.root.file_id]
2246
        inv.root.file_id = file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2247
        # and link it into the index with the new changed id.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2248
        inv._byid[inv.root.file_id] = inv.root
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2249
        # and finally update all children to reference the new id.
2250
        # XXX: this should be safe to just look at the root.children
2251
        # list, not the WHOLE INVENTORY.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2252
        for fid in inv:
2253
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2254
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
2255
                entry.parent_id = inv.root.file_id
2256
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2257
    def unlock(self):
2258
        """See Branch.unlock.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2259
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2260
        WorkingTree locking just uses the Branch locking facilities.
2261
        This is current because all working trees have an embedded branch
2262
        within them. IF in the future, we were to make branch data shareable
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2263
        between multiple working trees, i.e. via shared storage, then we
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2264
        would probably want to lock both the local tree, and the branch.
2265
        """
1852.4.2 by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
2266
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
2267
1907.5.7 by Matthieu Moy
Coding style fixes thanks to jam.
2268
    _marker = object()
2269
2009.1.4 by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are
2270
    def update(self, change_reporter=None, possible_transports=None,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2271
               revision=None, old_tip=_marker, show_base=False):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
2272
        """Update a working tree along its branch.
2273
1731.1.33 by Aaron Bentley
Revert no-special-root changes
2274
        This will update the branch if its bound too, which means we have
2275
        multiple trees involved:
2276
2277
        - The new basis tree of the master.
2278
        - The old basis tree of the branch.
2279
        - The old basis tree of the working tree.
2280
        - The current working tree state.
2281
2282
        Pathologically, all three may be different, and non-ancestors of each
2283
        other.  Conceptually we want to:
2284
2285
        - Preserve the wt.basis->wt.state changes
2286
        - Transform the wt.basis to the new master basis.
2287
        - Apply a merge of the old branch basis to get any 'local' changes from
2288
          it into the tree.
2289
        - Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
2290
2291
        There isn't a single operation at the moment to do that, so we:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
2292
        - Merge current state -> basis tree of the master w.r.t. the old tree
2293
          basis.
2294
        - Do a 'normal' merge of the old branch basis if it is relevant.
1907.5.4 by Matthieu Moy
Added test-cases for update -r. Tweaked the implementation too.
2295
2009.1.2 by John Arbash Meinel
minor whitespace cleanup.
2296
        :param revision: The target revision to update to. Must be in the
2297
            revision history.
2298
        :param old_tip: If branch.update() has already been run, the value it
2299
            returned (old tip of the branch or None). _marker is used
2300
            otherwise.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
2301
        """
3280.5.1 by John Arbash Meinel
Avoid opening the master branch when we won't use it.
2302
        if self.branch.get_bound_location() is not None:
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2303
            self.lock_write()
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
2304
            update_branch = (old_tip is self._marker)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2305
        else:
2306
            self.lock_tree_write()
2307
            update_branch = False
2308
        try:
2309
            if update_branch:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2310
                old_tip = self.branch.update(possible_transports)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2311
            else:
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
2312
                if old_tip is self._marker:
2313
                    old_tip = None
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2314
            return self._update_tree(old_tip, change_reporter, revision, show_base)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2315
        finally:
2316
            self.unlock()
2317
2318
    @needs_tree_write_lock
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2319
    def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2320
                     show_base=False):
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
2321
        """Update a tree to the master branch.
2322
2323
        :param old_tip: if supplied, the previous tip revision the branch,
2324
            before it was changed to the master branch's tip.
2325
        """
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2326
        # here if old_tip is not None, it is the old tip of the branch before
2327
        # it was updated from the master branch. This should become a pending
2328
        # merge in the working tree to preserve the user existing work.  we
2329
        # cant set that until we update the working trees last revision to be
2330
        # one from the new branch, because it will just get absorbed by the
2331
        # parent de-duplication logic.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2332
        #
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2333
        # We MUST save it even if an error occurs, because otherwise the users
2334
        # local work is unreferenced and will appear to have been lost.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2335
        #
4985.3.17 by Vincent Ladeuil
Some cleanup.
2336
        nb_conflicts = 0
1907.5.13 by Matthieu Moy
Fixed bad conflict resolution.
2337
        try:
2338
            last_rev = self.get_parent_ids()[0]
2339
        except IndexError:
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
2340
            last_rev = _mod_revision.NULL_REVISION
1907.5.8 by Matthieu Moy
merge (with conflicts)
2341
        if revision is None:
1907.5.13 by Matthieu Moy
Fixed bad conflict resolution.
2342
            revision = self.branch.last_revision()
4985.3.17 by Vincent Ladeuil
Some cleanup.
2343
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
2344
        old_tip = old_tip or _mod_revision.NULL_REVISION
4985.3.17 by Vincent Ladeuil
Some cleanup.
2345
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2346
        if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
2347
            # the branch we are bound to was updated
2348
            # merge those changes in first
2349
            base_tree  = self.basis_tree()
4985.3.1 by Gerard Krol
Werkt wel ok
2350
            other_tree = self.branch.repository.revision_tree(old_tip)
4985.3.17 by Vincent Ladeuil
Some cleanup.
2351
            nb_conflicts = merge.merge_inner(self.branch, other_tree,
2352
                                             base_tree, this_tree=self,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2353
                                             change_reporter=change_reporter,
2354
                                             show_base=show_base)
4985.3.17 by Vincent Ladeuil
Some cleanup.
2355
            if nb_conflicts:
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
2356
                self.add_parent_tree((old_tip, other_tree))
4985.3.6 by Gerard Krol
Message after aborting update after the first merge
2357
                trace.note('Rerun update after fixing the conflicts.')
4985.3.17 by Vincent Ladeuil
Some cleanup.
2358
                return nb_conflicts
4985.3.1 by Gerard Krol
Werkt wel ok
2359
2009.1.4 by Mark Hammond
First attempt to merge .dev and resolve the conflicts (but tests are
2360
        if last_rev != _mod_revision.ensure_null(revision):
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2361
            # the working tree is up to date with the branch
2362
            # we can merge the specified revision from master
2363
            to_tree = self.branch.repository.revision_tree(revision)
2364
            to_root_id = to_tree.get_root_id()
2365
1927.2.3 by Robert Collins
review comment application - paired with Martin.
2366
            basis = self.basis_tree()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
2367
            basis.lock_read()
2368
            try:
4634.123.10 by John Arbash Meinel
update now properly handles root-id changes.
2369
                if (basis.inventory.root is None
2370
                    or basis.inventory.root.file_id != to_root_id):
2371
                    self.set_root_id(to_root_id)
2255.6.6 by Aaron Bentley
Fix update to set unique roots, and work with dirstate
2372
                    self.flush()
2255.2.44 by Robert Collins
Fix tree unlock on readonly Format4 trees with dirty hashcache.
2373
            finally:
2374
                basis.unlock()
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2375
2376
            # determine the branch point
2377
            graph = self.branch.repository.get_graph()
4985.3.17 by Vincent Ladeuil
Some cleanup.
2378
            base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2379
                                                last_rev)
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2380
            base_tree = self.branch.repository.revision_tree(base_rev_id)
2381
4985.3.17 by Vincent Ladeuil
Some cleanup.
2382
            nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2383
                                             this_tree=self,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
2384
                                             change_reporter=change_reporter,
2385
                                             show_base=show_base)
4985.3.15 by Gerard Krol
Now correctly determine the branch point (instead of some lucky guesses)
2386
            self.set_last_revision(revision)
1908.6.6 by Robert Collins
Merge updated set_parents api.
2387
            # TODO - dedup parents list with things merged by pull ?
2388
            # reuse the tree we've updated to to set the basis:
1907.5.11 by Matthieu Moy
Simple fixes (deprecation warning, use revision where needed)
2389
            parent_trees = [(revision, to_tree)]
1908.6.6 by Robert Collins
Merge updated set_parents api.
2390
            merges = self.get_parent_ids()[1:]
2391
            # Ideally we ask the tree for the trees here, that way the working
1907.5.12 by Matthieu Moy
Manage InvalidRevisionSpec in update command.
2392
            # tree can decide whether to give us the entire tree or give us a
1908.6.6 by Robert Collins
Merge updated set_parents api.
2393
            # lazy initialised tree. dirstate for instance will have the trees
2394
            # in ram already, whereas a last-revision + basis-inventory tree
2395
            # will not, but also does not need them when setting parents.
2396
            for parent in merges:
2397
                parent_trees.append(
2398
                    (parent, self.branch.repository.revision_tree(parent)))
4985.3.14 by Gerard Krol
Don't compare old_tip to revision, just do the merge.
2399
            if not _mod_revision.is_null(old_tip):
2400
                parent_trees.append(
2401
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
1908.6.6 by Robert Collins
Merge updated set_parents api.
2402
            self.set_parent_trees(parent_trees)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
2403
            last_rev = parent_trees[0][0]
4985.3.17 by Vincent Ladeuil
Some cleanup.
2404
        return nb_conflicts
1508.1.24 by Robert Collins
Add update command for use with checkouts.
2405
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2406
    def _write_hashcache_if_dirty(self):
2407
        """Write out the hashcache if it is dirty."""
2408
        if self._hashcache.needs_write:
2409
            try:
2410
                self._hashcache.write()
2411
            except OSError, e:
2412
                if e.errno not in (errno.EPERM, errno.EACCES):
2413
                    raise
2414
                # TODO: jam 20061219 Should this be a warning? A single line
2415
                #       warning might be sufficient to let the user know what
2416
                #       is going on.
2417
                mutter('Could not write hashcache for %s\nError: %s',
2418
                       self._hashcache.cache_file_name(), e)
2419
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2420
    @needs_tree_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
2421
    def _write_inventory(self, inv):
2422
        """Write inventory as the current inventory."""
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2423
        self._set_inventory(inv, dirty=True)
2424
        self.flush()
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2425
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2426
    def set_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
2427
        raise errors.UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
2428
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2429
    def add_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
2430
        raise errors.UnsupportedOperation(self.add_conflicts, self)
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2431
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2432
    def conflicts(self):
5582.10.47 by Jelmer Vernooij
Move some upgrade tests that rely on bzrdirformat 0.0.4.
2433
        raise NotImplementedError(self.conflicts)
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2434
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2435
    def walkdirs(self, prefix=""):
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2436
        """Walk the directories of this tree.
2437
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2438
        returns a generator which yields items in the form:
2292.1.30 by Marius Kruger
* Minor text fixes.
2439
                ((curren_directory_path, fileid),
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2440
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
2441
                   file1_kind), ... ])
2442
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2443
        This API returns a generator, which is only valid during the current
2444
        tree transaction - within a single lock_read or lock_write duration.
2445
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2446
        If the tree is not locked, it may cause an error to be raised,
2447
        depending on the tree implementation.
2255.2.18 by Robert Collins
Dirstate: all tree_implementation tests passing.
2448
        """
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2449
        disk_top = self.abspath(prefix)
2450
        if disk_top.endswith('/'):
2451
            disk_top = disk_top[:-1]
2452
        top_strip_len = len(disk_top) + 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2453
        inventory_iterator = self._walkdirs(prefix)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2454
        disk_iterator = osutils.walkdirs(disk_top, prefix)
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2455
        try:
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2456
            current_disk = disk_iterator.next()
2457
            disk_finished = False
2458
        except OSError, e:
2423.2.1 by Alexander Belchenko
Fix for walkdirs in missing dir with Py2.4 @ win32
2459
            if not (e.errno == errno.ENOENT or
2460
                (sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2461
                raise
2462
            current_disk = None
2463
            disk_finished = True
2464
        try:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2465
            current_inv = inventory_iterator.next()
2466
            inv_finished = False
2467
        except StopIteration:
2468
            current_inv = None
2469
            inv_finished = True
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2470
        while not inv_finished or not disk_finished:
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2471
            if current_disk:
2472
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2473
                    cur_disk_dir_content) = current_disk
2474
            else:
2475
                ((cur_disk_dir_relpath, cur_disk_dir_path_from_top),
2476
                    cur_disk_dir_content) = ((None, None), None)
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2477
            if not disk_finished:
2478
                # strip out .bzr dirs
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2479
                if (cur_disk_dir_path_from_top[top_strip_len:] == '' and
2480
                    len(cur_disk_dir_content) > 0):
2481
                    # osutils.walkdirs can be made nicer -
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2482
                    # yield the path-from-prefix rather than the pathjoined
2483
                    # value.
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2484
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2485
                        ('.bzr', '.bzr'))
3719.1.1 by Vincent Ladeuil
Fix bug #272648
2486
                    if (bzrdir_loc < len(cur_disk_dir_content)
4324.5.1 by Jelmer Vernooij
Use utility function to check for control filename rather than assuming it is '.bzr.'
2487
                        and self.bzrdir.is_control_filename(
2488
                            cur_disk_dir_content[bzrdir_loc][0])):
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2489
                        # we dont yield the contents of, or, .bzr itself.
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2490
                        del cur_disk_dir_content[bzrdir_loc]
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2491
            if inv_finished:
2492
                # everything is unknown
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
2493
                direction = 1
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2494
            elif disk_finished:
2495
                # everything is missing
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
2496
                direction = -1
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2497
            else:
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2498
                direction = cmp(current_inv[0][0], cur_disk_dir_relpath)
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
2499
            if direction > 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2500
                # disk is before inventory - unknown
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2501
                dirblock = [(relpath, basename, kind, stat, None, None) for
2457.2.7 by Marius Kruger
extract method as per review request
2502
                    relpath, basename, kind, stat, top_path in
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2503
                    cur_disk_dir_content]
2504
                yield (cur_disk_dir_relpath, None), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2505
                try:
2506
                    current_disk = disk_iterator.next()
2507
                except StopIteration:
2508
                    disk_finished = True
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
2509
            elif direction < 0:
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2510
                # inventory is before disk - missing.
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2511
                dirblock = [(relpath, basename, 'unknown', None, fileid, kind)
2457.2.7 by Marius Kruger
extract method as per review request
2512
                    for relpath, basename, dkind, stat, fileid, kind in
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2513
                    current_inv[1]]
2514
                yield (current_inv[0][0], current_inv[0][1]), dirblock
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2515
                try:
2516
                    current_inv = inventory_iterator.next()
2517
                except StopIteration:
2518
                    inv_finished = True
2519
            else:
2520
                # versioned present directory
2521
                # merge the inventory and disk data together
2522
                dirblock = []
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2523
                for relpath, subiterator in itertools.groupby(sorted(
2457.2.7 by Marius Kruger
extract method as per review request
2524
                    current_inv[1] + cur_disk_dir_content,
2457.2.3 by Marius Kruger
factor out tuples into better readable variables
2525
                    key=operator.itemgetter(0)), operator.itemgetter(1)):
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2526
                    path_elements = list(subiterator)
2527
                    if len(path_elements) == 2:
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
2528
                        inv_row, disk_row = path_elements
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2529
                        # versioned, present file
1852.15.12 by Robert Collins
WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
2530
                        dirblock.append((inv_row[0],
2531
                            inv_row[1], disk_row[2],
2532
                            disk_row[3], inv_row[4],
2533
                            inv_row[5]))
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2534
                    elif len(path_elements[0]) == 5:
2535
                        # unknown disk file
1852.15.11 by Robert Collins
Tree.walkdirs handles missing contents in workingtrees.
2536
                        dirblock.append((path_elements[0][0],
2537
                            path_elements[0][1], path_elements[0][2],
2538
                            path_elements[0][3], None, None))
2539
                    elif len(path_elements[0]) == 6:
2540
                        # versioned, absent file.
2541
                        dirblock.append((path_elements[0][0],
2542
                            path_elements[0][1], 'unknown', None,
2543
                            path_elements[0][4], path_elements[0][5]))
2544
                    else:
2545
                        raise NotImplementedError('unreachable code')
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
2546
                yield current_inv[0], dirblock
2547
                try:
2548
                    current_inv = inventory_iterator.next()
2549
                except StopIteration:
2550
                    inv_finished = True
2551
                try:
2552
                    current_disk = disk_iterator.next()
2553
                except StopIteration:
2554
                    disk_finished = True
2555
2556
    def _walkdirs(self, prefix=""):
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2557
        """Walk the directories of this tree.
2558
2559
           :prefix: is used as the directrory to start with.
2560
           returns a generator which yields items in the form:
2292.1.30 by Marius Kruger
* Minor text fixes.
2561
                ((curren_directory_path, fileid),
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
2562
                 [(file1_path, file1_name, file1_kind, None, file1_id,
2563
                   file1_kind), ... ])
2564
        """
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2565
        _directory = 'directory'
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2566
        # get the root in the inventory
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2567
        inv = self.inventory
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2568
        top_id = inv.path2id(prefix)
2569
        if top_id is None:
2570
            pending = []
2571
        else:
2572
            pending = [(prefix, '', _directory, None, top_id, None)]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2573
        while pending:
2574
            dirblock = []
2575
            currentdir = pending.pop()
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2576
            # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
2577
            top_id = currentdir[4]
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2578
            if currentdir[0]:
2579
                relroot = currentdir[0] + '/'
2580
            else:
2581
                relroot = ""
2582
            # FIXME: stash the node in pending
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2583
            entry = inv[top_id]
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
2584
            if entry.kind == 'directory':
2585
                for name, child in entry.sorted_children():
2586
                    dirblock.append((relroot + name, name, child.kind, None,
2587
                        child.file_id, child.kind
2588
                        ))
1852.15.10 by Robert Collins
Tweak the Tree.walkdirs interface more to be more useful.
2589
            yield (currentdir[0], entry.file_id), dirblock
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
2590
            # push the user specified dirs from dirblock
2591
            for dir in reversed(dirblock):
2592
                if dir[2] == _directory:
2593
                    pending.append(dir)
2594
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
2595
    @needs_tree_write_lock
2596
    def auto_resolve(self):
2597
        """Automatically resolve text conflicts according to contents.
2598
2599
        Only text conflicts are auto_resolvable. Files with no conflict markers
2600
        are considered 'resolved', because bzr always puts conflict markers
2601
        into files that have text conflicts.  The corresponding .THIS .BASE and
2602
        .OTHER files are deleted, as per 'resolve'.
2603
        :return: a tuple of ConflictLists: (un_resolved, resolved).
2604
        """
2605
        un_resolved = _mod_conflicts.ConflictList()
2606
        resolved = _mod_conflicts.ConflictList()
2607
        conflict_re = re.compile('^(<{7}|={7}|>{7})')
2608
        for conflict in self.conflicts():
2120.7.3 by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved
2609
            if (conflict.typestring != 'text conflict' or
2610
                self.kind(conflict.file_id) != 'file'):
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
2611
                un_resolved.append(conflict)
2612
                continue
2613
            my_file = open(self.id2abspath(conflict.file_id), 'rb')
2614
            try:
2615
                for line in my_file:
2616
                    if conflict_re.search(line):
2617
                        un_resolved.append(conflict)
2618
                        break
2619
                else:
2620
                    resolved.append(conflict)
2621
            finally:
2622
                my_file.close()
2623
        resolved.remove_files(self)
2624
        self.set_conflicts(un_resolved)
2625
        return un_resolved, resolved
2626
3015.3.30 by Daniel Watkins
Moved check to WorkingTree.
2627
    @needs_read_lock
4332.3.2 by Robert Collins
Extract repository access in WorkingTree._check to be data driven, adding a new _get_check_refs method to support this.
2628
    def _check(self, references):
2629
        """Check the tree for consistency.
2630
2631
        :param references: A dict with keys matching the items returned by
2632
            self._get_check_refs(), and values from looking those keys up in
2633
            the repository.
2634
        """
3015.3.30 by Daniel Watkins
Moved check to WorkingTree.
2635
        tree_basis = self.basis_tree()
2636
        tree_basis.lock_read()
2637
        try:
4332.3.2 by Robert Collins
Extract repository access in WorkingTree._check to be data driven, adding a new _get_check_refs method to support this.
2638
            repo_basis = references[('trees', self.last_revision())]
3015.3.58 by Daniel Watkins
Various other cleanup as requested by reviews.
2639
            if len(list(repo_basis.iter_changes(tree_basis))) > 0:
3015.3.30 by Daniel Watkins
Moved check to WorkingTree.
2640
                raise errors.BzrCheckError(
2641
                    "Mismatched basis inventory content.")
2642
            self._validate()
2643
        finally:
2644
            tree_basis.unlock()
2645
2371.2.1 by John Arbash Meinel
Update DirState._validate() to detect rename errors.
2646
    def _validate(self):
2647
        """Validate internal structures.
2648
2649
        This is meant mostly for the test suite. To give it a chance to detect
2650
        corruption after actions have occurred. The default implementation is a
2651
        just a no-op.
2652
2653
        :return: None. An exception should be raised if there is an error.
2654
        """
2655
        return
2656
5630.2.4 by John Arbash Meinel
Basically works in the case where the dirstate isn't corrupted.
2657
    @needs_read_lock
5630.2.3 by John Arbash Meinel
Looks like it was a stale experimental .pyd file causing trouble. Tests pass again now.
2658
    def check_state(self):
2659
        """Check that the working state is/isn't valid."""
5630.2.4 by John Arbash Meinel
Basically works in the case where the dirstate isn't corrupted.
2660
        check_refs = self._get_check_refs()
2661
        refs = {}
2662
        for ref in check_refs:
2663
            kind, value = ref
2664
            if kind == 'trees':
2665
                refs[ref] = self.branch.repository.revision_tree(value)
2666
        self._check(refs)
2667
2668
    @needs_tree_write_lock
2669
    def reset_state(self, revision_ids=None):
2670
        """Reset the state of the working tree.
2671
2672
        This does a hard-reset to a last-known-good state. This is a way to
2673
        fix if something got corrupted (like the .bzr/checkout/dirstate file)
2674
        """
2675
        if revision_ids is None:
2676
            revision_ids = self.get_parent_ids()
2677
        if not revision_ids:
2678
            rt = self.branch.repository.revision_tree(
2679
                _mod_revision.NULL_REVISION)
2680
        else:
2681
            rt = self.branch.repository.revision_tree(revision_ids[0])
2682
        self._write_inventory(rt.inventory)
2683
        self.set_parent_ids(revision_ids)
5630.2.2 by John Arbash Meinel
Start fleshing out the design. Something weird is causing my tests to all fail.
2684
3398.1.24 by Ian Clatworthy
make iter_search_rules a tree method
2685
    def _get_rules_searcher(self, default_searcher):
2686
        """See Tree._get_rules_searcher."""
2687
        if self._rules_searcher is None:
2688
            self._rules_searcher = super(WorkingTree,
2689
                self)._get_rules_searcher(default_searcher)
2690
        return self._rules_searcher
2691
0.12.68 by Aaron Bentley
Update docs, move items to proper files.
2692
    def get_shelf_manager(self):
2693
        """Return the ShelfManager for this WorkingTree."""
2694
        from bzrlib.shelf import ShelfManager
2695
        return ShelfManager(self, self._transport)
2696
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2697
2698
class WorkingTree3(WorkingTree):
2699
    """This is the Format 3 working tree.
2700
2701
    This differs from the base WorkingTree by:
2702
     - having its own file lock
2703
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2704
2705
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2706
    """
2707
2708
    @needs_read_lock
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
2709
    def _last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
2710
        """See Mutable.last_revision."""
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2711
        try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2712
            return self._transport.get_bytes('last-revision')
2206.1.7 by Marius Kruger
* errors
2713
        except errors.NoSuchFile:
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
2714
            return _mod_revision.NULL_REVISION
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2715
2716
    def _change_last_revision(self, revision_id):
2717
        """See WorkingTree._change_last_revision."""
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
2718
        if revision_id is None or revision_id == _mod_revision.NULL_REVISION:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2719
            try:
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
2720
                self._transport.delete('last-revision')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2721
            except errors.NoSuchFile:
2722
                pass
2723
            return False
2724
        else:
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
2725
            self._transport.put_bytes('last-revision', revision_id,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2726
                mode=self.bzrdir._get_file_mode())
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2727
            return True
2728
4332.3.2 by Robert Collins
Extract repository access in WorkingTree._check to be data driven, adding a new _get_check_refs method to support this.
2729
    def _get_check_refs(self):
2730
        """Return the references needed to perform a check of this tree."""
2731
        return [('trees', self.last_revision())]
2732
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2733
    @needs_tree_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2734
    def set_conflicts(self, conflicts):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2735
        self._put_rio('conflicts', conflicts.to_stanzas(),
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
2736
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2737
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
2738
    @needs_tree_write_lock
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2739
    def add_conflicts(self, new_conflicts):
2740
        conflict_set = set(self.conflicts())
2741
        conflict_set.update(set(list(new_conflicts)))
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2742
        self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
2743
                                       key=_mod_conflicts.Conflict.sort_key)))
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
2744
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2745
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
2746
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2747
        try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2748
            confile = self._transport.get('conflicts')
2206.1.7 by Marius Kruger
* errors
2749
        except errors.NoSuchFile:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2750
            return _mod_conflicts.ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2751
        try:
3619.6.2 by Mark Hammond
ensure the conflict list file is closed before returning.
2752
            try:
2753
                if confile.next() != CONFLICT_HEADER_1 + '\n':
2754
                    raise errors.ConflictFormatError()
2755
            except StopIteration:
2206.1.7 by Marius Kruger
* errors
2756
                raise errors.ConflictFormatError()
3619.6.2 by Mark Hammond
ensure the conflict list file is closed before returning.
2757
            return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2758
        finally:
2759
            confile.close()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2760
1852.4.2 by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
2761
    def unlock(self):
2665.3.3 by Daniel Watkins
Added _cleanup() to the unlock() method of all implementations of WorkingTree so that the cached ignore definitions are wiped when a lock is lost.
2762
        # do non-implementation specific cleanup
2763
        self._cleanup()
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2764
        if self._control_files._lock_count == 1:
2765
            # _inventory_is_modified is always False during a read lock.
2766
            if self._inventory_is_modified:
2767
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2768
            self._write_hashcache_if_dirty()
1852.4.2 by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.
2769
        # reverse order of locking.
2770
        try:
2771
            return self._control_files.unlock()
2772
        finally:
2773
            self.branch.unlock()
2774
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2775
5669.3.9 by Jelmer Vernooij
Consistent naming.
2776
class WorkingTreeFormatRegistry(controldir.ControlComponentFormatRegistry):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2777
    """Registry for working tree formats."""
2778
2779
    def __init__(self, other_registry=None):
2780
        super(WorkingTreeFormatRegistry, self).__init__(other_registry)
2781
        self._default_format = None
2782
2783
    def get_default(self):
2784
        """Return the current default format."""
2785
        return self._default_format
2786
2787
    def set_default(self, format):
2788
        self._default_format = format
2789
2790
2791
format_registry = WorkingTreeFormatRegistry()
2792
2793
5669.3.10 by Jelmer Vernooij
Use ControlComponentFormat.
2794
class WorkingTreeFormat(controldir.ControlComponentFormat):
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2795
    """An encapsulation of the initialization and open routines for a format.
2796
2797
    Formats provide three things:
2798
     * An initialization routine,
2799
     * a format string,
2800
     * an open routine.
2801
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2802
    Formats are placed in an dict by their format string for reference
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2803
    during workingtree opening. Its not required that these be instances, they
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2804
    can be classes themselves with class methods - it simply depends on
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2805
    whether state is needed for a given format or not.
2806
2807
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2808
    methods on the format class. Do not deprecate the object, as the
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2809
    object will be created every time regardless.
2810
    """
2811
2100.3.14 by Aaron Bentley
Test workingtree4 format, prevent use with old repos
2812
    requires_rich_root = False
2813
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2814
    upgrade_recommended = False
2815
5582.10.29 by Jelmer Vernooij
Add requires_normalized_unicode_filenames
2816
    requires_normalized_unicode_filenames = False
2817
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
2818
    case_sensitive_filename = "FoRMaT"
2819
5661.1.1 by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.
2820
    missing_parent_conflicts = False
2821
    """If this format supports missing parent conflicts."""
2822
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2823
    @classmethod
2824
    def find_format(klass, a_bzrdir):
2825
        """Return the format for the working tree object in a_bzrdir."""
2826
        try:
2827
            transport = a_bzrdir.get_workingtree_transport(None)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2828
            format_string = transport.get_bytes("format")
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2829
            return format_registry.get(format_string)
2206.1.7 by Marius Kruger
* errors
2830
        except errors.NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2831
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2832
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
2833
            raise errors.UnknownFormatError(format=format_string,
2834
                                            kind="working tree")
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2835
5683.1.1 by Jelmer Vernooij
Add stub WorkingTreeFormat.initialize().
2836
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2837
                   accelerator_tree=None, hardlink=False):
2838
        """Initialize a new working tree in a_bzrdir.
2839
2840
        :param a_bzrdir: BzrDir to initialize the working tree in.
2841
        :param revision_id: allows creating a working tree at a different
2842
            revision than the branch is at.
2843
        :param from_branch: Branch to checkout
2844
        :param accelerator_tree: A tree which can be used for retrieving file
2845
            contents more quickly than the revision tree, i.e. a workingtree.
2846
            The revision tree will be used for cases where accelerator_tree's
2847
            content is different.
2848
        :param hardlink: If true, hard-link files from accelerator_tree,
2849
            where possible.
2850
        """
2851
        raise NotImplementedError(self.initialize)
2852
2100.3.35 by Aaron Bentley
equality operations on bzrdir
2853
    def __eq__(self, other):
2854
        return self.__class__ is other.__class__
2855
2856
    def __ne__(self, other):
2857
        return not (self == other)
2858
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2859
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2860
    @symbol_versioning.deprecated_method(
2861
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2862
    def get_default_format(klass):
2863
        """Return the current default format."""
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2864
        return format_registry.get_default()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2865
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2866
    def get_format_string(self):
2867
        """Return the ASCII format string that identifies this format."""
2868
        raise NotImplementedError(self.get_format_string)
2869
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2870
    def get_format_description(self):
2871
        """Return the short description for this format."""
2872
        raise NotImplementedError(self.get_format_description)
2873
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2874
    def is_supported(self):
2875
        """Is this format supported?
2876
2877
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2878
        Unsupported formats may not support initialization or committing or
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2879
        some other features depending on the reason for not being supported.
2880
        """
2881
        return True
2882
3907.2.1 by Ian Clatworthy
WorkingTreeFormat5 supporting content filtering and views
2883
    def supports_content_filtering(self):
2884
        """True if this format supports content filtering."""
2885
        return False
2886
3586.1.4 by Ian Clatworthy
first cut at tree-level view tests
2887
    def supports_views(self):
2888
        """True if this format supports stored views."""
2889
        return False
2890
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2891
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2892
    @symbol_versioning.deprecated_method(
2893
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2894
    def register_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2895
        format_registry.register(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2896
2897
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2898
    @symbol_versioning.deprecated_method(
2899
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
2900
    def register_extra_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2901
        format_registry.register_extra(format)
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
2902
2903
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2904
    @symbol_versioning.deprecated_method(
2905
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
2906
    def unregister_extra_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2907
        format_registry.unregister_extra(format)
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
2908
2909
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2910
    @symbol_versioning.deprecated_method(
2911
        symbol_versioning.deprecated_in((2, 4, 0)))
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
2912
    def get_formats(klass):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2913
        return format_registry._get_all()
5642.2.3 by Jelmer Vernooij
Add WorkingTreeFormat.register_extra_format and friends.
2914
2915
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2916
    @symbol_versioning.deprecated_method(
2917
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2918
    def set_default_format(klass, format):
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2919
        format_registry.set_default(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2920
2921
    @classmethod
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
2922
    @symbol_versioning.deprecated_method(
2923
        symbol_versioning.deprecated_in((2, 4, 0)))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2924
    def unregister_format(klass, format):
5662.3.3 by Jelmer Vernooij
add tests
2925
        format_registry.remove(format)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2926
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2927
2928
class WorkingTreeFormat3(WorkingTreeFormat):
2929
    """The second working tree format updated to record a format marker.
2930
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2931
    This format:
2932
        - exists within a metadir controlling .bzr
2933
        - includes an explicit version marker for the workingtree control
2934
          files, separate from the BzrDir format
2935
        - modifies the hash cache format
2936
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2937
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2938
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2939
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
2940
    upgrade_recommended = True
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2941
5661.1.1 by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.
2942
    missing_parent_conflicts = True
2943
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2944
    def get_format_string(self):
2945
        """See WorkingTreeFormat.get_format_string()."""
1553.5.81 by Martin Pool
Revert change to WorkingTreeFormat3 format string; too many things want it the old way
2946
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2947
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2948
    def get_format_description(self):
2949
        """See WorkingTreeFormat.get_format_description()."""
2950
        return "Working tree format 3"
2951
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2952
    _lock_file_name = 'lock'
2953
    _lock_class = LockDir
2954
2100.3.3 by Aaron Bentley
Start of work on format 4 trees
2955
    _tree_class = WorkingTree3
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2956
2100.3.15 by Aaron Bentley
get test suite passing
2957
    def __get_matchingbzrdir(self):
2958
        return bzrdir.BzrDirMetaFormat1()
2959
2960
    _matchingbzrdir = property(__get_matchingbzrdir)
2961
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2962
    def _open_control_files(self, a_bzrdir):
2963
        transport = a_bzrdir.get_workingtree_transport(None)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2964
        return LockableFiles(transport, self._lock_file_name,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2965
                             self._lock_class)
2966
3123.5.3 by Aaron Bentley
Get tests passing with accelerator_tree
2967
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
2968
                   accelerator_tree=None, hardlink=False):
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2969
        """See WorkingTreeFormat.initialize().
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2970
3123.5.17 by Aaron Bentley
Update docs
2971
        :param revision_id: if supplied, create a working tree at a different
2972
            revision than the branch is at.
2973
        :param accelerator_tree: A tree which can be used for retrieving file
2974
            contents more quickly than the revision tree, i.e. a workingtree.
2975
            The revision tree will be used for cases where accelerator_tree's
2976
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
2977
        :param hardlink: If true, hard-link files from accelerator_tree,
2978
            where possible.
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2979
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2980
        if not isinstance(a_bzrdir.transport, LocalTransport):
2981
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2982
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2983
        control_files = self._open_control_files(a_bzrdir)
2984
        control_files.create_lock()
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
2985
        control_files.lock_write()
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2986
        transport.put_bytes('format', self.get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2987
            mode=a_bzrdir._get_file_mode())
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
2988
        if from_branch is not None:
2989
            branch = from_branch
2990
        else:
2991
            branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2992
        if revision_id is None:
2598.5.7 by Aaron Bentley
Updates from review
2993
            revision_id = _mod_revision.ensure_null(branch.last_revision())
2084.1.1 by John Arbash Meinel
Don't create new working trees with unique roots, because it breaks older versions of bzr
2994
        # WorkingTree3 can handle an inventory which has a unique root id.
2995
        # as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
2996
        # those trees. And because there isn't a format bump inbetween, we
2997
        # are maintaining compatibility with older clients.
2998
        # inv = Inventory(root_id=gen_root_id())
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
2999
        inv = self._initial_inventory()
2100.3.8 by Aaron Bentley
Add add_reference
3000
        wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
3001
                         branch,
3002
                         inv,
3003
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
3004
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
3005
                         _bzrdir=a_bzrdir,
3006
                         _control_files=control_files)
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
3007
        wt.lock_tree_write()
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
3008
        try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
3009
            basis_tree = branch.repository.revision_tree(revision_id)
1986.5.8 by Robert Collins
Merge bzr.dev.
3010
            # only set an explicit root id if there is one to set.
3011
            if basis_tree.inventory.root is not None:
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
3012
                wt.set_root_id(basis_tree.get_root_id())
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
3013
            if revision_id == _mod_revision.NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
3014
                wt.set_parent_trees([])
3015
            else:
3016
                wt.set_parent_trees([(revision_id, basis_tree)])
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
3017
            transform.build_tree(basis_tree, wt)
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
3018
        finally:
1986.5.7 by Robert Collins
Merge reviews.
3019
            # Unlock in this order so that the unlock-triggers-flush in
1986.5.4 by Robert Collins
Update comments and unlock in a better order in tree initialization (Robert Collins, John Meinel)
3020
            # WorkingTree is given a chance to fire.
3021
            control_files.unlock()
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
3022
            wt.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3023
        return wt
3024
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
3025
    def _initial_inventory(self):
4496.3.4 by Andrew Bennetts
Tidy up unused and redundant imports in workingtree.py.
3026
        return inventory.Inventory()
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
3027
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3028
    def __init__(self):
3029
        super(WorkingTreeFormat3, self).__init__()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
3030
3031
    def open(self, a_bzrdir, _found=False):
3032
        """Return the WorkingTree object for a_bzrdir
3033
3034
        _found is a private parameter, do not use it. It is used to indicate
3035
               if format probing has already been done.
3036
        """
3037
        if not _found:
3038
            # we are being called directly and must probe.
3039
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3040
        if not isinstance(a_bzrdir.transport, LocalTransport):
3041
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
2323.6.4 by Martin Pool
BzrDir._check_supported now also takes care of recommending upgrades, which
3042
        wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
3043
        return wt
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
3044
3045
    def _open(self, a_bzrdir, control_files):
3046
        """Open the tree itself.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3047
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
3048
        :param a_bzrdir: the dir for the tree.
3049
        :param control_files: the control files for the tree.
3050
        """
2100.3.3 by Aaron Bentley
Start of work on format 4 trees
3051
        return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),
3052
                                _internal=True,
3053
                                _format=self,
3054
                                _bzrdir=a_bzrdir,
3055
                                _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3056
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
3057
    def __str__(self):
3058
        return self.get_format_string()
3059
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
3060
4599.4.4 by Robert Collins
Change the working tree default format to match 2a in the bzrdir registry.
3061
__default_format = WorkingTreeFormat6()
5662.3.1 by Jelmer Vernooij
Add WorkingTreeFormatRegistry.
3062
format_registry.register_lazy("Bazaar Working Tree Format 4 (bzr 0.15)\n",
3063
    "bzrlib.workingtree_4", "WorkingTreeFormat4")
3064
format_registry.register_lazy("Bazaar Working Tree Format 5 (bzr 1.11)\n",
3065
    "bzrlib.workingtree_4", "WorkingTreeFormat5")
3066
format_registry.register_lazy("Bazaar Working Tree Format 6 (bzr 1.14)\n",
3067
    "bzrlib.workingtree_4", "WorkingTreeFormat6")
3068
format_registry.register(WorkingTreeFormat3())
3069
format_registry.set_default(__default_format)