~bzr-pqm/bzr/bzr.dev

1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1
# Copyright (C) 2005, 2006 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
41
42
from bzrlib.lazy_import import lazy_import
43
lazy_import(globals(), """
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
44
import collections
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
45
from copy import deepcopy
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
46
import errno
1398 by Robert Collins
integrate in Gustavos x-bit patch
47
import stat
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
48
from time import time
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
49
import warnings
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
50
1836.1.21 by John Arbash Meinel
Restore the ability to ignore items by modifying DEFAULT_IGNORE
51
import bzrlib
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
52
from bzrlib import (
53
    bzrdir,
54
    conflicts as _mod_conflicts,
55
    errors,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
56
    generate_ids,
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
57
    globbing,
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
58
    hashcache,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
59
    ignores,
60
    merge,
61
    osutils,
62
    textui,
63
    transform,
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
64
    urlutils,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
65
    xml5,
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
66
    xml6,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
67
    )
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
68
import bzrlib.branch
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
69
from bzrlib.transport import get_transport
70
import bzrlib.ui
71
""")
72
1986.5.6 by Robert Collins
Merge bzr.dev.
73
from bzrlib import symbol_versioning
1534.4.28 by Robert Collins
first cut at merge from integration.
74
from bzrlib.decorators import needs_read_lock, needs_write_lock
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
75
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
76
from bzrlib.lockable_files import LockableFiles, TransportLock
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
77
from bzrlib.lockdir import LockDir
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
78
import bzrlib.mutabletree
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
79
from bzrlib.mutabletree import needs_tree_write_lock
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
80
from bzrlib.osutils import (
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
81
    compact_date,
82
    file_kind,
83
    isdir,
2206.1.8 by Marius Kruger
Converted move/rename error messages to show source => target.
84
    normpath,
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
85
    pathjoin,
86
    rand_chars,
2206.1.8 by Marius Kruger
Converted move/rename error messages to show source => target.
87
    realpath,
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
88
    safe_unicode,
89
    splitpath,
90
    supports_executable,
91
    )
92
from bzrlib.trace import mutter, note
93
from bzrlib.transport.local import LocalTransport
94
import bzrlib.tree
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
95
from bzrlib.progress import DummyProgress, ProgressPhase
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
96
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
97
import bzrlib.revisiontree
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
98
from bzrlib.rio import RioReader, rio_file, Stanza
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
99
from bzrlib.symbol_versioning import (deprecated_passed,
100
        deprecated_method,
101
        deprecated_function,
102
        DEPRECATED_PARAMETER,
103
        zero_eight,
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
104
        zero_eleven,
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
105
        zero_thirteen,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
106
        )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
107
108
109
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
110
CONFLICT_HEADER_1 = "BZR conflict list format 1"
1685.1.30 by John Arbash Meinel
PEP8 for workingtree.py
111
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
112
113
@deprecated_function(zero_thirteen)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
114
def gen_file_id(name):
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
115
    """Return new file id for the basename 'name'.
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
116
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
117
    Use bzrlib.generate_ids.gen_file_id() instead
1185.85.34 by John Arbash Meinel
Updating 'bzr file-id' exposed that we weren't allowing unicode file ids. Enabling them reveals a lot more bugs.
118
    """
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
119
    return generate_ids.gen_file_id(name)
120
121
122
@deprecated_function(zero_thirteen)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
123
def gen_root_id():
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
124
    """Return a new tree-root file id.
125
126
    This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
127
    """
128
    return generate_ids.gen_root_id()
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
129
130
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
131
class TreeEntry(object):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
132
    """An entry that implements the minimum interface used by commands.
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
133
134
    This needs further inspection, it may be better to have 
135
    InventoryEntries without ids - though that seems wrong. For now,
136
    this is a parallel hierarchy to InventoryEntry, and needs to become
137
    one of several things: decorates to that hierarchy, children of, or
138
    parents of it.
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
139
    Another note is that these objects are currently only used when there is
140
    no InventoryEntry available - i.e. for unversioned objects.
141
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
142
    """
143
 
144
    def __eq__(self, other):
145
        # yes, this us ugly, TODO: best practice __eq__ style.
146
        return (isinstance(other, TreeEntry)
147
                and other.__class__ == self.__class__)
148
 
149
    def kind_character(self):
150
        return "???"
151
152
153
class TreeDirectory(TreeEntry):
154
    """See TreeEntry. This is a directory in a working tree."""
155
156
    def __eq__(self, other):
157
        return (isinstance(other, TreeDirectory)
158
                and other.__class__ == self.__class__)
159
160
    def kind_character(self):
161
        return "/"
162
163
164
class TreeFile(TreeEntry):
165
    """See TreeEntry. This is a regular file in a working tree."""
166
167
    def __eq__(self, other):
168
        return (isinstance(other, TreeFile)
169
                and other.__class__ == self.__class__)
170
171
    def kind_character(self):
172
        return ''
173
174
175
class TreeLink(TreeEntry):
176
    """See TreeEntry. This is a symlink in a working tree."""
177
178
    def __eq__(self, other):
179
        return (isinstance(other, TreeLink)
180
                and other.__class__ == self.__class__)
181
182
    def kind_character(self):
183
        return ''
184
185
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
186
class WorkingTree(bzrlib.mutabletree.MutableTree):
453 by Martin Pool
- Split WorkingTree into its own file
187
    """Working copy tree.
188
189
    The inventory is held in the `Branch` working-inventory, and the
190
    files are in a directory on disk.
191
192
    It is possible for a `WorkingTree` to have a filename which is
193
    not listed in the Inventory and vice versa.
194
    """
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
195
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
196
    def __init__(self, basedir='.',
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
197
                 branch=DEPRECATED_PARAMETER,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
198
                 _inventory=None,
199
                 _control_files=None,
200
                 _internal=False,
201
                 _format=None,
202
                 _bzrdir=None):
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
203
        """Construct a WorkingTree for basedir.
204
205
        If the branch is not supplied, it is opened automatically.
206
        If the branch is supplied, it must be the branch for this basedir.
207
        (branch.base is not cross checked, because for remote branches that
208
        would be meaningless).
209
        """
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.
210
        self._format = _format
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
211
        self.bzrdir = _bzrdir
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
212
        if not _internal:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
213
            # not created via open etc.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
214
            warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. "
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
215
                 "Please use bzrdir.open_workingtree or WorkingTree.open().",
216
                 DeprecationWarning,
217
                 stacklevel=2)
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.
218
            wt = WorkingTree.open(basedir)
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
219
            self._branch = wt.branch
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
220
            self.basedir = wt.basedir
221
            self._control_files = wt._control_files
222
            self._hashcache = wt._hashcache
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
223
            self._set_inventory(wt._inventory, dirty=False)
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.
224
            self._format = wt._format
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
225
            self.bzrdir = wt.bzrdir
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
226
        assert isinstance(basedir, basestring), \
227
            "base directory %r is not a string" % basedir
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
228
        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.
229
        mutter("opening working tree %r", basedir)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
230
        if deprecated_passed(branch):
231
            if not _internal:
2206.1.7 by Marius Kruger
* errors
232
                warnings.warn("WorkingTree(..., branch=XXX) is deprecated"
233
                     " as of bzr 0.8. Please use bzrdir.open_workingtree() or"
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
234
                     " WorkingTree.open().",
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
235
                     DeprecationWarning,
236
                     stacklevel=2
237
                     )
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
238
            self._branch = branch
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
239
        else:
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
240
            self._branch = self.bzrdir.open_branch()
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
241
        self.basedir = realpath(basedir)
1534.4.28 by Robert Collins
first cut at merge from integration.
242
        # 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.
243
        if isinstance(self._format, WorkingTreeFormat2):
244
            # share control object
1534.4.28 by Robert Collins
first cut at merge from integration.
245
            self._control_files = self.branch.control_files
246
        else:
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
247
            # assume all other formats have their own control files.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
248
            assert isinstance(_control_files, LockableFiles), \
249
                    "_control_files must be a LockableFiles, not %r" \
250
                    % _control_files
251
            self._control_files = _control_files
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
252
        # update the whole cache up front and write to disk if anything changed;
253
        # in the future we might want to do this more selectively
1467 by Robert Collins
WorkingTree.__del__ has been removed.
254
        # two possible ways offer themselves : in self._unlock, write the cache
255
        # if needed, or, when the cache sees a change, append it to the hash
256
        # cache file, and have the parser take the most recent entry for a
257
        # given path only.
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
258
        wt_trans = self.bzrdir.get_workingtree_transport(None)
259
        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.
260
        self._hashcache = hashcache.HashCache(basedir, cache_filename,
261
                                              self._control_files._file_mode)
262
        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.
263
        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.
264
        # 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
265
        #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.
266
267
        if hc.needs_write:
268
            mutter("write hc")
269
            hc.write()
453 by Martin Pool
- Split WorkingTree into its own file
270
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
271
        if _inventory is None:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
272
            self._inventory_is_modified = False
273
            self.read_working_inventory()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
274
        else:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
275
            # the caller of __init__ has provided an inventory,
276
            # we assume they know what they are doing - as its only
277
            # the Format factory and creation methods that are
278
            # permitted to do this.
279
            self._set_inventory(_inventory, dirty=False)
1185.60.6 by Aaron Bentley
Fixed hashcache
280
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
281
    branch = property(
282
        fget=lambda self: self._branch,
283
        doc="""The branch this WorkingTree is connected to.
284
285
            This cannot be set - it is reflective of the actual disk structure
286
            the working tree has been constructed from.
287
            """)
288
1687.1.9 by Robert Collins
Teach WorkingTree about break-lock.
289
    def break_lock(self):
290
        """Break a lock if one is present from another instance.
291
292
        Uses the ui factory to ask for confirmation if the lock may be from
293
        an active process.
294
295
        This will probe the repository for its lock as well.
296
        """
297
        self._control_files.break_lock()
298
        self.branch.break_lock()
299
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
300
    def _set_inventory(self, inv, dirty):
301
        """Set the internal cached inventory.
302
303
        :param inv: The inventory to set.
304
        :param dirty: A boolean indicating whether the inventory is the same
305
            logical inventory as whats on disk. If True the inventory is not
306
            the same and should be written to disk or data will be lost, if
307
            False then the inventory is the same as that on disk and any
308
            serialisation would be unneeded overhead.
309
        """
1910.2.6 by Aaron Bentley
Update for merge review, handle deprecations
310
        assert inv.root is not None
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
311
        self._inventory = inv
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
312
        self._inventory_is_modified = dirty
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
313
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
314
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
315
    def open(path=None, _unsupported=False):
316
        """Open an existing working tree at path.
317
318
        """
319
        if path is None:
320
            path = os.path.getcwdu()
321
        control = bzrdir.BzrDir.open(path, _unsupported)
322
        return control.open_workingtree(_unsupported)
323
        
324
    @staticmethod
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
325
    def open_containing(path=None):
326
        """Open an existing working tree which has its root about path.
327
        
328
        This probes for a working tree at path and searches upwards from there.
329
330
        Basically we keep looking up until we find the control directory or
331
        run into /.  If there isn't one, raises NotBranchError.
332
        TODO: give this a new exception.
333
        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
334
335
        :return: The WorkingTree that contains 'path', and the rest of path
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
336
        """
337
        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
338
            path = osutils.getcwd()
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
339
        control, relpath = bzrdir.BzrDir.open_containing(path)
1685.1.27 by John Arbash Meinel
BzrDir works in URLs, but WorkingTree works in unicode paths
340
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
341
        return control.open_workingtree(), relpath
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
342
343
    @staticmethod
344
    def open_downlevel(path=None):
345
        """Open an unsupported working tree.
346
347
        Only intended for advanced situations like upgrading part of a bzrdir.
348
        """
349
        return WorkingTree.open(path, _unsupported=True)
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
350
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
351
    def __iter__(self):
352
        """Iterate through file_ids for this tree.
353
354
        file_ids are in a WorkingTree if they are in the working inventory
355
        and the working file exists.
356
        """
357
        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.
358
        for path, ie in inv.iter_entries():
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
359
            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.
360
                yield ie.file_id
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
361
453 by Martin Pool
- Split WorkingTree into its own file
362
    def __repr__(self):
363
        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
364
                               getattr(self, 'basedir', None))
453 by Martin Pool
- Split WorkingTree into its own file
365
366
    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 \
367
        return pathjoin(self.basedir, filename)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
368
    
369
    def basis_tree(self):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
370
        """Return RevisionTree for the current last revision.
371
        
372
        If the left most parent is a ghost then the returned tree will be an
373
        empty tree - one obtained by calling repository.revision_tree(None).
374
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
375
        try:
376
            revision_id = self.get_parent_ids()[0]
377
        except IndexError:
378
            # no parents, return an empty revision tree.
379
            # in the future this should return the tree for
380
            # 'empty:' - the implicit root empty tree.
381
            return self.branch.repository.revision_tree(None)
382
        else:
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
383
            try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
384
                xml = self.read_basis_inventory()
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
385
                inv = xml6.serializer_v6.read_inventory_from_string(xml)
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
386
                if inv is not None and inv.revision_id == revision_id:
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
387
                    return bzrlib.revisiontree.RevisionTree(
388
                        self.branch.repository, inv, revision_id)
2206.1.7 by Marius Kruger
* errors
389
            except (errors.NoSuchFile, errors.BadInventoryFormat):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
390
                pass
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
391
        # No cached copy available, retrieve from the repository.
392
        # FIXME? RBC 20060403 should we cache the inventory locally
393
        # 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.
394
        try:
395
            return self.branch.repository.revision_tree(revision_id)
396
        except errors.RevisionNotPresent:
397
            # the basis tree *may* be a ghost or a low level error may have
398
            # occured. If the revision is present, its a problem, if its not
399
            # its a ghost.
400
            if self.branch.repository.has_revision(revision_id):
401
                raise
1927.2.3 by Robert Collins
review comment application - paired with Martin.
402
            # 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.
403
            return self.branch.repository.revision_tree(None)
453 by Martin Pool
- Split WorkingTree into its own file
404
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
405
    @staticmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
406
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
407
    def create(branch, directory):
408
        """Create a workingtree for branch at directory.
409
410
        If existing_directory already exists it must have a .bzr directory.
411
        If it does not exist, it will be created.
412
413
        This returns a new WorkingTree object for the new checkout.
414
415
        TODO FIXME RBC 20060124 when we have checkout formats in place this
416
        should accept an optional revisionid to checkout [and reject this if
417
        checking out into the same dir as a pre-checkout-aware branch format.]
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
418
419
        XXX: When BzrDir is present, these should be created through that 
420
        interface instead.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
421
        """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
422
        warnings.warn('delete WorkingTree.create', stacklevel=3)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
423
        transport = get_transport(directory)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
424
        if branch.bzrdir.root_transport.base == transport.base:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
425
            # same dir 
426
            return branch.bzrdir.create_workingtree()
427
        # different directory, 
428
        # create a branch reference
429
        # and now a working tree.
430
        raise NotImplementedError
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
431
 
432
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
433
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
434
    def create_standalone(directory):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
435
        """Create a checkout and a branch and a repo at directory.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
436
437
        Directory must exist and be empty.
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
438
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
439
        please use BzrDir.create_standalone_workingtree
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
440
        """
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
441
        return bzrdir.BzrDir.create_standalone_workingtree(directory)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
442
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
443
    def relpath(self, path):
444
        """Return the local path portion from a given path.
445
        
446
        The path may be absolute or relative. If its a relative path it is 
447
        interpreted relative to the python current working directory.
448
        """
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
449
        return osutils.relpath(self.basedir, path)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
450
453 by Martin Pool
- Split WorkingTree into its own file
451
    def has_filename(self, filename):
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
452
        return osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
453
454
    def get_file(self, file_id):
455
        return self.get_file_byname(self.id2path(file_id))
456
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
457
    def get_file_text(self, file_id):
458
        return self.get_file(file_id).read()
459
453 by Martin Pool
- Split WorkingTree into its own file
460
    def get_file_byname(self, filename):
461
        return file(self.abspath(filename), 'rb')
462
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
463
    def annotate_iter(self, file_id):
464
        """See Tree.annotate_iter
465
466
        This implementation will use the basis tree implementation if possible.
467
        Lines not in the basis are attributed to CURRENT_REVISION
468
469
        If there are pending merges, lines added by those merges will be
470
        incorrectly attributed to CURRENT_REVISION (but after committing, the
471
        attribution will be correct).
472
        """
473
        basis = self.basis_tree()
474
        changes = self._iter_changes(basis, True, [file_id]).next()
475
        changed_content, kind = changes[2], changes[6]
476
        if not changed_content:
477
            return basis.annotate_iter(file_id)
478
        if kind[1] is None:
479
            return None
480
        import annotate
481
        if kind[0] != 'file':
482
            old_lines = []
483
        else:
484
            old_lines = list(basis.annotate_iter(file_id))
1551.9.17 by Aaron Bentley
Annotate for working trees across all parents
485
        old = [old_lines]
486
        for tree in self.branch.repository.revision_trees(
487
            self.get_parent_ids()[1:]):
488
            if file_id not in tree:
489
                continue
490
            old.append(list(tree.annotate_iter(file_id)))
491
        return annotate.reannotate(old, self.get_file(file_id).readlines(),
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
492
                                   CURRENT_REVISION)
1551.9.18 by Aaron Bentley
Updates from review comments
493
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
494
    def get_parent_ids(self):
495
        """See Tree.get_parent_ids.
496
        
497
        This implementation reads the pending merges list and last_revision
498
        value and uses that to decide what the parents list should be.
499
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
500
        last_rev = self._last_revision()
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
501
        if last_rev is None:
502
            parents = []
503
        else:
504
            parents = [last_rev]
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
505
        try:
506
            merges_file = self._control_files.get_utf8('pending-merges')
2206.1.7 by Marius Kruger
* errors
507
        except errors.NoSuchFile:
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
508
            pass
509
        else:
510
            for l in merges_file.readlines():
511
                parents.append(l.rstrip('\n'))
512
        return parents
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
513
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.
514
    @needs_read_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
515
    def get_root_id(self):
516
        """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.
517
        return self._inventory.root.file_id
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
518
        
453 by Martin Pool
- Split WorkingTree into its own file
519
    def _get_store_filename(self, file_id):
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
520
        ## XXX: badly named; this is not in the store at all
453 by Martin Pool
- Split WorkingTree into its own file
521
        return self.abspath(self.id2path(file_id))
522
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
523
    @needs_read_lock
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.
524
    def clone(self, to_bzrdir, revision_id=None, basis=None):
525
        """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()
526
        
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.
527
        Specifically modified files are kept as modified, but
528
        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()
529
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
530
        If 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()
531
532
        revision
533
            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.
534
            revision, and and difference between the source trees last revision
535
            and this one merged in.
536
537
        basis
538
            If not None, a closer copy of a tree which may have some files in
539
            common, and which file content should be preferentially copied from.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
540
        """
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.
541
        # assumes the target bzr dir format is compatible.
542
        result = self._format.initialize(to_bzrdir)
543
        self.copy_content_into(result, revision_id)
544
        return result
545
546
    @needs_read_lock
547
    def copy_content_into(self, tree, revision_id=None):
548
        """Copy the current content and user files of this tree into tree."""
1731.1.33 by Aaron Bentley
Revert no-special-root changes
549
        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.
550
        if revision_id is None:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
551
            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.
552
        else:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
553
            # TODO now merge from tree.last_revision to revision (to preserve
554
            # user local changes)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
555
            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.
556
            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()
557
1248 by Martin Pool
- new weave based cleanup [broken]
558
    def id2abspath(self, file_id):
559
        return self.abspath(self.id2path(file_id))
560
1185.12.39 by abentley
Propogated has_or_had_id to Tree
561
    def has_id(self, file_id):
453 by Martin Pool
- Split WorkingTree into its own file
562
        # files that have been deleted are excluded
1185.12.39 by abentley
Propogated has_or_had_id to Tree
563
        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.
564
        if not inv.has_id(file_id):
453 by Martin Pool
- Split WorkingTree into its own file
565
            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.
566
        path = inv.id2path(file_id)
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
567
        return osutils.lexists(self.abspath(path))
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
568
1185.12.39 by abentley
Propogated has_or_had_id to Tree
569
    def has_or_had_id(self, file_id):
570
        if file_id == self.inventory.root.file_id:
571
            return True
572
        return self.inventory.has_id(file_id)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
573
574
    __contains__ = has_id
575
453 by Martin Pool
- Split WorkingTree into its own file
576
    def get_file_size(self, file_id):
1248 by Martin Pool
- new weave based cleanup [broken]
577
        return os.path.getsize(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
578
1185.60.6 by Aaron Bentley
Fixed hashcache
579
    @needs_read_lock
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
580
    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
581
        if not path:
582
            path = self._inventory.id2path(file_id)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
583
        return self._hashcache.get_sha1(path, stat_value)
453 by Martin Pool
- Split WorkingTree into its own file
584
1740.2.5 by Aaron Bentley
Merge from bzr.dev
585
    def get_file_mtime(self, file_id, path=None):
586
        if not path:
587
            path = self._inventory.id2path(file_id)
588
        return os.lstat(self.abspath(path)).st_mtime
589
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
590
    if not supports_executable():
591
        def is_executable(self, file_id, path=None):
1398 by Robert Collins
integrate in Gustavos x-bit patch
592
            return self._inventory[file_id].executable
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
593
    else:
594
        def is_executable(self, file_id, path=None):
595
            if not path:
596
                path = self._inventory.id2path(file_id)
1398 by Robert Collins
integrate in Gustavos x-bit patch
597
            mode = os.lstat(self.abspath(path)).st_mode
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
598
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1398 by Robert Collins
integrate in Gustavos x-bit patch
599
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
600
    @needs_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
601
    def _add(self, files, ids, kinds):
602
        """See MutableTree._add."""
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
603
        # TODO: Re-adding a file that is removed in the working copy
604
        # 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
605
        # the read and write working inventory should not occur in this 
606
        # function - they should be part of lock_write and unlock.
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
607
        inv = self.read_working_inventory()
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
608
        for f, file_id, kind in zip(files, ids, kinds):
609
            assert kind is not None
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
610
            if file_id is None:
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
611
                inv.add_path(f, kind=kind)
612
            else:
613
                inv.add_path(f, kind=kind, file_id=file_id)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
614
        self._write_inventory(inv)
615
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
616
    @needs_tree_write_lock
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
617
    def _gather_kinds(self, files, kinds):
618
        """See MutableTree._gather_kinds."""
619
        for pos, f in enumerate(files):
620
            if kinds[pos] is None:
621
                fullpath = normpath(self.abspath(f))
622
                try:
623
                    kinds[pos] = file_kind(fullpath)
624
                except OSError, e:
625
                    if e.errno == errno.ENOENT:
2206.1.7 by Marius Kruger
* errors
626
                        raise errors.NoSuchFile(fullpath)
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
627
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
628
    @needs_write_lock
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
629
    def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
630
        """Add revision_id as a parent.
631
632
        This is equivalent to retrieving the current list of parent ids
633
        and setting the list to its value plus revision_id.
634
635
        :param revision_id: The revision id to add to the parent list. It may
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
636
        be a ghost revision as long as its not the first parent to be added,
637
        or the allow_leftmost_as_ghost parameter is set True.
638
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
639
        """
1908.5.13 by Robert Collins
Adding a parent when the first is a ghost already should not require forcing it.
640
        parents = self.get_parent_ids() + [revision_id]
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
641
        self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1
2206.1.7 by Marius Kruger
* errors
642
            or allow_leftmost_as_ghost)
1908.5.4 by Robert Collins
Add add_parent_tree_id WorkingTree helper api.
643
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
644
    @needs_tree_write_lock
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
645
    def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
646
        """Add revision_id, tree tuple as a parent.
647
648
        This is equivalent to retrieving the current list of parent trees
649
        and setting the list to its value plus parent_tuple. See also
650
        add_parent_tree_id - if you only have a parent id available it will be
651
        simpler to use that api. If you have the parent already available, using
652
        this api is preferred.
653
1908.5.12 by Robert Collins
Apply review feedback - paired with Martin.
654
        :param parent_tuple: The (revision id, tree) to add to the parent list.
655
            If the revision_id is a ghost, pass None for the tree.
656
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
657
        """
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
658
        parent_ids = self.get_parent_ids() + [parent_tuple[0]]
659
        if len(parent_ids) > 1:
660
            # the leftmost may have already been a ghost, preserve that if it
661
            # was.
662
            allow_leftmost_as_ghost = True
663
        self.set_parent_ids(parent_ids,
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
664
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.6 by Robert Collins
Add add_parent_tree to WorkingTree.
665
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
666
    @needs_tree_write_lock
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
667
    def add_pending_merge(self, *revision_ids):
668
        # TODO: Perhaps should check at this point that the
669
        # history of the revision is actually present?
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
670
        parents = self.get_parent_ids()
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
671
        updated = False
672
        for rev_id in revision_ids:
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
673
            if rev_id in parents:
674
                continue
675
            parents.append(rev_id)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
676
            updated = True
677
        if updated:
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
678
            self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
679
1908.7.7 by Robert Collins
Deprecated WorkingTree.pending_merges.
680
    @deprecated_method(zero_eleven)
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
681
    @needs_read_lock
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
682
    def pending_merges(self):
683
        """Return a list of pending merges.
684
685
        These are revisions that have been merged into the working
686
        directory but not yet committed.
1908.7.9 by Robert Collins
WorkingTree.last_revision and WorkingTree.pending_merges are deprecated.
687
688
        As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
689
        instead - which is available on all tree objects.
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
690
        """
1908.6.10 by Robert Collins
forward to get_parent_ids in pending_merges.
691
        return self.get_parent_ids()[1:]
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
692
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
693
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
694
        """Common ghost checking functionality from set_parent_*.
695
696
        This checks that the left hand-parent exists if there are any
697
        revisions present.
698
        """
699
        if len(revision_ids) > 0:
700
            leftmost_id = revision_ids[0]
701
            if (not allow_leftmost_as_ghost and not
702
                self.branch.repository.has_revision(leftmost_id)):
703
                raise errors.GhostRevisionUnusableHere(leftmost_id)
704
705
    def _set_merges_from_parent_ids(self, parent_ids):
706
        merges = parent_ids[1:]
707
        self._control_files.put_utf8('pending-merges', '\n'.join(merges))
708
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
709
    @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.
710
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
711
        """Set the parent ids to revision_ids.
712
        
713
        See also set_parent_trees. This api will try to retrieve the tree data
714
        for each element of revision_ids from the trees repository. If you have
715
        tree data already available, it is more efficient to use
716
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
717
        an easier API to use.
718
719
        :param revision_ids: The revision_ids to set as the parent ids of this
720
            working tree. Any of these may be ghosts.
721
        """
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
722
        self._check_parents_for_ghosts(revision_ids,
723
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
724
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
725
        if len(revision_ids) > 0:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
726
            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.
727
        else:
728
            self.set_last_revision(None)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
729
730
        self._set_merges_from_parent_ids(revision_ids)
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
731
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
732
    @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.
733
    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
734
        """See MutableTree.set_parent_trees."""
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
735
        parent_ids = [rev for (rev, tree) in parents_list]
736
737
        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.
738
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.2 by Robert Collins
Create and test set_parent_trees.
739
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
740
        if len(parent_ids) == 0:
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
741
            leftmost_parent_id = None
742
            leftmost_parent_tree = None
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
743
        else:
744
            leftmost_parent_id, leftmost_parent_tree = parents_list[0]
745
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
746
        if self._change_last_revision(leftmost_parent_id):
747
            if leftmost_parent_tree is None:
2041.1.4 by John Arbash Meinel
NEWS and documentation
748
                # If we don't have a tree, fall back to reading the
749
                # parent tree from the repository.
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
750
                self._cache_basis_inventory(leftmost_parent_id)
751
            else:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
752
                inv = leftmost_parent_tree.inventory
753
                xml = self._create_basis_xml_from_inventory(
754
                                        leftmost_parent_id, inv)
755
                self._write_basis_inventory(xml)
756
        self._set_merges_from_parent_ids(parent_ids)
757
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
758
    @needs_tree_write_lock
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
759
    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.
760
        parents = self.get_parent_ids()
761
        leftmost = parents[:1]
762
        new_parents = leftmost + rev_list
763
        self.set_parent_ids(new_parents)
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
764
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
765
    @needs_tree_write_lock
1534.7.192 by Aaron Bentley
Record hashes produced by merges
766
    def set_merge_modified(self, modified_hashes):
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
767
        def iter_stanzas():
768
            for file_id, hash in modified_hashes.iteritems():
769
                yield Stanza(file_id=file_id, hash=hash)
770
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
771
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
772
    @needs_tree_write_lock
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
773
    def _put_rio(self, filename, stanzas, header):
774
        my_file = rio_file(stanzas, header)
775
        self._control_files.put(filename, my_file)
1534.7.192 by Aaron Bentley
Record hashes produced by merges
776
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
777
    @needs_write_lock # because merge pulls data into the branch.
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
778
    def merge_from_branch(self, branch, to_revision=None):
779
        """Merge from a branch into this working tree.
780
781
        :param branch: The branch to merge from.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
782
        :param to_revision: If non-None, the merge will merge to to_revision,
783
            but not beyond it. to_revision does not need to be in the history
2206.1.7 by Marius Kruger
* errors
784
            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.
785
            branch.last_revision().
786
        """
787
        from bzrlib.merge import Merger, Merge3Merger
788
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
789
        try:
790
            merger = Merger(self.branch, this_tree=self, pb=pb)
791
            merger.pp = ProgressPhase("Merge phase", 5, pb)
792
            merger.pp.next_phase()
793
            # check that there are no
794
            # local alterations
795
            merger.check_basis(check_clean=True, require_commits=False)
796
            if to_revision is None:
797
                to_revision = branch.last_revision()
798
            merger.other_rev_id = to_revision
799
            if merger.other_rev_id is None:
800
                raise error.NoCommits(branch)
801
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
802
            merger.other_basis = merger.other_rev_id
803
            merger.other_tree = self.branch.repository.revision_tree(
804
                merger.other_rev_id)
805
            merger.pp.next_phase()
806
            merger.find_base()
807
            if merger.base_rev_id == merger.other_rev_id:
808
                raise errors.PointlessMerge
809
            merger.backup_files = False
810
            merger.merge_type = Merge3Merger
811
            merger.set_interesting_files(None)
812
            merger.show_base = False
813
            merger.reprocess = False
814
            conflicts = merger.do_merge()
815
            merger.set_pending()
816
        finally:
817
            pb.finished()
818
        return conflicts
819
1534.7.192 by Aaron Bentley
Record hashes produced by merges
820
    @needs_read_lock
821
    def merge_modified(self):
822
        try:
823
            hashfile = self._control_files.get('merge-hashes')
2206.1.7 by Marius Kruger
* errors
824
        except errors.NoSuchFile:
1534.7.192 by Aaron Bentley
Record hashes produced by merges
825
            return {}
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
826
        merge_hashes = {}
827
        try:
828
            if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
2206.1.7 by Marius Kruger
* errors
829
                raise errors.MergeModifiedFormatError()
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
830
        except StopIteration:
2206.1.7 by Marius Kruger
* errors
831
            raise errors.MergeModifiedFormatError()
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
832
        for s in RioReader(hashfile):
1534.7.198 by Aaron Bentley
Removed spurious encode/decode
833
            file_id = s.get("file_id")
1558.12.10 by Aaron Bentley
Be robust when merge_hash file_id not in inventory
834
            if file_id not in self.inventory:
835
                continue
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
836
            hash = s.get("hash")
837
            if hash == self.get_file_sha1(file_id):
838
                merge_hashes[file_id] = hash
839
        return merge_hashes
1534.7.192 by Aaron Bentley
Record hashes produced by merges
840
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
841
    @needs_write_lock
842
    def mkdir(self, path, file_id=None):
843
        """See MutableTree.mkdir()."""
844
        if file_id is None:
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
845
            file_id = generate_ids.gen_file_id(os.path.basename(path))
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
846
        os.mkdir(self.abspath(path))
847
        self.add(path, file_id, 'directory')
848
        return file_id
849
1092.2.6 by Robert Collins
symlink support updated to work
850
    def get_symlink_target(self, file_id):
1185.15.10 by Scott James Remnant
Fix WorkingTree.get_symlink_target() to read the absolute path of the
851
        return os.readlink(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
852
853
    def file_class(self, filename):
854
        if self.path2id(filename):
855
            return 'V'
856
        elif self.is_ignored(filename):
857
            return 'I'
858
        else:
859
            return '?'
860
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
861
    def flush(self):
862
        """Write the in memory inventory to disk."""
863
        # TODO: Maybe this should only write on dirty ?
864
        if self._control_files._lock_mode != 'w':
865
            raise errors.NotWriteLocked(self)
866
        sio = StringIO()
1986.5.6 by Robert Collins
Merge bzr.dev.
867
        xml5.serializer_v5.write_inventory(self._inventory, sio)
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
868
        sio.seek(0)
869
        self._control_files.put('inventory', sio)
870
        self._inventory_is_modified = False
871
1731.1.33 by Aaron Bentley
Revert no-special-root changes
872
    def list_files(self, include_root=False):
1732.1.6 by John Arbash Meinel
Fix documentation bug in workingtree.list_files
873
        """Recursively list all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
874
875
        Lists, but does not descend into unversioned directories.
876
877
        This does not include files that have been deleted in this
878
        tree.
879
880
        Skips the control directory.
881
        """
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.
882
        inv = self._inventory
1910.2.56 by Aaron Bentley
More work on bundles
883
        if include_root is True:
884
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
885
        # Convert these into local objects to save lookup times
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
886
        pathjoin = osutils.pathjoin
887
        file_kind = osutils.file_kind
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
888
889
        # transport.base ends in a slash, we want the piece
890
        # between the last two slashes
891
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
892
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
893
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
894
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
895
        # directory file_id, relative path, absolute path, reverse sorted children
896
        children = os.listdir(self.basedir)
897
        children.sort()
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
898
        # jam 20060527 The kernel sized tree seems equivalent whether we 
899
        # use a deque and popleft to keep them sorted, or if we use a plain
900
        # 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.
901
        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
902
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
903
        while stack:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
904
            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
905
906
            while children:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
907
                f = children.popleft()
453 by Martin Pool
- Split WorkingTree into its own file
908
                ## TODO: If we find a subdirectory with its own .bzr
909
                ## directory, then that is a separate tree and we
910
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
911
912
                # the bzrdir for this tree
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
913
                if transport_base_dir == f:
453 by Martin Pool
- Split WorkingTree into its own file
914
                    continue
915
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
916
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
917
                # 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
918
                # than the checks of pathjoin(), all relative paths will have an extra slash
919
                # at the beginning
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
920
                fp = from_dir_relpath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
921
922
                # absolute path
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
923
                fap = from_dir_abspath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
924
                
925
                f_ie = inv.get_child(from_dir_id, f)
926
                if f_ie:
927
                    c = 'V'
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
928
                elif self.is_ignored(fp[1:]):
929
                    c = 'I'
453 by Martin Pool
- Split WorkingTree into its own file
930
                else:
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
931
                    # we may not have found this file, because of a unicode issue
932
                    f_norm, can_access = osutils.normalized_filename(f)
933
                    if f == f_norm or not can_access:
934
                        # No change, so treat this file normally
935
                        c = '?'
936
                    else:
937
                        # this file can be accessed by a normalized path
938
                        # check again if it is versioned
939
                        # these lines are repeated here for performance
940
                        f = f_norm
941
                        fp = from_dir_relpath + '/' + f
942
                        fap = from_dir_abspath + '/' + f
943
                        f_ie = inv.get_child(from_dir_id, f)
944
                        if f_ie:
945
                            c = 'V'
946
                        elif self.is_ignored(fp[1:]):
947
                            c = 'I'
948
                        else:
949
                            c = '?'
453 by Martin Pool
- Split WorkingTree into its own file
950
951
                fk = file_kind(fap)
952
953
                if f_ie:
954
                    if f_ie.kind != fk:
2206.1.7 by Marius Kruger
* errors
955
                        raise errors.BzrCheckError(
956
                            "file %r entered as kind %r id %r, now of kind %r"
957
                            % (fap, f_ie.kind, f_ie.file_id, fk))
453 by Martin Pool
- Split WorkingTree into its own file
958
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
959
                # make a last minute entry
960
                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
961
                    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
962
                else:
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
963
                    try:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
964
                        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
965
                    except KeyError:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
966
                        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.
967
                    continue
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
968
                
453 by Martin Pool
- Split WorkingTree into its own file
969
                if fk != 'directory':
970
                    continue
971
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
972
                # 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.
973
                new_children = os.listdir(fap)
974
                new_children.sort()
975
                new_children = collections.deque(new_children)
976
                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
977
                # Break out of inner loop,
2206.1.7 by Marius Kruger
* errors
978
                # so that we start outer loop with child
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
979
                break
1732.1.22 by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory
980
            else:
981
                # 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.
982
                stack.pop()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
983
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
984
    @needs_tree_write_lock
2123.3.8 by Steffen Eichenberg
new parameter to_dir must be a named parameter
985
    def move(self, from_paths, to_dir=None, after=False, **kwargs):
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
986
        """Rename files.
987
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
988
        to_dir must exist in the inventory.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
989
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
990
        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.
991
        it, keeping their old names.  
992
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
993
        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.
994
        this doesn't change the directory.
995
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
996
        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
997
        independently.
998
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
999
        The first mode moves the file in the filesystem and updates the
1000
        inventory. The second mode only updates the inventory without
1001
        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
1002
        in version 0.15.
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1003
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1004
        move uses the second mode if 'after == True' and the target is not
1005
        versioned but present in the working tree.
1006
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1007
        move uses the second mode if 'after == False' and the source is
1008
        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
1009
        versioned but present in the working tree.
1010
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1011
        move uses the first mode if 'after == False' and the source is
1012
        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
1013
        versioned and not present in the working tree.
1014
1015
        Everything else results in an error.
1016
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1017
        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
1018
        entry that is moved.
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1019
        """
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1020
        rename_entries = []
1021
        rename_tuples = []
1022
1023
        # check for deprecated use of signature
1024
        if to_dir is None:
1025
            to_dir = kwargs.get('to_name', None)
1026
            if to_dir is None:
1027
                raise TypeError('You must supply a target directory')
1028
            else:
1029
                symbol_versioning.warn('The parameter to_name was deprecated'
1030
                                       ' in version 0.13. Use to_dir instead',
1031
                                       DeprecationWarning)
1032
1033
        # check destination directory
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1034
        assert not isinstance(from_paths, basestring)
1035
        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
1036
        to_abs = self.abspath(to_dir)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1037
        if not isdir(to_abs):
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1038
            raise errors.BzrMoveFailedError('',to_dir,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1039
                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
1040
        if not self.has_filename(to_dir):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1041
            raise errors.BzrMoveFailedError('',to_dir,
1042
                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
1043
        to_dir_id = inv.path2id(to_dir)
2123.3.6 by Steffen Eichenberg
unified error messages
1044
        if to_dir_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1045
            raise errors.BzrMoveFailedError('',to_dir,
1046
                errors.NotVersionedError(path=str(to_dir)))
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1047
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1048
        to_dir_ie = inv[to_dir_id]
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
1049
        if to_dir_ie.kind != 'directory':
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1050
            raise errors.BzrMoveFailedError('',to_dir,
1051
                errors.NotADirectory(to_abs))
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1052
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1053
        # create rename entries and tuples
1054
        for from_rel in from_paths:
1055
            from_tail = splitpath(from_rel)[-1]
1056
            from_id = inv.path2id(from_rel)
1057
            if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1058
                raise errors.BzrMoveFailedError(from_rel,to_dir,
1059
                    errors.NotVersionedError(path=str(from_rel)))
2206.1.4 by Marius Kruger
Improved WorkingTree.move excptions. (as requested)
1060
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1061
            from_entry = inv[from_id]
1062
            from_parent_id = from_entry.parent_id
1063
            to_rel = pathjoin(to_dir, from_tail)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1064
            rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1065
                                         from_id=from_id,
1066
                                         from_tail=from_tail,
1067
                                         from_parent_id=from_parent_id,
1068
                                         to_rel=to_rel, to_tail=from_tail,
1069
                                         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
1070
            rename_entries.append(rename_entry)
1071
            rename_tuples.append((from_rel, to_rel))
1072
1073
        # determine which move mode to use. checks also for movability
1074
        rename_entries = self._determine_mv_mode(rename_entries, after)
1075
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1076
        original_modified = self._inventory_is_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1077
        try:
2220.1.6 by Marius Kruger
* change error message telling user about --after option sightly
1078
            if len(from_paths):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1079
                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
1080
            self._move(rename_entries)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1081
        except:
1082
            # 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
1083
            self._inventory_is_modified = original_modified
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1084
            raise
1085
        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
1086
        return rename_tuples
1087
1088
    def _determine_mv_mode(self, rename_entries, after=False):
1089
        """Determines for each from-to pair if both inventory and working tree
1090
        or only the inventory has to be changed.
1091
1092
        Also does basic plausability tests.
1093
        """
1094
        inv = self.inventory
1095
1096
        for rename_entry in rename_entries:
1097
            # store to local variables for easier reference
1098
            from_rel = rename_entry.from_rel
1099
            from_id = rename_entry.from_id
1100
            to_rel = rename_entry.to_rel
1101
            to_id = inv.path2id(to_rel)
1102
            only_change_inv = False
1103
1104
            # check the inventory for source and destination
1105
            if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1106
                raise errors.BzrMoveFailedError(from_rel,to_rel,
1107
                    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
1108
            if to_id is not None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1109
                raise errors.BzrMoveFailedError(from_rel,to_rel,
1110
                    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
1111
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1112
            # 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
1113
            # inv and file system)
1114
            if after:
1115
                if not self.has_filename(to_rel):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1116
                    raise errors.BzrMoveFailedError(from_id,to_rel,
1117
                        errors.NoSuchFile(path=str(to_rel),
1118
                        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
1119
                only_change_inv = True
1120
            elif not self.has_filename(from_rel) and self.has_filename(to_rel):
1121
                only_change_inv = True
1122
            elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1123
                only_change_inv = False
1124
            else:
1125
                # something is wrong, so lets determine what exactly
1126
                if not self.has_filename(from_rel) and \
1127
                   not self.has_filename(to_rel):
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1128
                    raise errors.BzrRenameFailedError(from_rel,to_rel,
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1129
                        errors.PathsDoNotExist(paths=(str(from_rel),
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1130
                        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
1131
                else:
2220.1.11 by Marius Kruger
* bzrlib/errors.py
1132
                    raise errors.RenameFailedFilesExist(from_rel, to_rel,
1133
                        extra="(Use --after to update the Bazaar id)")
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1134
            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
1135
        return rename_entries
1136
1137
    def _move(self, rename_entries):
1138
        """Moves a list of files.
1139
1140
        Depending on the value of the flag 'only_change_inv', the
1141
        file will be moved on the file system or not.
1142
        """
1143
        inv = self.inventory
1144
        moved = []
1145
1146
        for entry in rename_entries:
1147
            try:
1148
                self._move_entry(entry)
2220.1.12 by Marius Kruger
* Fix errors.py import order
1149
            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
1150
                self._rollback_move(moved)
1151
                raise
1152
            moved.append(entry)
1153
1154
    def _rollback_move(self, moved):
2220.1.12 by Marius Kruger
* Fix errors.py import order
1155
        """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
1156
        inv = self.inventory
1157
        for entry in moved:
1158
            try:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1159
                self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,
1160
                    entry.to_tail, entry.to_parent_id, entry.from_rel,
1161
                    entry.from_tail, entry.from_parent_id,
1162
                    entry.only_change_inv))
2220.1.14 by Aaron Bentley
Cleanup formatting and error handling
1163
            except errors.BzrMoveFailedError, e:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1164
                raise errors.BzrMoveFailedError( '', '', "Rollback failed."
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1165
                        " The working tree is in an inconsistent state."
1166
                        " Please consider doing a 'bzr revert'."
2220.1.14 by Aaron Bentley
Cleanup formatting and error handling
1167
                        " 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
1168
2220.1.12 by Marius Kruger
* Fix errors.py import order
1169
    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
1170
        inv = self.inventory
1171
        from_rel_abs = self.abspath(entry.from_rel)
1172
        to_rel_abs = self.abspath(entry.to_rel)
1173
        if from_rel_abs == to_rel_abs:
2220.1.12 by Marius Kruger
* Fix errors.py import order
1174
            raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1175
                "Source and target are identical.")
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1176
2220.1.12 by Marius Kruger
* Fix errors.py import order
1177
        if not entry.only_change_inv:
1178
            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
1179
                osutils.rename(from_rel_abs, to_rel_abs)
2220.1.12 by Marius Kruger
* Fix errors.py import order
1180
            except OSError, e:
1181
                raise errors.BzrMoveFailedError(entry.from_rel,
1182
                    entry.to_rel, e[1])
1183
        inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1184
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1185
    @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
1186
    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).
1187
        """Rename one file.
1188
1189
        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
1190
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1191
        rename_one has several 'modes' to work. First, it can rename a physical
1192
        file and change the file_id. That is the normal mode. Second, it can
1193
        only change the file_id without touching any physical file. This is
1194
        the new mode introduced in version 0.15.
1195
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1196
        rename_one uses the second mode if 'after == True' and 'to_rel' is not
1197
        versioned but present in the working tree.
1198
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1199
        rename_one uses the second mode if 'after == False' and 'from_rel' is
1200
        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
1201
        versioned but present in the working tree.
1202
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1203
        rename_one uses the first mode if 'after == False' and 'from_rel' is
1204
        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
1205
        versioned and not present in the working tree.
1206
1207
        Everything else results in an error.
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1208
        """
1209
        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
1210
        rename_entries = []
1211
1212
        # create rename entries and tuples
1213
        from_tail = splitpath(from_rel)[-1]
1214
        from_id = inv.path2id(from_rel)
1215
        if from_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1216
            raise errors.BzrRenameFailedError(from_rel,to_rel,
1217
                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
1218
        from_entry = inv[from_id]
1219
        from_parent_id = from_entry.parent_id
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1220
        to_dir, to_tail = os.path.split(to_rel)
1221
        to_dir_id = inv.path2id(to_dir)
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1222
        rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1223
                                     from_id=from_id,
1224
                                     from_tail=from_tail,
1225
                                     from_parent_id=from_parent_id,
1226
                                     to_rel=to_rel, to_tail=to_tail,
1227
                                     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
1228
        rename_entries.append(rename_entry)
1229
1230
        # determine which move mode to use. checks also for movability
1231
        rename_entries = self._determine_mv_mode(rename_entries, after)
1232
1233
        # check if the target changed directory and if the target directory is
1234
        # versioned
2123.3.6 by Steffen Eichenberg
unified error messages
1235
        if to_dir_id is None:
2206.1.9 by Marius Kruger
* Change move/rename errors yet again
1236
            raise errors.BzrMoveFailedError(from_rel,to_rel,
1237
                errors.NotVersionedError(path=str(to_dir)))
2220.1.9 by Marius Kruger
Remove all trailing white space this bundle would have
1238
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1239
        # all checks done. now we can continue with our actual work
1240
        mutter('rename_one:\n'
1241
               '  from_id   {%s}\n'
1242
               '  from_rel: %r\n'
1243
               '  to_rel:   %r\n'
1244
               '  to_dir    %r\n'
1245
               '  to_dir_id {%s}\n',
1246
               from_id, from_rel, to_rel, to_dir, to_dir_id)
1247
1248
        self._move(rename_entries)
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1249
        self._write_inventory(inv)
1250
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1251
    class _RenameEntry(object):
2123.3.2 by Steffen Eichenberg
fixed the most obvious bugs
1252
        def __init__(self, from_rel, from_id, from_tail, from_parent_id,
2220.1.12 by Marius Kruger
* Fix errors.py import order
1253
                     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
1254
            self.from_rel = from_rel
1255
            self.from_id = from_id
1256
            self.from_tail = from_tail
1257
            self.from_parent_id = from_parent_id
1258
            self.to_rel = to_rel
1259
            self.to_tail = to_tail
1260
            self.to_parent_id = to_parent_id
2220.1.12 by Marius Kruger
* Fix errors.py import order
1261
            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
1262
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1263
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
1264
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
1265
        """Return all unknown files.
1266
1267
        These are files in the working directory that are not versioned or
1268
        control files or ignored.
1269
        """
453 by Martin Pool
- Split WorkingTree into its own file
1270
        for subp in self.extras():
1271
            if not self.is_ignored(subp):
1272
                yield subp
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1273
    
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1274
    @needs_tree_write_lock
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1275
    def unversion(self, file_ids):
1276
        """Remove the file ids in file_ids from the current versioned set.
1277
1278
        When a file_id is unversioned, all of its children are automatically
1279
        unversioned.
1280
1281
        :param file_ids: The file ids to stop versioning.
1282
        :raises: NoSuchId if any fileid is not currently versioned.
1283
        """
1284
        for file_id in file_ids:
1285
            if self._inventory.has_id(file_id):
1988.2.6 by Robert Collins
Review feedback.
1286
                self._inventory.remove_recursive_id(file_id)
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1287
            else:
1288
                raise errors.NoSuchId(self, file_id)
1289
        if len(file_ids):
1290
            # in the future this should just set a dirty bit to wait for the 
1291
            # final unlock. However, until all methods of workingtree start
1292
            # with the current in -memory inventory rather than triggering 
1293
            # a read, it is more complex - we need to teach read_inventory
1294
            # to know when to read, and when to not read first... and possibly
1295
            # to save first when the in memory one may be corrupted.
1296
            # so for now, we just only write it if it is indeed dirty.
1297
            # - RBC 20060907
1298
            self._write_inventory(self._inventory)
1299
    
1534.10.16 by Aaron Bentley
Small tweaks
1300
    @deprecated_method(zero_eight)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1301
    def iter_conflicts(self):
1534.10.16 by Aaron Bentley
Small tweaks
1302
        """List all files in the tree that have text or content conflicts.
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1303
        DEPRECATED.  Use conflicts instead."""
1534.10.10 by Aaron Bentley
Resolve uses the new stuff.
1304
        return self._iter_conflicts()
1305
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1306
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1307
        conflicted = set()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1308
        for info in self.list_files():
1309
            path = info[0]
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1310
            stem = get_conflicted_stem(path)
1311
            if stem is None:
1312
                continue
1313
            if stem not in conflicted:
1314
                conflicted.add(stem)
1315
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
1316
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1317
    @needs_write_lock
1185.76.1 by Erik Bågfors
Support for --revision in pull
1318
    def pull(self, source, overwrite=False, stop_revision=None):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1319
        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().
1320
        source.lock_read()
1321
        try:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1322
            pp = ProgressPhase("Pull phase", 2, top_pb)
1323
            pp.next_phase()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1324
            old_revision_history = self.branch.revision_history()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
1325
            basis_tree = self.basis_tree()
1534.4.54 by Robert Collins
Merge from integration.
1326
            count = self.branch.pull(source, overwrite, stop_revision)
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1327
            new_revision_history = self.branch.revision_history()
1328
            if new_revision_history != old_revision_history:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1329
                pp.next_phase()
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
1330
                if len(old_revision_history):
1331
                    other_revision = old_revision_history[-1]
1332
                else:
1333
                    other_revision = None
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1334
                repository = self.branch.repository
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1335
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1336
                try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1337
                    new_basis_tree = self.branch.basis_tree()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1338
                    merge.merge_inner(
1339
                                self.branch,
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1340
                                new_basis_tree,
1341
                                basis_tree,
1342
                                this_tree=self,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1343
                                pb=pb)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1344
                    if (basis_tree.inventory.root is None and
1731.1.47 by Aaron Bentley
Merge bzr.dev
1345
                        new_basis_tree.inventory.root is not None):
1346
                        self.set_root_id(new_basis_tree.inventory.root.file_id)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1347
                finally:
1348
                    pb.finished()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1349
                # 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.
1350
                # reuse the revisiontree we merged against to set the new
1351
                # tree data.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1352
                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.
1353
                # we have to pull the merge trees out again, because 
1354
                # merge_inner has set the ids. - this corner is not yet 
1355
                # layered well enough to prevent double handling.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1356
                merges = self.get_parent_ids()[1:]
1357
                parent_trees.extend([
1358
                    (parent, repository.revision_tree(parent)) for
1359
                     parent in merges])
1360
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1361
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1362
        finally:
1363
            source.unlock()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1364
            top_pb.finished()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1365
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1366
    @needs_write_lock
1367
    def put_file_bytes_non_atomic(self, file_id, bytes):
1368
        """See MutableTree.put_file_bytes_non_atomic."""
1369
        stream = file(self.id2abspath(file_id), 'wb')
1370
        try:
1371
            stream.write(bytes)
1372
        finally:
1373
            stream.close()
1374
        # TODO: update the hashcache here ?
1375
453 by Martin Pool
- Split WorkingTree into its own file
1376
    def extras(self):
1377
        """Yield all unknown files in this WorkingTree.
1378
1379
        If there are any unknown directories then only the directory is
1380
        returned, not all its children.  But if there are unknown files
1381
        under a versioned subdirectory, they are returned.
1382
1383
        Currently returned depth-first, sorted by name within directories.
1384
        """
1385
        ## TODO: Work from given directory downwards
1386
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1387
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1388
            dirabs = self.abspath(path)
1389
            if not isdir(dirabs):
1390
                # e.g. directory deleted
1391
                continue
1392
1393
            fl = []
1394
            for subf in os.listdir(dirabs):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1395
                if subf == '.bzr':
1396
                    continue
1397
                if subf not in dir_entry.children:
1398
                    subf_norm, can_access = osutils.normalized_filename(subf)
1399
                    if subf_norm != subf and can_access:
1400
                        if subf_norm not in dir_entry.children:
1401
                            fl.append(subf_norm)
1402
                    else:
1403
                        fl.append(subf)
453 by Martin Pool
- Split WorkingTree into its own file
1404
            
1405
            fl.sort()
1406
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1407
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1408
                yield subp
1409
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1410
453 by Martin Pool
- Split WorkingTree into its own file
1411
    def ignored_files(self):
1412
        """Yield list of PATH, IGNORE_PATTERN"""
1413
        for subp in self.extras():
1414
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1415
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
1416
                yield subp, pat
1417
1418
    def get_ignore_list(self):
1419
        """Return list of ignore patterns.
1420
1421
        Cached in the Tree object after the first call.
1422
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1423
        ignoreset = getattr(self, '_ignoreset', None)
1424
        if ignoreset is not None:
1425
            return ignoreset
1426
1427
        ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1428
        ignore_globs.update(ignores.get_runtime_ignores())
1429
        ignore_globs.update(ignores.get_user_ignores())
453 by Martin Pool
- Split WorkingTree into its own file
1430
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1431
            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
1432
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1433
                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
1434
            finally:
1435
                f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1436
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1437
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1438
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1439
    def _flush_ignore_list_cache(self):
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1440
        """Resets the cached ignore list to force a cache rebuild."""
1441
        self._ignoreset = None
1442
        self._ignoreglobster = None
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1443
453 by Martin Pool
- Split WorkingTree into its own file
1444
    def is_ignored(self, filename):
1445
        r"""Check whether the filename matches an ignore pattern.
1446
1447
        Patterns containing '/' or '\' need to match the whole path;
1448
        others match against only the last component.
1449
1450
        If the file is ignored, returns the pattern which caused it to
1451
        be ignored, otherwise None.  So this can simply be used as a
1452
        boolean if desired."""
2135.2.1 by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637)
1453
        if getattr(self, '_ignoreglobster', None) is None:
2135.2.7 by Kent Gibson
Implement JAM's review suggestions.
1454
            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)
1455
        return self._ignoreglobster.match(filename)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1456
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1457
    def kind(self, file_id):
1458
        return file_kind(self.id2abspath(file_id))
1459
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
1460
    def _comparison_data(self, entry, path):
1461
        abspath = self.abspath(path)
1462
        try:
1463
            stat_value = os.lstat(abspath)
1464
        except OSError, e:
1465
            if getattr(e, 'errno', None) == errno.ENOENT:
1466
                stat_value = None
1467
                kind = None
1468
                executable = False
1469
            else:
1470
                raise
1471
        else:
1472
            mode = stat_value.st_mode
1473
            kind = osutils.file_kind_from_stat_mode(mode)
1474
            if not supports_executable():
1475
                executable = entry.executable
1476
            else:
1477
                executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1478
        return kind, executable, stat_value
1479
1480
    def _file_size(self, entry, stat_value):
1481
        return stat_value.st_size
1482
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1483
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1484
        """Return the last revision of the branch for this tree.
1485
1486
        This format tree does not support a separate marker for last-revision
1487
        compared to the branch.
1488
1489
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1490
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1491
        return self._last_revision()
1492
1493
    @needs_read_lock
1494
    def _last_revision(self):
1495
        """helper for get_parent_ids."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1496
        return self.branch.last_revision()
1497
1694.2.6 by Martin Pool
[merge] bzr.dev
1498
    def is_locked(self):
1499
        return self._control_files.is_locked()
1500
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1501
    def lock_read(self):
1502
        """See Branch.lock_read, and WorkingTree.unlock."""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1503
        self.branch.lock_read()
1504
        try:
1505
            return self._control_files.lock_read()
1506
        except:
1507
            self.branch.unlock()
1508
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1509
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1510
    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.
1511
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1512
        self.branch.lock_read()
1513
        try:
1514
            return self._control_files.lock_write()
1515
        except:
1516
            self.branch.unlock()
1517
            raise
1518
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1519
    def lock_write(self):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1520
        """See MutableTree.lock_write, and WorkingTree.unlock."""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1521
        self.branch.lock_write()
1522
        try:
1523
            return self._control_files.lock_write()
1524
        except:
1525
            self.branch.unlock()
1526
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1527
1694.2.6 by Martin Pool
[merge] bzr.dev
1528
    def get_physical_lock_status(self):
1529
        return self._control_files.get_physical_lock_status()
1530
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1531
    def _basis_inventory_name(self):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1532
        return 'basis-inventory-cache'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1533
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1534
    @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.
1535
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1536
        """Change the last revision in the working tree."""
1537
        if self._change_last_revision(new_revision):
1538
            self._cache_basis_inventory(new_revision)
1539
1540
    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.
1541
        """Template method part of set_last_revision to perform the change.
1542
        
1543
        This is used to allow WorkingTree3 instances to not affect branch
1544
        when their last revision is set.
1545
        """
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1546
        if new_revision is None:
1547
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1548
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1549
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1550
            self.branch.generate_revision_history(new_revision)
1551
        except errors.NoSuchRevision:
1552
            # not present in the repo - dont try to set it deeper than the tip
1553
            self.branch.set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1554
        return True
1555
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1556
    def _write_basis_inventory(self, xml):
1557
        """Write the basis inventory XML to the basis-inventory file"""
1558
        assert isinstance(xml, str), 'serialised xml must be bytestring.'
1559
        path = self._basis_inventory_name()
1560
        sio = StringIO(xml)
1561
        self._control_files.put(path, sio)
1562
1563
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1564
        """Create the text that will be saved in basis-inventory"""
1565
        inventory.revision_id = revision_id
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
1566
        return xml6.serializer_v6.write_inventory_to_string(inventory)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1567
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1568
    def _cache_basis_inventory(self, new_revision):
1569
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1570
        # TODO: this should allow the ready-to-use inventory to be passed in,
1571
        # as commit already has that ready-to-use [while the format is the
1572
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1573
        try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1574
            # this double handles the inventory - unpack and repack - 
1575
            # but is easier to understand. We can/should put a conditional
1576
            # in here based on whether the inventory is in the latest format
1577
            # - perhaps we should repack all inventories on a repository
1578
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1579
            # the fast path is to copy the raw xml from the repository. If the
1580
            # xml contains 'revision_id="', then we assume the right 
1581
            # revision_id is set. We must check for this full string, because a
1582
            # root node id can legitimately look like 'revision_id' but cannot
1583
            # contain a '"'.
1584
            xml = self.branch.repository.get_inventory_xml(new_revision)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1585
            firstline = xml.split('\n', 1)[0]
1586
            if (not 'revision_id="' in firstline or 
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1587
                'format="6"' not in firstline):
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1588
                inv = self.branch.repository.deserialise_inventory(
1589
                    new_revision, xml)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1590
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1591
            self._write_basis_inventory(xml)
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1592
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1593
            pass
1594
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1595
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1596
        """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.
1597
        path = self._basis_inventory_name()
1757.1.3 by Robert Collins
Dont treat the basis inventory xml as ascii - its utf8 and should be preserved as such.
1598
        return self._control_files.get(path).read()
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1599
        
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1600
    @needs_read_lock
1601
    def read_working_inventory(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1602
        """Read the working inventory.
1603
        
1986.5.7 by Robert Collins
Merge reviews.
1604
        :raises errors.InventoryModified: read_working_inventory will fail
1605
            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
1606
        """
1607
        # conceptually this should be an implementation detail of the tree. 
1608
        # XXX: Deprecate this.
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1609
        # ElementTree does its own conversion from UTF-8, so open in
1610
        # binary.
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1611
        if self._inventory_is_modified:
1612
            raise errors.InventoryModified(self)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1613
        result = xml5.serializer_v5.read_inventory(
1534.4.28 by Robert Collins
first cut at merge from integration.
1614
            self._control_files.get('inventory'))
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1615
        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()
1616
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1617
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1618
    @needs_tree_write_lock
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1619
    def remove(self, files, verbose=False, to_file=None):
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1620
        """Remove nominated files from the working inventory..
1621
1622
        This does not remove their text.  This does not run on XXX on what? RBC
1623
1624
        TODO: Refuse to remove modified files unless --force is given?
1625
1626
        TODO: Do something useful with directories.
1627
1628
        TODO: Should this remove the text or not?  Tough call; not
1629
        removing may be useful and the user can just use use rm, and
1630
        is the opposite of add.  Removing it is consistent with most
1631
        other tools.  Maybe an option.
1632
        """
1633
        ## TODO: Normalize names
1634
        ## TODO: Remove nested loops; better scalability
1635
        if isinstance(files, basestring):
1636
            files = [files]
1637
1638
        inv = self.inventory
1639
1640
        # do this before any modifications
1641
        for f in files:
1642
            fid = inv.path2id(f)
1643
            if not fid:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
1644
                # TODO: Perhaps make this just a warning, and continue?
1645
                # This tends to happen when 
2206.1.7 by Marius Kruger
* errors
1646
                raise errors.NotVersionedError(path=f)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1647
            if verbose:
1648
                # having remove it, it must be either ignored or unknown
1649
                if self.is_ignored(f):
1650
                    new_status = 'I'
1651
                else:
1652
                    new_status = '?'
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1653
                textui.show_status(new_status, inv[fid].kind, f,
1654
                                   to_file=to_file)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1655
            del inv[fid]
1656
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1657
        self._write_inventory(inv)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1658
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1659
    @needs_tree_write_lock
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1660
    def revert(self, filenames, old_tree=None, backups=True, 
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1661
               pb=DummyProgress(), report_changes=False):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1662
        from bzrlib.conflicts import resolve
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1663
        if old_tree is None:
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1664
            old_tree = self.basis_tree()
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1665
        conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1666
                                     report_changes)
1457.1.8 by Robert Collins
Replace the WorkingTree.revert method algorithm with a call to merge_inner.
1667
        if not len(filenames):
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
1668
            self.set_parent_ids(self.get_parent_ids()[:1])
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1669
            resolve(self)
1670
        else:
1534.10.15 by Aaron Bentley
Revert does resolve
1671
            resolve(self, filenames, ignore_misses=True)
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1672
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1673
1658.1.3 by Martin Pool
Doc
1674
    # XXX: This method should be deprecated in favour of taking in a proper
1675
    # new Inventory object.
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1676
    @needs_tree_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1677
    def set_inventory(self, new_inventory_list):
1678
        from bzrlib.inventory import (Inventory,
1679
                                      InventoryDirectory,
1680
                                      InventoryEntry,
1681
                                      InventoryFile,
1682
                                      InventoryLink)
1683
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1684
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1685
            name = os.path.basename(path)
1686
            if name == "":
1687
                continue
1688
            # fixme, there should be a factory function inv,add_?? 
1689
            if kind == 'directory':
1690
                inv.add(InventoryDirectory(file_id, name, parent))
1691
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1692
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1693
            elif kind == 'symlink':
1694
                inv.add(InventoryLink(file_id, name, parent))
1695
            else:
2206.1.7 by Marius Kruger
* errors
1696
                raise errors.BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1697
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1698
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1699
    @needs_tree_write_lock
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1700
    def set_root_id(self, file_id):
1701
        """Set the root id for this tree."""
1986.5.2 by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please
1702
        # for compatability 
1703
        if file_id is None:
1704
            symbol_versioning.warn(symbol_versioning.zero_twelve
1705
                % 'WorkingTree.set_root_id with fileid=None',
1706
                DeprecationWarning,
1707
                stacklevel=3)
1708
            file_id = ROOT_ID
1709
        inv = self._inventory
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1710
        orig_root_id = inv.root.file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1711
        # TODO: it might be nice to exit early if there was nothing
1712
        # to do, saving us from trigger a sync on unlock.
1713
        self._inventory_is_modified = True
1714
        # we preserve the root inventory entry object, but
1715
        # unlinkit from the byid index
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1716
        del inv._byid[inv.root.file_id]
1717
        inv.root.file_id = file_id
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1718
        # and link it into the index with the new changed id.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1719
        inv._byid[inv.root.file_id] = inv.root
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1720
        # and finally update all children to reference the new id.
1721
        # XXX: this should be safe to just look at the root.children
1722
        # list, not the WHOLE INVENTORY.
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1723
        for fid in inv:
1724
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1725
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1726
                entry.parent_id = inv.root.file_id
1727
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1728
    def unlock(self):
1729
        """See Branch.unlock.
1730
        
1731
        WorkingTree locking just uses the Branch locking facilities.
1732
        This is current because all working trees have an embedded branch
1733
        within them. IF in the future, we were to make branch data shareable
1734
        between multiple working trees, i.e. via shared storage, then we 
1735
        would probably want to lock both the local tree, and the branch.
1736
        """
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.
1737
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1738
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1739
    def update(self):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1740
        """Update a working tree along its branch.
1741
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1742
        This will update the branch if its bound too, which means we have
1743
        multiple trees involved:
1744
1745
        - The new basis tree of the master.
1746
        - The old basis tree of the branch.
1747
        - The old basis tree of the working tree.
1748
        - The current working tree state.
1749
1750
        Pathologically, all three may be different, and non-ancestors of each
1751
        other.  Conceptually we want to:
1752
1753
        - Preserve the wt.basis->wt.state changes
1754
        - Transform the wt.basis to the new master basis.
1755
        - Apply a merge of the old branch basis to get any 'local' changes from
1756
          it into the tree.
1757
        - Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1758
1759
        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
1760
        - Merge current state -> basis tree of the master w.r.t. the old tree
1761
          basis.
1762
        - 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.
1763
        """
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1764
        if self.branch.get_master_branch() is not None:
1765
            self.lock_write()
1766
            update_branch = True
1767
        else:
1768
            self.lock_tree_write()
1769
            update_branch = False
1770
        try:
1771
            if update_branch:
1772
                old_tip = self.branch.update()
1773
            else:
1774
                old_tip = None
1775
            return self._update_tree(old_tip)
1776
        finally:
1777
            self.unlock()
1778
1779
    @needs_tree_write_lock
1780
    def _update_tree(self, old_tip=None):
1781
        """Update a tree to the master branch.
1782
1783
        :param old_tip: if supplied, the previous tip revision the branch,
1784
            before it was changed to the master branch's tip.
1785
        """
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1786
        # here if old_tip is not None, it is the old tip of the branch before
1787
        # it was updated from the master branch. This should become a pending
1788
        # merge in the working tree to preserve the user existing work.  we
1789
        # cant set that until we update the working trees last revision to be
1790
        # one from the new branch, because it will just get absorbed by the
1791
        # parent de-duplication logic.
1792
        # 
1793
        # We MUST save it even if an error occurs, because otherwise the users
1794
        # local work is unreferenced and will appear to have been lost.
1795
        # 
1796
        result = 0
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1797
        try:
1798
            last_rev = self.get_parent_ids()[0]
1799
        except IndexError:
1800
            last_rev = None
1801
        if last_rev != self.branch.last_revision():
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1802
            # merge tree state up to new branch tip.
1803
            basis = self.basis_tree()
1804
            to_tree = self.branch.basis_tree()
1731.1.47 by Aaron Bentley
Merge bzr.dev
1805
            if basis.inventory.root is None:
1806
                self.set_root_id(to_tree.inventory.root.file_id)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1807
            result += merge.merge_inner(
1808
                                  self.branch,
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1809
                                  to_tree,
1810
                                  basis,
1811
                                  this_tree=self)
1908.6.6 by Robert Collins
Merge updated set_parents api.
1812
            # TODO - dedup parents list with things merged by pull ?
1813
            # reuse the tree we've updated to to set the basis:
1814
            parent_trees = [(self.branch.last_revision(), to_tree)]
1815
            merges = self.get_parent_ids()[1:]
1816
            # Ideally we ask the tree for the trees here, that way the working
1817
            # tree can decide whether to give us teh entire tree or give us a
1818
            # lazy initialised tree. dirstate for instance will have the trees
1819
            # in ram already, whereas a last-revision + basis-inventory tree
1820
            # will not, but also does not need them when setting parents.
1821
            for parent in merges:
1822
                parent_trees.append(
1823
                    (parent, self.branch.repository.revision_tree(parent)))
1824
            if old_tip is not None:
1825
                parent_trees.append(
1826
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
1827
            self.set_parent_trees(parent_trees)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1828
            last_rev = parent_trees[0][0]
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1829
        else:
1830
            # the working tree had the same last-revision as the master
1831
            # branch did. We may still have pivot local work from the local
1832
            # branch into old_tip:
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.
1833
            if old_tip is not None:
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
1834
                self.add_parent_tree_id(old_tip)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1835
        if old_tip and old_tip != last_rev:
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1836
            # our last revision was not the prior branch last revision
1837
            # and we have converted that last revision to a pending merge.
1838
            # base is somewhere between the branch tip now
1839
            # and the now pending merge
1840
            from bzrlib.revision import common_ancestor
1841
            try:
1842
                base_rev_id = common_ancestor(self.branch.last_revision(),
1843
                                              old_tip,
1844
                                              self.branch.repository)
1845
            except errors.NoCommonAncestor:
1846
                base_rev_id = None
1847
            base_tree = self.branch.repository.revision_tree(base_rev_id)
1848
            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.
1849
            result += merge.merge_inner(
1850
                                  self.branch,
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1851
                                  other_tree,
1852
                                  base_tree,
1853
                                  this_tree=self)
1854
        return result
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1855
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
1856
    def _write_hashcache_if_dirty(self):
1857
        """Write out the hashcache if it is dirty."""
1858
        if self._hashcache.needs_write:
1859
            try:
1860
                self._hashcache.write()
1861
            except OSError, e:
1862
                if e.errno not in (errno.EPERM, errno.EACCES):
1863
                    raise
1864
                # TODO: jam 20061219 Should this be a warning? A single line
1865
                #       warning might be sufficient to let the user know what
1866
                #       is going on.
1867
                mutter('Could not write hashcache for %s\nError: %s',
1868
                       self._hashcache.cache_file_name(), e)
1869
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1870
    @needs_tree_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1871
    def _write_inventory(self, inv):
1872
        """Write inventory as the current inventory."""
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1873
        self._set_inventory(inv, dirty=True)
1874
        self.flush()
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1875
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1876
    def set_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
1877
        raise errors.UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1878
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1879
    def add_conflicts(self, arg):
2206.1.7 by Marius Kruger
* errors
1880
        raise errors.UnsupportedOperation(self.add_conflicts, self)
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1881
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1882
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1883
    def conflicts(self):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1884
        conflicts = _mod_conflicts.ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1885
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1886
            text = True
1887
            try:
1888
                if file_kind(self.abspath(conflicted)) != "file":
1889
                    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.
1890
            except errors.NoSuchFile:
1891
                text = False
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1892
            if text is True:
1893
                for suffix in ('.THIS', '.OTHER'):
1894
                    try:
1895
                        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.
1896
                        if kind != "file":
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1897
                            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.
1898
                    except errors.NoSuchFile:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1899
                        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.
1900
                    if text == False:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1901
                        break
1902
            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.
1903
            conflicts.append(_mod_conflicts.Conflict.factory(ctype,
1904
                             path=conflicted,
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1905
                             file_id=self.path2id(conflicted)))
1906
        return conflicts
1907
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1908
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.
1909
class WorkingTree2(WorkingTree):
1910
    """This is the Format 2 working tree.
1911
1912
    This was the first weave based working tree. 
1913
     - uses os locks for locking.
1914
     - uses the branch last-revision.
1915
    """
1916
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1917
    def lock_tree_write(self):
1918
        """See WorkingTree.lock_tree_write().
1919
1920
        In Format2 WorkingTrees we have a single lock for the branch and tree
1921
        so lock_tree_write() degrades to lock_write().
1922
        """
1923
        self.branch.lock_write()
1924
        try:
1925
            return self._control_files.lock_write()
1926
        except:
1927
            self.branch.unlock()
1928
            raise
1929
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.
1930
    def unlock(self):
1931
        # we share control files:
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
1932
        if self._control_files._lock_count == 3:
1933
            # _inventory_is_modified is always False during a read lock.
1934
            if self._inventory_is_modified:
1935
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
1936
            self._write_hashcache_if_dirty()
1937
                    
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.
1938
        # reverse order of locking.
1939
        try:
1940
            return self._control_files.unlock()
1941
        finally:
1942
            self.branch.unlock()
1943
1944
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1945
class WorkingTree3(WorkingTree):
1946
    """This is the Format 3 working tree.
1947
1948
    This differs from the base WorkingTree by:
1949
     - having its own file lock
1950
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1951
1952
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1953
    """
1954
1955
    @needs_read_lock
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1956
    def _last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1957
        """See Mutable.last_revision."""
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1958
        try:
1959
            return self._control_files.get_utf8('last-revision').read()
2206.1.7 by Marius Kruger
* errors
1960
        except errors.NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1961
            return None
1962
1963
    def _change_last_revision(self, revision_id):
1964
        """See WorkingTree._change_last_revision."""
1965
        if revision_id is None or revision_id == NULL_REVISION:
1966
            try:
1967
                self._control_files._transport.delete('last-revision')
1968
            except errors.NoSuchFile:
1969
                pass
1970
            return False
1971
        else:
1972
            self._control_files.put_utf8('last-revision', revision_id)
1973
            return True
1974
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1975
    @needs_tree_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1976
    def set_conflicts(self, conflicts):
1977
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
1978
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1979
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1980
    @needs_tree_write_lock
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1981
    def add_conflicts(self, new_conflicts):
1982
        conflict_set = set(self.conflicts())
1983
        conflict_set.update(set(list(new_conflicts)))
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1984
        self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,
1985
                                       key=_mod_conflicts.Conflict.sort_key)))
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1986
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1987
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1988
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1989
        try:
1990
            confile = self._control_files.get('conflicts')
2206.1.7 by Marius Kruger
* errors
1991
        except errors.NoSuchFile:
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1992
            return _mod_conflicts.ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1993
        try:
1994
            if confile.next() != CONFLICT_HEADER_1 + '\n':
2206.1.7 by Marius Kruger
* errors
1995
                raise errors.ConflictFormatError()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1996
        except StopIteration:
2206.1.7 by Marius Kruger
* errors
1997
            raise errors.ConflictFormatError()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
1998
        return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1999
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.
2000
    def unlock(self):
1986.5.3 by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory
2001
        if self._control_files._lock_count == 1:
2002
            # _inventory_is_modified is always False during a read lock.
2003
            if self._inventory_is_modified:
2004
                self.flush()
2201.1.1 by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write.
2005
            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.
2006
        # reverse order of locking.
2007
        try:
2008
            return self._control_files.unlock()
2009
        finally:
2010
            self.branch.unlock()
2011
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
2012
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
2013
def get_conflicted_stem(path):
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2014
    for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
2015
        if path.endswith(suffix):
2016
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2017
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
2018
@deprecated_function(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2019
def is_control_file(filename):
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
2020
    """See WorkingTree.is_control_filename(filename)."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2021
    ## FIXME: better check
2022
    filename = normpath(filename)
2023
    while filename != '':
2024
        head, tail = os.path.split(filename)
2025
        ## mutter('check %r for control file' % ((head, tail),))
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
2026
        if tail == '.bzr':
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2027
            return True
2028
        if filename == head:
2029
            break
2030
        filename = head
2031
    return False
2032
2033
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2034
class WorkingTreeFormat(object):
2035
    """An encapsulation of the initialization and open routines for a format.
2036
2037
    Formats provide three things:
2038
     * An initialization routine,
2039
     * a format string,
2040
     * an open routine.
2041
2042
    Formats are placed in an dict by their format string for reference 
2043
    during workingtree opening. Its not required that these be instances, they
2044
    can be classes themselves with class methods - it simply depends on 
2045
    whether state is needed for a given format or not.
2046
2047
    Once a format is deprecated, just deprecate the initialize and open
2048
    methods on the format class. Do not deprecate the object, as the 
2049
    object will be created every time regardless.
2050
    """
2051
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2052
    _default_format = None
2053
    """The default format used for new trees."""
2054
2055
    _formats = {}
2056
    """The known formats."""
2057
2058
    @classmethod
2059
    def find_format(klass, a_bzrdir):
2060
        """Return the format for the working tree object in a_bzrdir."""
2061
        try:
2062
            transport = a_bzrdir.get_workingtree_transport(None)
2063
            format_string = transport.get("format").read()
2064
            return klass._formats[format_string]
2206.1.7 by Marius Kruger
* errors
2065
        except errors.NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
2066
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2067
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
2068
            raise errors.UnknownFormatError(format=format_string)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2069
2070
    @classmethod
2071
    def get_default_format(klass):
2072
        """Return the current default format."""
2073
        return klass._default_format
2074
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2075
    def get_format_string(self):
2076
        """Return the ASCII format string that identifies this format."""
2077
        raise NotImplementedError(self.get_format_string)
2078
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2079
    def get_format_description(self):
2080
        """Return the short description for this format."""
2081
        raise NotImplementedError(self.get_format_description)
2082
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2083
    def is_supported(self):
2084
        """Is this format supported?
2085
2086
        Supported formats can be initialized and opened.
2087
        Unsupported formats may not support initialization or committing or 
2088
        some other features depending on the reason for not being supported.
2089
        """
2090
        return True
2091
2092
    @classmethod
2093
    def register_format(klass, format):
2094
        klass._formats[format.get_format_string()] = format
2095
2096
    @classmethod
2097
    def set_default_format(klass, format):
2098
        klass._default_format = format
2099
2100
    @classmethod
2101
    def unregister_format(klass, format):
2102
        assert klass._formats[format.get_format_string()] is format
2103
        del klass._formats[format.get_format_string()]
2104
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2105
2106
2107
class WorkingTreeFormat2(WorkingTreeFormat):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2108
    """The second working tree format. 
2109
2110
    This format modified the hash cache from the format 1 hash cache.
2111
    """
2112
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2113
    def get_format_description(self):
2114
        """See WorkingTreeFormat.get_format_description()."""
2115
        return "Working tree format 2"
2116
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
2117
    def stub_initialize_remote(self, control_files):
2118
        """As a special workaround create critical control files for a remote working tree
2119
        
2120
        This ensures that it can later be updated and dealt with locally,
2121
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
2122
        no working tree.  (See bug #43064).
2123
        """
2124
        sio = StringIO()
2125
        inv = Inventory()
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2126
        xml5.serializer_v5.write_inventory(inv, sio)
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
2127
        sio.seek(0)
2128
        control_files.put('inventory', sio)
2129
2130
        control_files.put_utf8('pending-merges', '')
2131
        
2132
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2133
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2134
        """See WorkingTreeFormat.initialize()."""
2135
        if not isinstance(a_bzrdir.transport, LocalTransport):
2136
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2137
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2138
        if revision_id is not None:
2139
            branch.lock_write()
2140
            try:
2141
                revision_history = branch.revision_history()
2142
                try:
2143
                    position = revision_history.index(revision_id)
2144
                except ValueError:
2145
                    raise errors.NoSuchRevision(branch, revision_id)
2146
                branch.set_revision_history(revision_history[:position + 1])
2147
            finally:
2148
                branch.unlock()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2149
        revision = branch.last_revision()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2150
        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.
2151
        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.
2152
                         branch,
2153
                         inv,
2154
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2155
                         _format=self,
2156
                         _bzrdir=a_bzrdir)
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2157
        basis_tree = branch.repository.revision_tree(revision)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
2158
        if basis_tree.inventory.root is not None:
1986.5.8 by Robert Collins
Merge bzr.dev.
2159
            wt.set_root_id(basis_tree.inventory.root.file_id)
2160
        # set the parent list and cache the basis tree.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2161
        wt.set_parent_trees([(revision, basis_tree)])
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2162
        transform.build_tree(basis_tree, wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2163
        return wt
2164
2165
    def __init__(self):
2166
        super(WorkingTreeFormat2, self).__init__()
2167
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
2168
2169
    def open(self, a_bzrdir, _found=False):
2170
        """Return the WorkingTree object for a_bzrdir
2171
2172
        _found is a private parameter, do not use it. It is used to indicate
2173
               if format probing has already been done.
2174
        """
2175
        if not _found:
2176
            # we are being called directly and must probe.
2177
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2178
        if not isinstance(a_bzrdir.transport, LocalTransport):
2179
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
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.
2180
        return WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2181
                           _internal=True,
2182
                           _format=self,
2183
                           _bzrdir=a_bzrdir)
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2184
2185
2186
class WorkingTreeFormat3(WorkingTreeFormat):
2187
    """The second working tree format updated to record a format marker.
2188
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2189
    This format:
2190
        - exists within a metadir controlling .bzr
2191
        - includes an explicit version marker for the workingtree control
2192
          files, separate from the BzrDir format
2193
        - modifies the hash cache format
2194
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2195
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2196
    """
2197
2198
    def get_format_string(self):
2199
        """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
2200
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2201
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2202
    def get_format_description(self):
2203
        """See WorkingTreeFormat.get_format_description()."""
2204
        return "Working tree format 3"
2205
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2206
    _lock_file_name = 'lock'
2207
    _lock_class = LockDir
2208
2209
    def _open_control_files(self, a_bzrdir):
2210
        transport = a_bzrdir.get_workingtree_transport(None)
2211
        return LockableFiles(transport, self._lock_file_name, 
2212
                             self._lock_class)
2213
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2214
    def initialize(self, a_bzrdir, revision_id=None):
2215
        """See WorkingTreeFormat.initialize().
2216
        
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2217
        revision_id allows creating a working tree at a different
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2218
        revision than the branch is at.
2219
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2220
        if not isinstance(a_bzrdir.transport, LocalTransport):
2221
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2222
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2223
        control_files = self._open_control_files(a_bzrdir)
2224
        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.
2225
        control_files.lock_write()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2226
        control_files.put_utf8('format', self.get_format_string())
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2227
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2228
        if revision_id is None:
2229
            revision_id = 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
2230
        # WorkingTree3 can handle an inventory which has a unique root id.
2231
        # as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
2232
        # those trees. And because there isn't a format bump inbetween, we
2233
        # are maintaining compatibility with older clients.
2234
        # inv = Inventory(root_id=gen_root_id())
2235
        inv = Inventory()
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
2236
        wt = WorkingTree3(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.
2237
                         branch,
2238
                         inv,
2239
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2240
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2241
                         _bzrdir=a_bzrdir,
2242
                         _control_files=control_files)
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
2243
        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.
2244
        try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
2245
            basis_tree = branch.repository.revision_tree(revision_id)
1986.5.8 by Robert Collins
Merge bzr.dev.
2246
            # only set an explicit root id if there is one to set.
2247
            if basis_tree.inventory.root is not None:
2248
                wt.set_root_id(basis_tree.inventory.root.file_id)
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
2249
            if revision_id == NULL_REVISION:
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
2250
                wt.set_parent_trees([])
2251
            else:
2252
                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.
2253
            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.
2254
        finally:
1986.5.7 by Robert Collins
Merge reviews.
2255
            # 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)
2256
            # WorkingTree is given a chance to fire.
2257
            control_files.unlock()
1607.1.14 by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.
2258
            wt.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2259
        return wt
2260
2261
    def __init__(self):
2262
        super(WorkingTreeFormat3, self).__init__()
2263
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2264
2265
    def open(self, a_bzrdir, _found=False):
2266
        """Return the WorkingTree object for a_bzrdir
2267
2268
        _found is a private parameter, do not use it. It is used to indicate
2269
               if format probing has already been done.
2270
        """
2271
        if not _found:
2272
            # we are being called directly and must probe.
2273
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2274
        if not isinstance(a_bzrdir.transport, LocalTransport):
2275
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2276
        return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2277
2278
    def _open(self, a_bzrdir, control_files):
2279
        """Open the tree itself.
2280
        
2281
        :param a_bzrdir: the dir for the tree.
2282
        :param control_files: the control files for the tree.
2283
        """
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
2284
        return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2285
                           _internal=True,
2286
                           _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2287
                           _bzrdir=a_bzrdir,
2288
                           _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2289
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
2290
    def __str__(self):
2291
        return self.get_format_string()
2292
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2293
2294
# formats which have no format string are not discoverable
2295
# and not independently creatable, so are not registered.
2296
__default_format = WorkingTreeFormat3()
2297
WorkingTreeFormat.register_format(__default_format)
2298
WorkingTreeFormat.set_default_format(__default_format)
2299
_legacy_formats = [WorkingTreeFormat2(),
2300
                   ]
2301
2302
2303
class WorkingTreeTestProviderAdapter(object):
2304
    """A tool to generate a suite testing multiple workingtree formats at once.
2305
2306
    This is done by copying the test once for each transport and injecting
2307
    the transport_server, transport_readonly_server, and workingtree_format
2308
    classes into each copy. Each copy is also given a new id() to make it
2309
    easy to identify.
2310
    """
2311
2312
    def __init__(self, transport_server, transport_readonly_server, formats):
2313
        self._transport_server = transport_server
2314
        self._transport_readonly_server = transport_readonly_server
2315
        self._formats = formats
2316
    
1852.6.1 by Robert Collins
Start tree implementation tests.
2317
    def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2318
        """Clone test for adaption."""
2319
        new_test = deepcopy(test)
2320
        new_test.transport_server = self._transport_server
2321
        new_test.transport_readonly_server = self._transport_readonly_server
2322
        new_test.bzrdir_format = bzrdir_format
2323
        new_test.workingtree_format = workingtree_format
2324
        def make_new_test_id():
2325
            new_id = "%s(%s)" % (test.id(), variation)
2326
            return lambda: new_id
2327
        new_test.id = make_new_test_id()
2328
        return new_test
2329
    
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2330
    def adapt(self, test):
2331
        from bzrlib.tests import TestSuite
2332
        result = TestSuite()
2333
        for workingtree_format, bzrdir_format in self._formats:
1852.6.1 by Robert Collins
Start tree implementation tests.
2334
            new_test = self._clone_test(
2335
                test,
2336
                bzrdir_format,
2337
                workingtree_format, workingtree_format.__class__.__name__)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2338
            result.addTest(new_test)
2339
        return result