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