/brz/remove-bazaar

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