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