/brz/remove-bazaar

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