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