/brz/remove-bazaar

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