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