/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
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
565
    def get_file_sha1(self, file_id, path=None):
566
        if not path:
567
            path = self._inventory.id2path(file_id)
866 by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.
568
        return self._hashcache.get_sha1(path)
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
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
678
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
679
        """Common ghost checking functionality from set_parent_*.
680
681
        This checks that the left hand-parent exists if there are any
682
        revisions present.
683
        """
684
        if len(revision_ids) > 0:
685
            leftmost_id = revision_ids[0]
686
            if (not allow_leftmost_as_ghost and not
687
                self.branch.repository.has_revision(leftmost_id)):
688
                raise errors.GhostRevisionUnusableHere(leftmost_id)
689
690
    def _set_merges_from_parent_ids(self, parent_ids):
691
        merges = parent_ids[1:]
692
        self._control_files.put_utf8('pending-merges', '\n'.join(merges))
693
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
694
    @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.
695
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
696
        """Set the parent ids to revision_ids.
697
        
698
        See also set_parent_trees. This api will try to retrieve the tree data
699
        for each element of revision_ids from the trees repository. If you have
700
        tree data already available, it is more efficient to use
701
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
702
        an easier API to use.
703
704
        :param revision_ids: The revision_ids to set as the parent ids of this
705
            working tree. Any of these may be ghosts.
706
        """
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
707
        self._check_parents_for_ghosts(revision_ids,
708
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
709
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
710
        if len(revision_ids) > 0:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
711
            self.set_last_revision(revision_ids[0])
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
712
        else:
713
            self.set_last_revision(None)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
714
715
        self._set_merges_from_parent_ids(revision_ids)
1908.5.5 by Robert Collins
Add WorkingTree.set_parent_ids.
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
1908.5.9 by Robert Collins
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
718
    def set_parent_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
719
        """See MutableTree.set_parent_trees."""
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
720
        parent_ids = [rev for (rev, tree) in parents_list]
721
722
        self._check_parents_for_ghosts(parent_ids,
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
723
            allow_leftmost_as_ghost=allow_leftmost_as_ghost)
1908.5.2 by Robert Collins
Create and test set_parent_trees.
724
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
725
        if len(parent_ids) == 0:
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
726
            leftmost_parent_id = None
727
            leftmost_parent_tree = None
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
728
        else:
729
            leftmost_parent_id, leftmost_parent_tree = parents_list[0]
730
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
731
        if self._change_last_revision(leftmost_parent_id):
732
            if leftmost_parent_tree is None:
2041.1.4 by John Arbash Meinel
NEWS and documentation
733
                # If we don't have a tree, fall back to reading the
734
                # parent tree from the repository.
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
735
                self._cache_basis_inventory(leftmost_parent_id)
736
            else:
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
737
                # It seems Repository.deserialise_inventory is doing this
2041.1.3 by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision
738
                # because apparently commit builder, *doesn't*. It
739
                # seems like the in-memory Inventory should always have
740
                # the root.revision set without having to serialize out
741
                # to disk first.
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
742
                inv = leftmost_parent_tree.inventory
743
                if not self.branch.repository._format.rich_root_data:
744
                    inv.root.revision = leftmost_parent_id
745
                xml = self._create_basis_xml_from_inventory(
746
                                        leftmost_parent_id, inv)
747
                self._write_basis_inventory(xml)
748
        self._set_merges_from_parent_ids(parent_ids)
749
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
750
    @needs_tree_write_lock
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
751
    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.
752
        parents = self.get_parent_ids()
753
        leftmost = parents[:1]
754
        new_parents = leftmost + rev_list
755
        self.set_parent_ids(new_parents)
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
756
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
757
    @needs_tree_write_lock
1534.7.192 by Aaron Bentley
Record hashes produced by merges
758
    def set_merge_modified(self, modified_hashes):
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
759
        def iter_stanzas():
760
            for file_id, hash in modified_hashes.iteritems():
761
                yield Stanza(file_id=file_id, hash=hash)
762
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
763
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
764
    @needs_tree_write_lock
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
765
    def _put_rio(self, filename, stanzas, header):
766
        my_file = rio_file(stanzas, header)
767
        self._control_files.put(filename, my_file)
1534.7.192 by Aaron Bentley
Record hashes produced by merges
768
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
769
    @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.
770
    def merge_from_branch(self, branch, to_revision=None):
771
        """Merge from a branch into this working tree.
772
773
        :param branch: The branch to merge from.
774
        :param to_revision: If non-None, the merge will merge to to_revision, but 
775
            not beyond it. to_revision does not need to be in the history of
776
            the branch when it is supplied. If None, to_revision defaults to
777
            branch.last_revision().
778
        """
779
        from bzrlib.merge import Merger, Merge3Merger
780
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
781
        try:
782
            merger = Merger(self.branch, this_tree=self, pb=pb)
783
            merger.pp = ProgressPhase("Merge phase", 5, pb)
784
            merger.pp.next_phase()
785
            # check that there are no
786
            # local alterations
787
            merger.check_basis(check_clean=True, require_commits=False)
788
            if to_revision is None:
789
                to_revision = branch.last_revision()
790
            merger.other_rev_id = to_revision
791
            if merger.other_rev_id is None:
792
                raise error.NoCommits(branch)
793
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
794
            merger.other_basis = merger.other_rev_id
795
            merger.other_tree = self.branch.repository.revision_tree(
796
                merger.other_rev_id)
797
            merger.pp.next_phase()
798
            merger.find_base()
799
            if merger.base_rev_id == merger.other_rev_id:
800
                raise errors.PointlessMerge
801
            merger.backup_files = False
802
            merger.merge_type = Merge3Merger
803
            merger.set_interesting_files(None)
804
            merger.show_base = False
805
            merger.reprocess = False
806
            conflicts = merger.do_merge()
807
            merger.set_pending()
808
        finally:
809
            pb.finished()
810
        return conflicts
811
1534.7.192 by Aaron Bentley
Record hashes produced by merges
812
    @needs_read_lock
813
    def merge_modified(self):
814
        try:
815
            hashfile = self._control_files.get('merge-hashes')
816
        except NoSuchFile:
817
            return {}
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
818
        merge_hashes = {}
819
        try:
820
            if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
821
                raise MergeModifiedFormatError()
822
        except StopIteration:
823
            raise MergeModifiedFormatError()
824
        for s in RioReader(hashfile):
1534.7.198 by Aaron Bentley
Removed spurious encode/decode
825
            file_id = s.get("file_id")
1558.12.10 by Aaron Bentley
Be robust when merge_hash file_id not in inventory
826
            if file_id not in self.inventory:
827
                continue
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
828
            hash = s.get("hash")
829
            if hash == self.get_file_sha1(file_id):
830
                merge_hashes[file_id] = hash
831
        return merge_hashes
1534.7.192 by Aaron Bentley
Record hashes produced by merges
832
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
833
    @needs_write_lock
834
    def mkdir(self, path, file_id=None):
835
        """See MutableTree.mkdir()."""
836
        if file_id is None:
837
            file_id = gen_file_id(os.path.basename(path))
838
        os.mkdir(self.abspath(path))
839
        self.add(path, file_id, 'directory')
840
        return file_id
841
1092.2.6 by Robert Collins
symlink support updated to work
842
    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
843
        return os.readlink(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
844
845
    def file_class(self, filename):
846
        if self.path2id(filename):
847
            return 'V'
848
        elif self.is_ignored(filename):
849
            return 'I'
850
        else:
851
            return '?'
852
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
853
    def list_files(self):
1732.1.6 by John Arbash Meinel
Fix documentation bug in workingtree.list_files
854
        """Recursively list all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
855
856
        Lists, but does not descend into unversioned directories.
857
858
        This does not include files that have been deleted in this
859
        tree.
860
861
        Skips the control directory.
862
        """
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.
863
        inv = self._inventory
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
864
        # Convert these into local objects to save lookup times
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
865
        pathjoin = osutils.pathjoin
866
        file_kind = osutils.file_kind
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
867
868
        # transport.base ends in a slash, we want the piece
869
        # between the last two slashes
870
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
871
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
872
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
873
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
874
        # directory file_id, relative path, absolute path, reverse sorted children
875
        children = os.listdir(self.basedir)
876
        children.sort()
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
877
        # jam 20060527 The kernel sized tree seems equivalent whether we 
878
        # use a deque and popleft to keep them sorted, or if we use a plain
879
        # 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.
880
        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
881
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
882
        while stack:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
883
            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
884
885
            while children:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
886
                f = children.popleft()
453 by Martin Pool
- Split WorkingTree into its own file
887
                ## TODO: If we find a subdirectory with its own .bzr
888
                ## directory, then that is a separate tree and we
889
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
890
891
                # the bzrdir for this tree
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
892
                if transport_base_dir == f:
453 by Martin Pool
- Split WorkingTree into its own file
893
                    continue
894
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
895
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
896
                # 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
897
                # than the checks of pathjoin(), all relative paths will have an extra slash
898
                # at the beginning
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
899
                fp = from_dir_relpath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
900
901
                # absolute path
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
902
                fap = from_dir_abspath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
903
                
904
                f_ie = inv.get_child(from_dir_id, f)
905
                if f_ie:
906
                    c = 'V'
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
907
                elif self.is_ignored(fp[1:]):
908
                    c = 'I'
453 by Martin Pool
- Split WorkingTree into its own file
909
                else:
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
910
                    # we may not have found this file, because of a unicode issue
911
                    f_norm, can_access = osutils.normalized_filename(f)
912
                    if f == f_norm or not can_access:
913
                        # No change, so treat this file normally
914
                        c = '?'
915
                    else:
916
                        # this file can be accessed by a normalized path
917
                        # check again if it is versioned
918
                        # these lines are repeated here for performance
919
                        f = f_norm
920
                        fp = from_dir_relpath + '/' + f
921
                        fap = from_dir_abspath + '/' + f
922
                        f_ie = inv.get_child(from_dir_id, f)
923
                        if f_ie:
924
                            c = 'V'
925
                        elif self.is_ignored(fp[1:]):
926
                            c = 'I'
927
                        else:
928
                            c = '?'
453 by Martin Pool
- Split WorkingTree into its own file
929
930
                fk = file_kind(fap)
931
932
                if f_ie:
933
                    if f_ie.kind != fk:
934
                        raise BzrCheckError("file %r entered as kind %r id %r, "
935
                                            "now of kind %r"
936
                                            % (fap, f_ie.kind, f_ie.file_id, fk))
937
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
938
                # make a last minute entry
939
                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
940
                    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
941
                else:
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
942
                    try:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
943
                        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
944
                    except KeyError:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
945
                        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.
946
                    continue
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
947
                
453 by Martin Pool
- Split WorkingTree into its own file
948
                if fk != 'directory':
949
                    continue
950
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
951
                # 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.
952
                new_children = os.listdir(fap)
953
                new_children.sort()
954
                new_children = collections.deque(new_children)
955
                stack.append((f_ie.file_id, fp, fap, new_children))
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
956
                # Break out of inner loop, so that we start outer loop with child
957
                break
1732.1.22 by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory
958
            else:
959
                # 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.
960
                stack.pop()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
961
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
962
    @needs_tree_write_lock
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
963
    def move(self, from_paths, to_name):
964
        """Rename files.
965
966
        to_name must exist in the inventory.
967
968
        If to_name exists and is a directory, the files are moved into
969
        it, keeping their old names.  
970
971
        Note that to_name is only the last component of the new name;
972
        this doesn't change the directory.
973
974
        This returns a list of (from_path, to_path) pairs for each
975
        entry that is moved.
976
        """
977
        result = []
978
        ## TODO: Option to move IDs only
979
        assert not isinstance(from_paths, basestring)
980
        inv = self.inventory
981
        to_abs = self.abspath(to_name)
982
        if not isdir(to_abs):
983
            raise BzrError("destination %r is not a directory" % to_abs)
984
        if not self.has_filename(to_name):
985
            raise BzrError("destination %r not in working directory" % to_abs)
986
        to_dir_id = inv.path2id(to_name)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
987
        if to_dir_id is None and to_name != '':
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
988
            raise BzrError("destination %r is not a versioned directory" % to_name)
989
        to_dir_ie = inv[to_dir_id]
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
990
        if to_dir_ie.kind != 'directory':
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
991
            raise BzrError("destination %r is not a directory" % to_abs)
992
993
        to_idpath = inv.get_idpath(to_dir_id)
994
995
        for f in from_paths:
996
            if not self.has_filename(f):
997
                raise BzrError("%r does not exist in working tree" % f)
998
            f_id = inv.path2id(f)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
999
            if f_id is None:
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1000
                raise BzrError("%r is not versioned" % f)
1001
            name_tail = splitpath(f)[-1]
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1002
            dest_path = pathjoin(to_name, name_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1003
            if self.has_filename(dest_path):
1004
                raise BzrError("destination %r already exists" % dest_path)
1005
            if f_id in to_idpath:
1006
                raise BzrError("can't move %r to a subdirectory of itself" % f)
1007
1008
        # OK, so there's a race here, it's possible that someone will
1009
        # create a file in this interval and then the rename might be
1010
        # left half-done.  But we should have caught most problems.
1011
        orig_inv = deepcopy(self.inventory)
1012
        try:
1013
            for f in from_paths:
1014
                name_tail = splitpath(f)[-1]
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1015
                dest_path = pathjoin(to_name, name_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1016
                result.append((f, dest_path))
1017
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
1018
                try:
1019
                    rename(self.abspath(f), self.abspath(dest_path))
1020
                except OSError, e:
1021
                    raise BzrError("failed to rename %r to %r: %s" %
1022
                                   (f, dest_path, e[1]),
1023
                            ["rename rolled back"])
1024
        except:
1025
            # restore the inventory on error
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1026
            self._set_inventory(orig_inv)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
1027
            raise
1028
        self._write_inventory(inv)
1029
        return result
1030
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1031
    @needs_tree_write_lock
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1032
    def rename_one(self, from_rel, to_rel):
1033
        """Rename one file.
1034
1035
        This can change the directory or the filename or both.
1036
        """
1037
        inv = self.inventory
1038
        if not self.has_filename(from_rel):
1039
            raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1040
        if self.has_filename(to_rel):
1041
            raise BzrError("can't rename: new working file %r already exists" % to_rel)
1042
1043
        file_id = inv.path2id(from_rel)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1044
        if file_id is None:
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1045
            raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1046
1047
        entry = inv[file_id]
1048
        from_parent = entry.parent_id
1049
        from_name = entry.name
1050
        
1051
        if inv.path2id(to_rel):
1052
            raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1053
1054
        to_dir, to_tail = os.path.split(to_rel)
1055
        to_dir_id = inv.path2id(to_dir)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1056
        if to_dir_id is None and to_dir != '':
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
1057
            raise BzrError("can't determine destination directory id for %r" % to_dir)
1058
1059
        mutter("rename_one:")
1060
        mutter("  file_id    {%s}" % file_id)
1061
        mutter("  from_rel   %r" % from_rel)
1062
        mutter("  to_rel     %r" % to_rel)
1063
        mutter("  to_dir     %r" % to_dir)
1064
        mutter("  to_dir_id  {%s}" % to_dir_id)
1065
1066
        inv.rename(file_id, to_dir_id, to_tail)
1067
1068
        from_abs = self.abspath(from_rel)
1069
        to_abs = self.abspath(to_rel)
1070
        try:
1071
            rename(from_abs, to_abs)
1072
        except OSError, e:
1073
            inv.rename(file_id, from_parent, from_name)
1074
            raise BzrError("failed to rename %r to %r: %s"
1075
                    % (from_abs, to_abs, e[1]),
1076
                    ["rename rolled back"])
1077
        self._write_inventory(inv)
1078
1079
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
1080
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
1081
        """Return all unknown files.
1082
1083
        These are files in the working directory that are not versioned or
1084
        control files or ignored.
1085
        """
453 by Martin Pool
- Split WorkingTree into its own file
1086
        for subp in self.extras():
1087
            if not self.is_ignored(subp):
1088
                yield subp
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1089
    
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1090
    @needs_tree_write_lock
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1091
    def unversion(self, file_ids):
1092
        """Remove the file ids in file_ids from the current versioned set.
1093
1094
        When a file_id is unversioned, all of its children are automatically
1095
        unversioned.
1096
1097
        :param file_ids: The file ids to stop versioning.
1098
        :raises: NoSuchId if any fileid is not currently versioned.
1099
        """
1100
        for file_id in file_ids:
1101
            if self._inventory.has_id(file_id):
1988.2.6 by Robert Collins
Review feedback.
1102
                self._inventory.remove_recursive_id(file_id)
1988.2.1 by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of
1103
            else:
1104
                raise errors.NoSuchId(self, file_id)
1105
        if len(file_ids):
1106
            # in the future this should just set a dirty bit to wait for the 
1107
            # final unlock. However, until all methods of workingtree start
1108
            # with the current in -memory inventory rather than triggering 
1109
            # a read, it is more complex - we need to teach read_inventory
1110
            # to know when to read, and when to not read first... and possibly
1111
            # to save first when the in memory one may be corrupted.
1112
            # so for now, we just only write it if it is indeed dirty.
1113
            # - RBC 20060907
1114
            self._write_inventory(self._inventory)
1115
    
1534.10.16 by Aaron Bentley
Small tweaks
1116
    @deprecated_method(zero_eight)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1117
    def iter_conflicts(self):
1534.10.16 by Aaron Bentley
Small tweaks
1118
        """List all files in the tree that have text or content conflicts.
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1119
        DEPRECATED.  Use conflicts instead."""
1534.10.10 by Aaron Bentley
Resolve uses the new stuff.
1120
        return self._iter_conflicts()
1121
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1122
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1123
        conflicted = set()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
1124
        for info in self.list_files():
1125
            path = info[0]
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1126
            stem = get_conflicted_stem(path)
1127
            if stem is None:
1128
                continue
1129
            if stem not in conflicted:
1130
                conflicted.add(stem)
1131
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
1132
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1133
    @needs_write_lock
1185.76.1 by Erik Bågfors
Support for --revision in pull
1134
    def pull(self, source, overwrite=False, stop_revision=None):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1135
        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().
1136
        source.lock_read()
1137
        try:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1138
            pp = ProgressPhase("Pull phase", 2, top_pb)
1139
            pp.next_phase()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1140
            old_revision_history = self.branch.revision_history()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
1141
            basis_tree = self.basis_tree()
1534.4.54 by Robert Collins
Merge from integration.
1142
            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().
1143
            new_revision_history = self.branch.revision_history()
1144
            if new_revision_history != old_revision_history:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1145
                pp.next_phase()
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
1146
                if len(old_revision_history):
1147
                    other_revision = old_revision_history[-1]
1148
                else:
1149
                    other_revision = None
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1150
                repository = self.branch.repository
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1151
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1152
                try:
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1153
                    new_basis_tree = self.branch.basis_tree()
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1154
                    merge_inner(self.branch,
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1155
                                new_basis_tree,
1156
                                basis_tree,
1157
                                this_tree=self,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1158
                                pb=pb)
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
1159
                finally:
1160
                    pb.finished()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1161
                # 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.
1162
                # reuse the revisiontree we merged against to set the new
1163
                # tree data.
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1164
                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.
1165
                # we have to pull the merge trees out again, because 
1166
                # merge_inner has set the ids. - this corner is not yet 
1167
                # 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.
1168
                merges = self.get_parent_ids()[1:]
1169
                parent_trees.extend([
1170
                    (parent, repository.revision_tree(parent)) for
1171
                     parent in merges])
1172
                self.set_parent_trees(parent_trees)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1173
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1174
        finally:
1175
            source.unlock()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1176
            top_pb.finished()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1177
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1178
    @needs_write_lock
1179
    def put_file_bytes_non_atomic(self, file_id, bytes):
1180
        """See MutableTree.put_file_bytes_non_atomic."""
1181
        stream = file(self.id2abspath(file_id), 'wb')
1182
        try:
1183
            stream.write(bytes)
1184
        finally:
1185
            stream.close()
1186
        # TODO: update the hashcache here ?
1187
453 by Martin Pool
- Split WorkingTree into its own file
1188
    def extras(self):
1189
        """Yield all unknown files in this WorkingTree.
1190
1191
        If there are any unknown directories then only the directory is
1192
        returned, not all its children.  But if there are unknown files
1193
        under a versioned subdirectory, they are returned.
1194
1195
        Currently returned depth-first, sorted by name within directories.
1196
        """
1197
        ## TODO: Work from given directory downwards
1198
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1199
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1200
            dirabs = self.abspath(path)
1201
            if not isdir(dirabs):
1202
                # e.g. directory deleted
1203
                continue
1204
1205
            fl = []
1206
            for subf in os.listdir(dirabs):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1207
                if subf == '.bzr':
1208
                    continue
1209
                if subf not in dir_entry.children:
1210
                    subf_norm, can_access = osutils.normalized_filename(subf)
1211
                    if subf_norm != subf and can_access:
1212
                        if subf_norm not in dir_entry.children:
1213
                            fl.append(subf_norm)
1214
                    else:
1215
                        fl.append(subf)
453 by Martin Pool
- Split WorkingTree into its own file
1216
            
1217
            fl.sort()
1218
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1219
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1220
                yield subp
1221
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1222
    def _translate_ignore_rule(self, rule):
1223
        """Translate a single ignore rule to a regex.
1224
1713.2.7 by Robert Collins
Better description of ignore rule types from Martin.
1225
        There are two types of ignore rules.  Those that do not contain a / are
1226
        matched against the tail of the filename (that is, they do not care
1227
        what directory the file is in.)  Rules which do contain a slash must
1228
        match the entire path.  As a special case, './' at the start of the
1229
        string counts as a slash in the string but is removed before matching
1230
        (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.
1231
1232
        :return: The translated regex.
1233
        """
1234
        if rule[:2] in ('./', '.\\'):
1235
            # rootdir rule
1236
            result = fnmatch.translate(rule[2:])
1237
        elif '/' in rule or '\\' in rule:
1238
            # path prefix 
1239
            result = fnmatch.translate(rule)
1240
        else:
1241
            # default rule style.
1242
            result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1243
        assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1244
        return "(" + result + ")"
1245
1246
    def _combine_ignore_rules(self, rules):
1247
        """Combine a list of ignore rules into a single regex object.
1248
1249
        Each individual rule is combined with | to form a big regex, which then
1250
        has $ added to it to form something like ()|()|()$. The group index for
1251
        each subregex's outermost group is placed in a dictionary mapping back 
1252
        to the rule. This allows quick identification of the matching rule that
1253
        triggered a match.
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1254
        :return: a list of the compiled regex and the matching-group index 
1255
        dictionaries. We return a list because python complains if you try to 
1256
        combine more than 100 regexes.
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1257
        """
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1258
        result = []
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1259
        groups = {}
1260
        next_group = 0
1261
        translated_rules = []
1262
        for rule in rules:
1263
            translated_rule = self._translate_ignore_rule(rule)
1264
            compiled_rule = re.compile(translated_rule)
1265
            groups[next_group] = rule
1266
            next_group += compiled_rule.groups
1267
            translated_rules.append(translated_rule)
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1268
            if next_group == 99:
1269
                result.append((re.compile("|".join(translated_rules)), groups))
1270
                groups = {}
1271
                next_group = 0
1272
                translated_rules = []
1273
        if len(translated_rules):
1274
            result.append((re.compile("|".join(translated_rules)), groups))
1275
        return result
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1276
453 by Martin Pool
- Split WorkingTree into its own file
1277
    def ignored_files(self):
1278
        """Yield list of PATH, IGNORE_PATTERN"""
1279
        for subp in self.extras():
1280
            pat = self.is_ignored(subp)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1281
            if pat is not None:
453 by Martin Pool
- Split WorkingTree into its own file
1282
                yield subp, pat
1283
1284
    def get_ignore_list(self):
1285
        """Return list of ignore patterns.
1286
1287
        Cached in the Tree object after the first call.
1288
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1289
        ignoreset = getattr(self, '_ignoreset', None)
1290
        if ignoreset is not None:
1291
            return ignoreset
1292
1293
        ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1294
        ignore_globs.update(ignores.get_runtime_ignores())
1295
1296
        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
1297
453 by Martin Pool
- Split WorkingTree into its own file
1298
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1299
            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
1300
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1301
                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
1302
            finally:
1303
                f.close()
1304
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1305
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1306
        self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1307
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1308
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1309
    def _get_ignore_rules_as_regex(self):
1310
        """Return a regex of the ignore rules and a mapping dict.
1311
1312
        :return: (ignore rules compiled regex, dictionary mapping rule group 
1313
        indices to original rule.)
1314
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1315
        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.
1316
            self.get_ignore_list()
1317
        return self._ignore_regex
1318
453 by Martin Pool
- Split WorkingTree into its own file
1319
    def is_ignored(self, filename):
1320
        r"""Check whether the filename matches an ignore pattern.
1321
1322
        Patterns containing '/' or '\' need to match the whole path;
1323
        others match against only the last component.
1324
1325
        If the file is ignored, returns the pattern which caused it to
1326
        be ignored, otherwise None.  So this can simply be used as a
1327
        boolean if desired."""
1328
1329
        # TODO: Use '**' to match directories, and other extended
1330
        # globbing stuff from cvs/rsync.
1331
1332
        # XXX: fnmatch is actually not quite what we want: it's only
1333
        # approximately the same as real Unix fnmatch, and doesn't
1334
        # treat dotfiles correctly and allows * to match /.
1335
        # Eventually it should be replaced with something more
1336
        # accurate.
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1337
    
1338
        rules = self._get_ignore_rules_as_regex()
1339
        for regex, mapping in rules:
1340
            match = regex.match(filename)
1341
            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.
1342
                # one or more of the groups in mapping will have a non-None
1343
                # group match.
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1344
                groups = match.groups()
1345
                rules = [mapping[group] for group in 
1346
                    mapping if groups[group] is not None]
1347
                return rules[0]
1707.2.5 by Robert Collins
slightly improve add
1348
        return None
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1349
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1350
    def kind(self, file_id):
1351
        return file_kind(self.id2abspath(file_id))
1352
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1353
    def last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1354
        """Return the last revision of the branch for this tree.
1355
1356
        This format tree does not support a separate marker for last-revision
1357
        compared to the branch.
1358
1359
        See MutableTree.last_revision
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1360
        """
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1361
        return self._last_revision()
1362
1363
    @needs_read_lock
1364
    def _last_revision(self):
1365
        """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()
1366
        return self.branch.last_revision()
1367
1694.2.6 by Martin Pool
[merge] bzr.dev
1368
    def is_locked(self):
1369
        return self._control_files.is_locked()
1370
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1371
    def lock_read(self):
1372
        """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.
1373
        self.branch.lock_read()
1374
        try:
1375
            return self._control_files.lock_read()
1376
        except:
1377
            self.branch.unlock()
1378
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1379
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1380
    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.
1381
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1382
        self.branch.lock_read()
1383
        try:
1384
            return self._control_files.lock_write()
1385
        except:
1386
            self.branch.unlock()
1387
            raise
1388
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1389
    def lock_write(self):
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
1390
        """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.
1391
        self.branch.lock_write()
1392
        try:
1393
            return self._control_files.lock_write()
1394
        except:
1395
            self.branch.unlock()
1396
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1397
1694.2.6 by Martin Pool
[merge] bzr.dev
1398
    def get_physical_lock_status(self):
1399
        return self._control_files.get_physical_lock_status()
1400
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1401
    def _basis_inventory_name(self):
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1402
        return 'basis-inventory-cache'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1403
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1404
    @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.
1405
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1406
        """Change the last revision in the working tree."""
1407
        if self._change_last_revision(new_revision):
1408
            self._cache_basis_inventory(new_revision)
1409
1410
    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.
1411
        """Template method part of set_last_revision to perform the change.
1412
        
1413
        This is used to allow WorkingTree3 instances to not affect branch
1414
        when their last revision is set.
1415
        """
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1416
        if new_revision is None:
1417
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1418
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1419
        try:
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1420
            self.branch.generate_revision_history(new_revision)
1421
        except errors.NoSuchRevision:
1422
            # not present in the repo - dont try to set it deeper than the tip
1423
            self.branch.set_revision_history([new_revision])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1424
        return True
1425
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1426
    def _write_basis_inventory(self, xml):
1427
        """Write the basis inventory XML to the basis-inventory file"""
1428
        assert isinstance(xml, str), 'serialised xml must be bytestring.'
1429
        path = self._basis_inventory_name()
1430
        sio = StringIO(xml)
1431
        self._control_files.put(path, sio)
1432
1433
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1434
        """Create the text that will be saved in basis-inventory"""
1435
        inventory.revision_id = revision_id
1436
        return bzrlib.xml6.serializer_v6.write_inventory_to_string(inventory)
1437
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1438
    def _cache_basis_inventory(self, new_revision):
1439
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1440
        # TODO: this should allow the ready-to-use inventory to be passed in,
1441
        # as commit already has that ready-to-use [while the format is the
1442
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1443
        try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1444
            # this double handles the inventory - unpack and repack - 
1445
            # but is easier to understand. We can/should put a conditional
1446
            # in here based on whether the inventory is in the latest format
1447
            # - perhaps we should repack all inventories on a repository
1448
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1449
            # the fast path is to copy the raw xml from the repository. If the
1450
            # xml contains 'revision_id="', then we assume the right 
1451
            # revision_id is set. We must check for this full string, because a
1452
            # root node id can legitimately look like 'revision_id' but cannot
1453
            # contain a '"'.
1454
            xml = self.branch.repository.get_inventory_xml(new_revision)
1910.2.22 by Aaron Bentley
Make commits preserve root entry data
1455
            firstline = xml.split('\n', 1)[0]
1456
            if (not 'revision_id="' in firstline or 
1910.2.31 by Aaron Bentley
Fix bugs in basis inventory handling, change filename
1457
                'format="6"' not in firstline):
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1458
                inv = self.branch.repository.deserialise_inventory(
1459
                    new_revision, xml)
2041.1.2 by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv.
1460
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1461
            self._write_basis_inventory(xml)
1908.1.1 by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set.
1462
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1463
            pass
1464
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1465
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1466
        """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.
1467
        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.
1468
        return self._control_files.get(path).read()
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1469
        
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1470
    @needs_read_lock
1471
    def read_working_inventory(self):
1472
        """Read the working inventory."""
1473
        # ElementTree does its own conversion from UTF-8, so open in
1474
        # binary.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1475
        result = bzrlib.xml5.serializer_v5.read_inventory(
1534.4.28 by Robert Collins
first cut at merge from integration.
1476
            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()
1477
        self._set_inventory(result)
1478
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1479
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1480
    @needs_tree_write_lock
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1481
    def remove(self, files, verbose=False, to_file=None):
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1482
        """Remove nominated files from the working inventory..
1483
1484
        This does not remove their text.  This does not run on XXX on what? RBC
1485
1486
        TODO: Refuse to remove modified files unless --force is given?
1487
1488
        TODO: Do something useful with directories.
1489
1490
        TODO: Should this remove the text or not?  Tough call; not
1491
        removing may be useful and the user can just use use rm, and
1492
        is the opposite of add.  Removing it is consistent with most
1493
        other tools.  Maybe an option.
1494
        """
1495
        ## TODO: Normalize names
1496
        ## TODO: Remove nested loops; better scalability
1497
        if isinstance(files, basestring):
1498
            files = [files]
1499
1500
        inv = self.inventory
1501
1502
        # do this before any modifications
1503
        for f in files:
1504
            fid = inv.path2id(f)
1505
            if not fid:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
1506
                # TODO: Perhaps make this just a warning, and continue?
1507
                # This tends to happen when 
1508
                raise NotVersionedError(path=f)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1509
            if verbose:
1510
                # having remove it, it must be either ignored or unknown
1511
                if self.is_ignored(f):
1512
                    new_status = 'I'
1513
                else:
1514
                    new_status = '?'
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1515
                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.
1516
            del inv[fid]
1517
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1518
        self._write_inventory(inv)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1519
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1520
    @needs_tree_write_lock
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1521
    def revert(self, filenames, old_tree=None, backups=True, 
1522
               pb=DummyProgress()):
1534.7.47 by Aaron Bentley
Started work on 'revert'
1523
        from transform import revert
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1524
        from conflicts import resolve
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1525
        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()
1526
            old_tree = self.basis_tree()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1527
        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.
1528
        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.
1529
            self.set_parent_ids(self.get_parent_ids()[:1])
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1530
            resolve(self)
1531
        else:
1534.10.15 by Aaron Bentley
Revert does resolve
1532
            resolve(self, filenames, ignore_misses=True)
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1533
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1534
1658.1.3 by Martin Pool
Doc
1535
    # XXX: This method should be deprecated in favour of taking in a proper
1536
    # new Inventory object.
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1537
    @needs_tree_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1538
    def set_inventory(self, new_inventory_list):
1539
        from bzrlib.inventory import (Inventory,
1540
                                      InventoryDirectory,
1541
                                      InventoryEntry,
1542
                                      InventoryFile,
1543
                                      InventoryLink)
1544
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1545
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1546
            name = os.path.basename(path)
1547
            if name == "":
1548
                continue
1549
            # fixme, there should be a factory function inv,add_?? 
1550
            if kind == 'directory':
1551
                inv.add(InventoryDirectory(file_id, name, parent))
1552
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1553
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1554
            elif kind == 'symlink':
1555
                inv.add(InventoryLink(file_id, name, parent))
1556
            else:
1557
                raise BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1558
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1559
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1560
    @needs_tree_write_lock
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1561
    def set_root_id(self, file_id):
1562
        """Set the root id for this tree."""
1563
        inv = self.read_working_inventory()
1564
        orig_root_id = inv.root.file_id
1565
        del inv._byid[inv.root.file_id]
1566
        inv.root.file_id = file_id
1567
        inv._byid[inv.root.file_id] = inv.root
1568
        for fid in inv:
1569
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1570
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1571
                entry.parent_id = inv.root.file_id
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1572
        self._write_inventory(inv)
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1573
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1574
    def unlock(self):
1575
        """See Branch.unlock.
1576
        
1577
        WorkingTree locking just uses the Branch locking facilities.
1578
        This is current because all working trees have an embedded branch
1579
        within them. IF in the future, we were to make branch data shareable
1580
        between multiple working trees, i.e. via shared storage, then we 
1581
        would probably want to lock both the local tree, and the branch.
1582
        """
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.
1583
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1584
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1585
    @needs_write_lock
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1586
    def update(self):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1587
        """Update a working tree along its branch.
1588
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1589
        This will update the branch if its bound too, which means we have multiple trees involved:
1590
        The new basis tree of the master.
1591
        The old basis tree of the branch.
1592
        The old basis tree of the working tree.
1593
        The current working tree state.
1594
        pathologically all three may be different, and non ancestors of each other.
1595
        Conceptually we want to:
1596
        Preserve the wt.basis->wt.state changes
1597
        Transform the wt.basis to the new master basis.
1598
        Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1599
        Restore the wt.basis->wt.state changes.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1600
1601
        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
1602
        Merge current state -> basis tree of the master w.r.t. the old tree basis.
1603
        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.
1604
        """
1587.1.10 by Robert Collins
update updates working tree and branch together.
1605
        old_tip = self.branch.update()
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1606
        # here if old_tip is not None, it is the old tip of the branch before
1607
        # it was updated from the master branch. This should become a pending
1608
        # merge in the working tree to preserve the user existing work.  we
1609
        # cant set that until we update the working trees last revision to be
1610
        # one from the new branch, because it will just get absorbed by the
1611
        # parent de-duplication logic.
1612
        # 
1613
        # We MUST save it even if an error occurs, because otherwise the users
1614
        # local work is unreferenced and will appear to have been lost.
1615
        # 
1616
        result = 0
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1617
        try:
1618
            last_rev = self.get_parent_ids()[0]
1619
        except IndexError:
1620
            last_rev = None
1621
        if last_rev != self.branch.last_revision():
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1622
            # merge tree state up to new branch tip.
1623
            basis = self.basis_tree()
1624
            to_tree = self.branch.basis_tree()
1625
            result += merge_inner(self.branch,
1626
                                  to_tree,
1627
                                  basis,
1628
                                  this_tree=self)
1908.6.6 by Robert Collins
Merge updated set_parents api.
1629
            # TODO - dedup parents list with things merged by pull ?
1630
            # reuse the tree we've updated to to set the basis:
1631
            parent_trees = [(self.branch.last_revision(), to_tree)]
1632
            merges = self.get_parent_ids()[1:]
1633
            # Ideally we ask the tree for the trees here, that way the working
1634
            # tree can decide whether to give us teh entire tree or give us a
1635
            # lazy initialised tree. dirstate for instance will have the trees
1636
            # in ram already, whereas a last-revision + basis-inventory tree
1637
            # will not, but also does not need them when setting parents.
1638
            for parent in merges:
1639
                parent_trees.append(
1640
                    (parent, self.branch.repository.revision_tree(parent)))
1641
            if old_tip is not None:
1642
                parent_trees.append(
1643
                    (old_tip, self.branch.repository.revision_tree(old_tip)))
1644
            self.set_parent_trees(parent_trees)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1645
            last_rev = parent_trees[0][0]
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1646
        else:
1647
            # the working tree had the same last-revision as the master
1648
            # branch did. We may still have pivot local work from the local
1649
            # 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.
1650
            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.
1651
                self.add_parent_tree_id(old_tip)
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1652
        if old_tip and old_tip != last_rev:
1927.2.3 by Robert Collins
review comment application - paired with Martin.
1653
            # our last revision was not the prior branch last revision
1654
            # and we have converted that last revision to a pending merge.
1655
            # base is somewhere between the branch tip now
1656
            # and the now pending merge
1657
            from bzrlib.revision import common_ancestor
1658
            try:
1659
                base_rev_id = common_ancestor(self.branch.last_revision(),
1660
                                              old_tip,
1661
                                              self.branch.repository)
1662
            except errors.NoCommonAncestor:
1663
                base_rev_id = None
1664
            base_tree = self.branch.repository.revision_tree(base_rev_id)
1665
            other_tree = self.branch.repository.revision_tree(old_tip)
1666
            result += merge_inner(self.branch,
1667
                                  other_tree,
1668
                                  base_tree,
1669
                                  this_tree=self)
1670
        return result
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1671
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1672
    @needs_tree_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1673
    def _write_inventory(self, inv):
1674
        """Write inventory as the current inventory."""
1675
        sio = StringIO()
1676
        bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1677
        sio.seek(0)
1534.4.28 by Robert Collins
first cut at merge from integration.
1678
        self._control_files.put('inventory', sio)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1679
        self._set_inventory(inv)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1680
        mutter('wrote working inventory')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1681
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1682
    def set_conflicts(self, arg):
1683
        raise UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1684
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1685
    def add_conflicts(self, arg):
1686
        raise UnsupportedOperation(self.add_conflicts, self)
1687
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1688
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1689
    def conflicts(self):
1690
        conflicts = ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1691
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1692
            text = True
1693
            try:
1694
                if file_kind(self.abspath(conflicted)) != "file":
1695
                    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.
1696
            except errors.NoSuchFile:
1697
                text = False
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1698
            if text is True:
1699
                for suffix in ('.THIS', '.OTHER'):
1700
                    try:
1701
                        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.
1702
                        if kind != "file":
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1703
                            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.
1704
                    except errors.NoSuchFile:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1705
                        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.
1706
                    if text == False:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1707
                        break
1708
            ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1709
            conflicts.append(Conflict.factory(ctype, path=conflicted,
1710
                             file_id=self.path2id(conflicted)))
1711
        return conflicts
1712
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1713
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.
1714
class WorkingTree2(WorkingTree):
1715
    """This is the Format 2 working tree.
1716
1717
    This was the first weave based working tree. 
1718
     - uses os locks for locking.
1719
     - uses the branch last-revision.
1720
    """
1721
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
1722
    def lock_tree_write(self):
1723
        """See WorkingTree.lock_tree_write().
1724
1725
        In Format2 WorkingTrees we have a single lock for the branch and tree
1726
        so lock_tree_write() degrades to lock_write().
1727
        """
1728
        self.branch.lock_write()
1729
        try:
1730
            return self._control_files.lock_write()
1731
        except:
1732
            self.branch.unlock()
1733
            raise
1734
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.
1735
    def unlock(self):
1736
        # we share control files:
1737
        if self._hashcache.needs_write and self._control_files._lock_count==3:
1738
            self._hashcache.write()
1739
        # reverse order of locking.
1740
        try:
1741
            return self._control_files.unlock()
1742
        finally:
1743
            self.branch.unlock()
1744
1745
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1746
class WorkingTree3(WorkingTree):
1747
    """This is the Format 3 working tree.
1748
1749
    This differs from the base WorkingTree by:
1750
     - having its own file lock
1751
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1752
1753
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1754
    """
1755
1756
    @needs_read_lock
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
1757
    def _last_revision(self):
1986.1.6 by Robert Collins
Add MemoryTree.last_revision.
1758
        """See Mutable.last_revision."""
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1759
        try:
1760
            return self._control_files.get_utf8('last-revision').read()
1761
        except NoSuchFile:
1762
            return None
1763
1764
    def _change_last_revision(self, revision_id):
1765
        """See WorkingTree._change_last_revision."""
1766
        if revision_id is None or revision_id == NULL_REVISION:
1767
            try:
1768
                self._control_files._transport.delete('last-revision')
1769
            except errors.NoSuchFile:
1770
                pass
1771
            return False
1772
        else:
1773
            self._control_files.put_utf8('last-revision', revision_id)
1774
            return True
1775
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1776
    @needs_tree_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1777
    def set_conflicts(self, conflicts):
1778
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
1779
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1780
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
1781
    @needs_tree_write_lock
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1782
    def add_conflicts(self, new_conflicts):
1783
        conflict_set = set(self.conflicts())
1784
        conflict_set.update(set(list(new_conflicts)))
1785
        self.set_conflicts(ConflictList(sorted(conflict_set,
1786
                                               key=Conflict.sort_key)))
1787
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1788
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1789
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1790
        try:
1791
            confile = self._control_files.get('conflicts')
1792
        except NoSuchFile:
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1793
            return ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1794
        try:
1795
            if confile.next() != CONFLICT_HEADER_1 + '\n':
1796
                raise ConflictFormatError()
1797
        except StopIteration:
1798
            raise ConflictFormatError()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1799
        return ConflictList.from_stanzas(RioReader(confile))
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1800
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.
1801
    def unlock(self):
1802
        if self._hashcache.needs_write and self._control_files._lock_count==1:
1803
            self._hashcache.write()
1804
        # reverse order of locking.
1805
        try:
1806
            return self._control_files.unlock()
1807
        finally:
1808
            self.branch.unlock()
1809
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1810
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1811
def get_conflicted_stem(path):
1812
    for suffix in CONFLICT_SUFFIXES:
1813
        if path.endswith(suffix):
1814
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1815
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1816
@deprecated_function(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1817
def is_control_file(filename):
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1818
    """See WorkingTree.is_control_filename(filename)."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1819
    ## FIXME: better check
1820
    filename = normpath(filename)
1821
    while filename != '':
1822
        head, tail = os.path.split(filename)
1823
        ## 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.
1824
        if tail == '.bzr':
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1825
            return True
1826
        if filename == head:
1827
            break
1828
        filename = head
1829
    return False
1830
1831
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1832
class WorkingTreeFormat(object):
1833
    """An encapsulation of the initialization and open routines for a format.
1834
1835
    Formats provide three things:
1836
     * An initialization routine,
1837
     * a format string,
1838
     * an open routine.
1839
1840
    Formats are placed in an dict by their format string for reference 
1841
    during workingtree opening. Its not required that these be instances, they
1842
    can be classes themselves with class methods - it simply depends on 
1843
    whether state is needed for a given format or not.
1844
1845
    Once a format is deprecated, just deprecate the initialize and open
1846
    methods on the format class. Do not deprecate the object, as the 
1847
    object will be created every time regardless.
1848
    """
1849
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1850
    _default_format = None
1851
    """The default format used for new trees."""
1852
1853
    _formats = {}
1854
    """The known formats."""
1855
1856
    @classmethod
1857
    def find_format(klass, a_bzrdir):
1858
        """Return the format for the working tree object in a_bzrdir."""
1859
        try:
1860
            transport = a_bzrdir.get_workingtree_transport(None)
1861
            format_string = transport.get("format").read()
1862
            return klass._formats[format_string]
1863
        except NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1864
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1865
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1866
            raise errors.UnknownFormatError(format=format_string)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1867
1868
    @classmethod
1869
    def get_default_format(klass):
1870
        """Return the current default format."""
1871
        return klass._default_format
1872
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1873
    def get_format_string(self):
1874
        """Return the ASCII format string that identifies this format."""
1875
        raise NotImplementedError(self.get_format_string)
1876
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1877
    def get_format_description(self):
1878
        """Return the short description for this format."""
1879
        raise NotImplementedError(self.get_format_description)
1880
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1881
    def is_supported(self):
1882
        """Is this format supported?
1883
1884
        Supported formats can be initialized and opened.
1885
        Unsupported formats may not support initialization or committing or 
1886
        some other features depending on the reason for not being supported.
1887
        """
1888
        return True
1889
1890
    @classmethod
1891
    def register_format(klass, format):
1892
        klass._formats[format.get_format_string()] = format
1893
1894
    @classmethod
1895
    def set_default_format(klass, format):
1896
        klass._default_format = format
1897
1898
    @classmethod
1899
    def unregister_format(klass, format):
1900
        assert klass._formats[format.get_format_string()] is format
1901
        del klass._formats[format.get_format_string()]
1902
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1903
1904
1905
class WorkingTreeFormat2(WorkingTreeFormat):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1906
    """The second working tree format. 
1907
1908
    This format modified the hash cache from the format 1 hash cache.
1909
    """
1910
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1911
    def get_format_description(self):
1912
        """See WorkingTreeFormat.get_format_description()."""
1913
        return "Working tree format 2"
1914
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
1915
    def stub_initialize_remote(self, control_files):
1916
        """As a special workaround create critical control files for a remote working tree
1917
        
1918
        This ensures that it can later be updated and dealt with locally,
1919
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
1920
        no working tree.  (See bug #43064).
1921
        """
1922
        sio = StringIO()
1923
        inv = Inventory()
1924
        bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1925
        sio.seek(0)
1926
        control_files.put('inventory', sio)
1927
1928
        control_files.put_utf8('pending-merges', '')
1929
        
1930
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1931
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1932
        """See WorkingTreeFormat.initialize()."""
1933
        if not isinstance(a_bzrdir.transport, LocalTransport):
1934
            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.
1935
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1936
        if revision_id is not None:
1937
            branch.lock_write()
1938
            try:
1939
                revision_history = branch.revision_history()
1940
                try:
1941
                    position = revision_history.index(revision_id)
1942
                except ValueError:
1943
                    raise errors.NoSuchRevision(branch, revision_id)
1944
                branch.set_revision_history(revision_history[:position + 1])
1945
            finally:
1946
                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.
1947
        revision = branch.last_revision()
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
1948
        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.
1949
        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.
1950
                         branch,
1951
                         inv,
1952
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1953
                         _format=self,
1954
                         _bzrdir=a_bzrdir)
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1955
        wt._write_inventory(inv)
1956
        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.
1957
        basis_tree = branch.repository.revision_tree(revision)
1958
        wt.set_parent_trees([(revision, basis_tree)])
1959
        build_tree(basis_tree, wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1960
        return wt
1961
1962
    def __init__(self):
1963
        super(WorkingTreeFormat2, self).__init__()
1964
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1965
1966
    def open(self, a_bzrdir, _found=False):
1967
        """Return the WorkingTree object for a_bzrdir
1968
1969
        _found is a private parameter, do not use it. It is used to indicate
1970
               if format probing has already been done.
1971
        """
1972
        if not _found:
1973
            # we are being called directly and must probe.
1974
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1975
        if not isinstance(a_bzrdir.transport, LocalTransport):
1976
            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.
1977
        return WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1978
                           _internal=True,
1979
                           _format=self,
1980
                           _bzrdir=a_bzrdir)
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1981
1982
1983
class WorkingTreeFormat3(WorkingTreeFormat):
1984
    """The second working tree format updated to record a format marker.
1985
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1986
    This format:
1987
        - exists within a metadir controlling .bzr
1988
        - includes an explicit version marker for the workingtree control
1989
          files, separate from the BzrDir format
1990
        - modifies the hash cache format
1991
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
1992
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1993
    """
1994
1995
    def get_format_string(self):
1996
        """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
1997
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1998
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1999
    def get_format_description(self):
2000
        """See WorkingTreeFormat.get_format_description()."""
2001
        return "Working tree format 3"
2002
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2003
    _lock_file_name = 'lock'
2004
    _lock_class = LockDir
2005
2006
    def _open_control_files(self, a_bzrdir):
2007
        transport = a_bzrdir.get_workingtree_transport(None)
2008
        return LockableFiles(transport, self._lock_file_name, 
2009
                             self._lock_class)
2010
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2011
    def initialize(self, a_bzrdir, revision_id=None):
2012
        """See WorkingTreeFormat.initialize().
2013
        
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2014
        revision_id allows creating a working tree at a different
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2015
        revision than the branch is at.
2016
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2017
        if not isinstance(a_bzrdir.transport, LocalTransport):
2018
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2019
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2020
        control_files = self._open_control_files(a_bzrdir)
2021
        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.
2022
        control_files.lock_write()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2023
        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.
2024
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
2025
        if revision_id is None:
2026
            revision_id = branch.last_revision()
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
2027
        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
2028
        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.
2029
                         branch,
2030
                         inv,
2031
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2032
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2033
                         _bzrdir=a_bzrdir,
2034
                         _control_files=control_files)
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
2035
        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.
2036
        try:
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
2037
            wt._write_inventory(inv)
2038
            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.
2039
            basis_tree = branch.repository.revision_tree(revision_id)
1551.8.20 by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION
2040
            if revision_id == bzrlib.revision.NULL_REVISION:
2041
                wt.set_parent_trees([])
2042
            else:
2043
                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.
2044
            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.
2045
        finally:
2046
            wt.unlock()
2047
            control_files.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2048
        return wt
2049
2050
    def __init__(self):
2051
        super(WorkingTreeFormat3, self).__init__()
2052
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
2053
2054
    def open(self, a_bzrdir, _found=False):
2055
        """Return the WorkingTree object for a_bzrdir
2056
2057
        _found is a private parameter, do not use it. It is used to indicate
2058
               if format probing has already been done.
2059
        """
2060
        if not _found:
2061
            # we are being called directly and must probe.
2062
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2063
        if not isinstance(a_bzrdir.transport, LocalTransport):
2064
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
2065
        return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
2066
2067
    def _open(self, a_bzrdir, control_files):
2068
        """Open the tree itself.
2069
        
2070
        :param a_bzrdir: the dir for the tree.
2071
        :param control_files: the control files for the tree.
2072
        """
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
2073
        return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
2074
                           _internal=True,
2075
                           _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
2076
                           _bzrdir=a_bzrdir,
2077
                           _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2078
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
2079
    def __str__(self):
2080
        return self.get_format_string()
2081
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2082
2083
# formats which have no format string are not discoverable
2084
# and not independently creatable, so are not registered.
2085
__default_format = WorkingTreeFormat3()
2086
WorkingTreeFormat.register_format(__default_format)
2087
WorkingTreeFormat.set_default_format(__default_format)
2088
_legacy_formats = [WorkingTreeFormat2(),
2089
                   ]
2090
2091
2092
class WorkingTreeTestProviderAdapter(object):
2093
    """A tool to generate a suite testing multiple workingtree formats at once.
2094
2095
    This is done by copying the test once for each transport and injecting
2096
    the transport_server, transport_readonly_server, and workingtree_format
2097
    classes into each copy. Each copy is also given a new id() to make it
2098
    easy to identify.
2099
    """
2100
2101
    def __init__(self, transport_server, transport_readonly_server, formats):
2102
        self._transport_server = transport_server
2103
        self._transport_readonly_server = transport_readonly_server
2104
        self._formats = formats
2105
    
1852.6.1 by Robert Collins
Start tree implementation tests.
2106
    def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
2107
        """Clone test for adaption."""
2108
        new_test = deepcopy(test)
2109
        new_test.transport_server = self._transport_server
2110
        new_test.transport_readonly_server = self._transport_readonly_server
2111
        new_test.bzrdir_format = bzrdir_format
2112
        new_test.workingtree_format = workingtree_format
2113
        def make_new_test_id():
2114
            new_id = "%s(%s)" % (test.id(), variation)
2115
            return lambda: new_id
2116
        new_test.id = make_new_test_id()
2117
        return new_test
2118
    
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2119
    def adapt(self, test):
2120
        from bzrlib.tests import TestSuite
2121
        result = TestSuite()
2122
        for workingtree_format, bzrdir_format in self._formats:
1852.6.1 by Robert Collins
Start tree implementation tests.
2123
            new_test = self._clone_test(
2124
                test,
2125
                bzrdir_format,
2126
                workingtree_format, workingtree_format.__class__.__name__)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
2127
            result.addTest(new_test)
2128
        return result