/brz/remove-bazaar

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