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