/brz/remove-bazaar

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