/brz/remove-bazaar

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