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