/brz/remove-bazaar

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