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