/brz/remove-bazaar

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