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