~bzr-pqm/bzr/bzr.dev

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