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