/brz/remove-bazaar

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