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