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