/brz/remove-bazaar

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