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