/brz/remove-bazaar

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