~bzr-pqm/bzr/bzr.dev

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):
325
        self._inventory = inv
326
        self.path2id = self._inventory.path2id
327
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
328
    def is_control_filename(self, filename):
1534.5.16 by Robert Collins
Review feedback.
329
        """True if filename is the name of a control file in this tree.
330
        
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
331
        :param filename: A filename within the tree. This is a relative path
332
        from the root of this tree.
333
1534.5.16 by Robert Collins
Review feedback.
334
        This is true IF and ONLY IF the filename is part of the meta data
335
        that bzr controls in this tree. I.E. a random .bzr directory placed
336
        on disk will not be a control file for this tree.
337
        """
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
338
        return self.bzrdir.is_control_filename(filename)
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
339
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
340
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
341
    def open(path=None, _unsupported=False):
342
        """Open an existing working tree at path.
343
344
        """
345
        if path is None:
346
            path = os.path.getcwdu()
347
        control = bzrdir.BzrDir.open(path, _unsupported)
348
        return control.open_workingtree(_unsupported)
349
        
350
    @staticmethod
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
351
    def open_containing(path=None):
352
        """Open an existing working tree which has its root about path.
353
        
354
        This probes for a working tree at path and searches upwards from there.
355
356
        Basically we keep looking up until we find the control directory or
357
        run into /.  If there isn't one, raises NotBranchError.
358
        TODO: give this a new exception.
359
        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
360
361
        :return: The WorkingTree that contains 'path', and the rest of path
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
362
        """
363
        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
364
            path = osutils.getcwd()
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
365
        control, relpath = bzrdir.BzrDir.open_containing(path)
1685.1.27 by John Arbash Meinel
BzrDir works in URLs, but WorkingTree works in unicode paths
366
1685.1.28 by John Arbash Meinel
Changing open_containing to always return a unicode path.
367
        return control.open_workingtree(), relpath
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
368
369
    @staticmethod
370
    def open_downlevel(path=None):
371
        """Open an unsupported working tree.
372
373
        Only intended for advanced situations like upgrading part of a bzrdir.
374
        """
375
        return WorkingTree.open(path, _unsupported=True)
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
376
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
377
    def __iter__(self):
378
        """Iterate through file_ids for this tree.
379
380
        file_ids are in a WorkingTree if they are in the working inventory
381
        and the working file exists.
382
        """
383
        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.
384
        for path, ie in inv.iter_entries():
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
385
            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.
386
                yield ie.file_id
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
387
453 by Martin Pool
- Split WorkingTree into its own file
388
    def __repr__(self):
389
        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
390
                               getattr(self, 'basedir', None))
453 by Martin Pool
- Split WorkingTree into its own file
391
392
    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 \
393
        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()
394
    
395
    def basis_tree(self):
396
        """Return RevisionTree for the current last revision."""
397
        revision_id = self.last_revision()
398
        if revision_id is not None:
399
            try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
400
                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()
401
                inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
402
            except NoSuchFile:
403
                inv = None
404
            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()
405
                return bzrlib.tree.RevisionTree(self.branch.repository, inv,
406
                                                revision_id)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
407
        # FIXME? RBC 20060403 should we cache the inventory here ?
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
408
        return self.branch.repository.revision_tree(revision_id)
453 by Martin Pool
- Split WorkingTree into its own file
409
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
410
    @staticmethod
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
411
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
412
    def create(branch, directory):
413
        """Create a workingtree for branch at directory.
414
415
        If existing_directory already exists it must have a .bzr directory.
416
        If it does not exist, it will be created.
417
418
        This returns a new WorkingTree object for the new checkout.
419
420
        TODO FIXME RBC 20060124 when we have checkout formats in place this
421
        should accept an optional revisionid to checkout [and reject this if
422
        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
423
424
        XXX: When BzrDir is present, these should be created through that 
425
        interface instead.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
426
        """
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
427
        warnings.warn('delete WorkingTree.create', stacklevel=3)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
428
        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.
429
        if branch.bzrdir.root_transport.base == transport.base:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
430
            # same dir 
431
            return branch.bzrdir.create_workingtree()
432
        # different directory, 
433
        # create a branch reference
434
        # and now a working tree.
435
        raise NotImplementedError
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
436
 
437
    @staticmethod
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
438
    @deprecated_method(zero_eight)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
439
    def create_standalone(directory):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
440
        """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.
441
442
        Directory must exist and be empty.
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
443
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
444
        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.
445
        """
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
446
        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.
447
1713.1.9 by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool).
448
    def relpath(self, path):
449
        """Return the local path portion from a given path.
450
        
451
        The path may be absolute or relative. If its a relative path it is 
452
        interpreted relative to the python current working directory.
453
        """
454
        return relpath(self.basedir, path)
1457.1.3 by Robert Collins
make Branch.relpath delegate to the working tree.
455
453 by Martin Pool
- Split WorkingTree into its own file
456
    def has_filename(self, filename):
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
457
        return osutils.lexists(self.abspath(filename))
453 by Martin Pool
- Split WorkingTree into its own file
458
459
    def get_file(self, file_id):
460
        return self.get_file_byname(self.id2path(file_id))
461
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
462
    def get_file_text(self, file_id):
463
        return self.get_file(file_id).read()
464
453 by Martin Pool
- Split WorkingTree into its own file
465
    def get_file_byname(self, filename):
466
        return file(self.abspath(filename), 'rb')
467
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
468
    def get_parent_ids(self):
469
        """See Tree.get_parent_ids.
470
        
471
        This implementation reads the pending merges list and last_revision
472
        value and uses that to decide what the parents list should be.
473
        """
474
        last_rev = self.last_revision()
475
        if last_rev is None:
476
            parents = []
477
        else:
478
            parents = [last_rev]
479
        other_parents = self.pending_merges()
480
        return parents + other_parents
481
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
482
    def get_root_id(self):
483
        """Return the id of this trees root"""
484
        inv = self.read_working_inventory()
485
        return inv.root.file_id
486
        
453 by Martin Pool
- Split WorkingTree into its own file
487
    def _get_store_filename(self, file_id):
1508.1.1 by Robert Collins
Provide a open_containing for WorkingTree.
488
        ## XXX: badly named; this is not in the store at all
453 by Martin Pool
- Split WorkingTree into its own file
489
        return self.abspath(self.id2path(file_id))
490
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
491
    @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.
492
    def clone(self, to_bzrdir, revision_id=None, basis=None):
493
        """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()
494
        
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.
495
        Specifically modified files are kept as modified, but
496
        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()
497
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.
498
        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()
499
500
        revision
501
            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.
502
            revision, and and difference between the source trees last revision
503
            and this one merged in.
504
505
        basis
506
            If not None, a closer copy of a tree which may have some files in
507
            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()
508
        """
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.
509
        # assumes the target bzr dir format is compatible.
510
        result = self._format.initialize(to_bzrdir)
511
        self.copy_content_into(result, revision_id)
512
        return result
513
514
    @needs_read_lock
515
    def copy_content_into(self, tree, revision_id=None):
516
        """Copy the current content and user files of this tree into tree."""
517
        if revision_id is None:
518
            transform_tree(tree, self)
519
        else:
520
            # TODO now merge from tree.last_revision to revision
521
            transform_tree(tree, self)
522
            tree.set_last_revision(revision_id)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
523
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
524
    @needs_write_lock
1593.1.1 by Robert Collins
Move responsibility for setting branch nickname in commits to the WorkingTree convenience function.
525
    def commit(self, message=None, revprops=None, *args, **kwargs):
526
        # avoid circular imports
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
527
        from bzrlib.commit import Commit
1593.1.1 by Robert Collins
Move responsibility for setting branch nickname in commits to the WorkingTree convenience function.
528
        if revprops is None:
529
            revprops = {}
530
        if not 'branch-nick' in revprops:
531
            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.
532
        # args for wt.commit start at message from the Commit.commit method,
533
        # but with branch a kwarg now, passing in args as is results in the
534
        #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.
535
        args = (DEPRECATED_PARAMETER, message, ) + args
1773.1.1 by Robert Collins
Teach WorkingTree.commit to return the committed revision id.
536
        committed_id = Commit().commit( working_tree=self, revprops=revprops,
537
            *args, **kwargs)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
538
        self._set_inventory(self.read_working_inventory())
1773.1.1 by Robert Collins
Teach WorkingTree.commit to return the committed revision id.
539
        return committed_id
1248 by Martin Pool
- new weave based cleanup [broken]
540
541
    def id2abspath(self, file_id):
542
        return self.abspath(self.id2path(file_id))
543
1185.12.39 by abentley
Propogated has_or_had_id to Tree
544
    def has_id(self, file_id):
453 by Martin Pool
- Split WorkingTree into its own file
545
        # files that have been deleted are excluded
1185.12.39 by abentley
Propogated has_or_had_id to Tree
546
        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.
547
        if not inv.has_id(file_id):
453 by Martin Pool
- Split WorkingTree into its own file
548
            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.
549
        path = inv.id2path(file_id)
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
550
        return osutils.lexists(self.abspath(path))
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
551
1185.12.39 by abentley
Propogated has_or_had_id to Tree
552
    def has_or_had_id(self, file_id):
553
        if file_id == self.inventory.root.file_id:
554
            return True
555
        return self.inventory.has_id(file_id)
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
556
557
    __contains__ = has_id
558
453 by Martin Pool
- Split WorkingTree into its own file
559
    def get_file_size(self, file_id):
1248 by Martin Pool
- new weave based cleanup [broken]
560
        return os.path.getsize(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
561
1185.60.6 by Aaron Bentley
Fixed hashcache
562
    @needs_read_lock
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
563
    def get_file_sha1(self, file_id, path=None):
564
        if not path:
565
            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.
566
        return self._hashcache.get_sha1(path)
453 by Martin Pool
- Split WorkingTree into its own file
567
1740.2.5 by Aaron Bentley
Merge from bzr.dev
568
    def get_file_mtime(self, file_id, path=None):
569
        if not path:
570
            path = self._inventory.id2path(file_id)
571
        return os.lstat(self.abspath(path)).st_mtime
572
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
573
    if not supports_executable():
574
        def is_executable(self, file_id, path=None):
1398 by Robert Collins
integrate in Gustavos x-bit patch
575
            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
576
    else:
577
        def is_executable(self, file_id, path=None):
578
            if not path:
579
                path = self._inventory.id2path(file_id)
1398 by Robert Collins
integrate in Gustavos x-bit patch
580
            mode = os.lstat(self.abspath(path)).st_mode
1733.1.4 by Robert Collins
Cosmetic niceties for debugging, extra comments etc.
581
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
1398 by Robert Collins
integrate in Gustavos x-bit patch
582
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
583
    @needs_write_lock
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
584
    def add(self, files, ids=None):
585
        """Make files versioned.
586
587
        Note that the command line normally calls smart_add instead,
588
        which can automatically recurse.
589
590
        This adds the files to the inventory, so that they will be
591
        recorded by the next commit.
592
593
        files
594
            List of paths to add, relative to the base of the tree.
595
596
        ids
597
            If set, use these instead of automatically generated ids.
598
            Must be the same length as the list of files, but may
599
            contain None for ids that are to be autogenerated.
600
601
        TODO: Perhaps have an option to add the ids even if the files do
602
              not (yet) exist.
603
604
        TODO: Perhaps callback with the ids and paths as they're added.
605
        """
606
        # TODO: Re-adding a file that is removed in the working copy
607
        # should probably put it back with the previous ID.
608
        if isinstance(files, basestring):
609
            assert(ids is None or isinstance(ids, basestring))
610
            files = [files]
611
            if ids is not None:
612
                ids = [ids]
613
614
        if ids is None:
615
            ids = [None] * len(files)
616
        else:
617
            assert(len(ids) == len(files))
618
619
        inv = self.read_working_inventory()
620
        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.
621
            if self.is_control_filename(f):
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
622
                raise errors.ForbiddenControlFileError(filename=f)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
623
624
            fp = splitpath(f)
625
626
            if len(fp) == 0:
627
                raise BzrError("cannot add top-level %r" % f)
628
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
629
            fullpath = normpath(self.abspath(f))
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
630
            try:
631
                kind = file_kind(fullpath)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
632
            except OSError, e:
633
                if e.errno == errno.ENOENT:
634
                    raise NoSuchFile(fullpath)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
635
            if not InventoryEntry.versionable_kind(kind):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
636
                raise errors.BadFileKindError(filename=f, kind=kind)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
637
            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'.
638
                inv.add_path(f, kind=kind)
639
            else:
640
                inv.add_path(f, kind=kind, file_id=file_id)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
641
642
        self._write_inventory(inv)
643
644
    @needs_write_lock
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
645
    def add_pending_merge(self, *revision_ids):
646
        # TODO: Perhaps should check at this point that the
647
        # history of the revision is actually present?
648
        p = self.pending_merges()
649
        updated = False
650
        for rev_id in revision_ids:
651
            if rev_id in p:
652
                continue
653
            p.append(rev_id)
654
            updated = True
655
        if updated:
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
656
            self.set_pending_merges(p)
1457.1.15 by Robert Collins
Move add_pending_merge to WorkingTree.
657
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
658
    @needs_read_lock
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
659
    def pending_merges(self):
660
        """Return a list of pending merges.
661
662
        These are revisions that have been merged into the working
663
        directory but not yet committed.
664
        """
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
665
        try:
1534.4.28 by Robert Collins
first cut at merge from integration.
666
            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.
667
        except NoSuchFile:
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
668
            return []
669
        p = []
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
670
        for l in merges_file.readlines():
1457.1.14 by Robert Collins
Move pending_merges() to WorkingTree.
671
            p.append(l.rstrip('\n'))
672
        return p
673
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
674
    @needs_write_lock
675
    def set_pending_merges(self, rev_list):
1534.4.28 by Robert Collins
first cut at merge from integration.
676
        self._control_files.put_utf8('pending-merges', '\n'.join(rev_list))
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
677
1534.7.192 by Aaron Bentley
Record hashes produced by merges
678
    @needs_write_lock
679
    def set_merge_modified(self, modified_hashes):
1534.10.3 by Aaron Bentley
Simplify set_merge_modified with rio_file
680
        def iter_stanzas():
681
            for file_id, hash in modified_hashes.iteritems():
682
                yield Stanza(file_id=file_id, hash=hash)
683
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
684
685
    @needs_write_lock
686
    def _put_rio(self, filename, stanzas, header):
687
        my_file = rio_file(stanzas, header)
688
        self._control_files.put(filename, my_file)
1534.7.192 by Aaron Bentley
Record hashes produced by merges
689
690
    @needs_read_lock
691
    def merge_modified(self):
692
        try:
693
            hashfile = self._control_files.get('merge-hashes')
694
        except NoSuchFile:
695
            return {}
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
696
        merge_hashes = {}
697
        try:
698
            if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
699
                raise MergeModifiedFormatError()
700
        except StopIteration:
701
            raise MergeModifiedFormatError()
702
        for s in RioReader(hashfile):
1534.7.198 by Aaron Bentley
Removed spurious encode/decode
703
            file_id = s.get("file_id")
1558.12.10 by Aaron Bentley
Be robust when merge_hash file_id not in inventory
704
            if file_id not in self.inventory:
705
                continue
1534.7.196 by Aaron Bentley
Switched to Rio format for merge-modified list
706
            hash = s.get("hash")
707
            if hash == self.get_file_sha1(file_id):
708
                merge_hashes[file_id] = hash
709
        return merge_hashes
1534.7.192 by Aaron Bentley
Record hashes produced by merges
710
1092.2.6 by Robert Collins
symlink support updated to work
711
    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
712
        return os.readlink(self.id2abspath(file_id))
453 by Martin Pool
- Split WorkingTree into its own file
713
714
    def file_class(self, filename):
715
        if self.path2id(filename):
716
            return 'V'
717
        elif self.is_ignored(filename):
718
            return 'I'
719
        else:
720
            return '?'
721
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
722
    def list_files(self):
1732.1.6 by John Arbash Meinel
Fix documentation bug in workingtree.list_files
723
        """Recursively list all files as (path, class, kind, id, entry).
453 by Martin Pool
- Split WorkingTree into its own file
724
725
        Lists, but does not descend into unversioned directories.
726
727
        This does not include files that have been deleted in this
728
        tree.
729
730
        Skips the control directory.
731
        """
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.
732
        inv = self._inventory
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
733
        # Convert these into local objects to save lookup times
1836.1.22 by John Arbash Meinel
[merge] bzr.dev 1861
734
        pathjoin = osutils.pathjoin
735
        file_kind = osutils.file_kind
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
736
737
        # transport.base ends in a slash, we want the piece
738
        # between the last two slashes
739
        transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
740
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
741
        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
742
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
743
        # directory file_id, relative path, absolute path, reverse sorted children
744
        children = os.listdir(self.basedir)
745
        children.sort()
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
746
        # jam 20060527 The kernel sized tree seems equivalent whether we 
747
        # use a deque and popleft to keep them sorted, or if we use a plain
748
        # 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.
749
        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
750
        stack = [(inv.root.file_id, u'', self.basedir, children)]
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
751
        while stack:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
752
            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
753
754
            while children:
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
755
                f = children.popleft()
453 by Martin Pool
- Split WorkingTree into its own file
756
                ## TODO: If we find a subdirectory with its own .bzr
757
                ## directory, then that is a separate tree and we
758
                ## should exclude it.
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
759
760
                # the bzrdir for this tree
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
761
                if transport_base_dir == f:
453 by Martin Pool
- Split WorkingTree into its own file
762
                    continue
763
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
764
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
765
                # 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
766
                # than the checks of pathjoin(), all relative paths will have an extra slash
767
                # at the beginning
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
768
                fp = from_dir_relpath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
769
770
                # absolute path
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
771
                fap = from_dir_abspath + '/' + f
453 by Martin Pool
- Split WorkingTree into its own file
772
                
773
                f_ie = inv.get_child(from_dir_id, f)
774
                if f_ie:
775
                    c = 'V'
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
776
                elif self.is_ignored(fp[1:]):
777
                    c = 'I'
453 by Martin Pool
- Split WorkingTree into its own file
778
                else:
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
779
                    # we may not have found this file, because of a unicode issue
780
                    f_norm, can_access = osutils.normalized_filename(f)
781
                    if f == f_norm or not can_access:
782
                        # No change, so treat this file normally
783
                        c = '?'
784
                    else:
785
                        # this file can be accessed by a normalized path
786
                        # check again if it is versioned
787
                        # these lines are repeated here for performance
788
                        f = f_norm
789
                        fp = from_dir_relpath + '/' + f
790
                        fap = from_dir_abspath + '/' + f
791
                        f_ie = inv.get_child(from_dir_id, f)
792
                        if f_ie:
793
                            c = 'V'
794
                        elif self.is_ignored(fp[1:]):
795
                            c = 'I'
796
                        else:
797
                            c = '?'
453 by Martin Pool
- Split WorkingTree into its own file
798
799
                fk = file_kind(fap)
800
801
                if f_ie:
802
                    if f_ie.kind != fk:
803
                        raise BzrCheckError("file %r entered as kind %r id %r, "
804
                                            "now of kind %r"
805
                                            % (fap, f_ie.kind, f_ie.file_id, fk))
806
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
807
                # make a last minute entry
808
                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
809
                    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
810
                else:
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
811
                    try:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
812
                        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
813
                    except KeyError:
1732.1.21 by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement
814
                        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.
815
                    continue
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
816
                
453 by Martin Pool
- Split WorkingTree into its own file
817
                if fk != 'directory':
818
                    continue
819
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
820
                # 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.
821
                new_children = os.listdir(fap)
822
                new_children.sort()
823
                new_children = collections.deque(new_children)
824
                stack.append((f_ie.file_id, fp, fap, new_children))
1732.1.9 by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files
825
                # Break out of inner loop, so that we start outer loop with child
826
                break
1732.1.22 by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory
827
            else:
828
                # 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.
829
                stack.pop()
1732.1.13 by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children.
830
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
831
832
    @needs_write_lock
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
833
    def move(self, from_paths, to_name):
834
        """Rename files.
835
836
        to_name must exist in the inventory.
837
838
        If to_name exists and is a directory, the files are moved into
839
        it, keeping their old names.  
840
841
        Note that to_name is only the last component of the new name;
842
        this doesn't change the directory.
843
844
        This returns a list of (from_path, to_path) pairs for each
845
        entry that is moved.
846
        """
847
        result = []
848
        ## TODO: Option to move IDs only
849
        assert not isinstance(from_paths, basestring)
850
        inv = self.inventory
851
        to_abs = self.abspath(to_name)
852
        if not isdir(to_abs):
853
            raise BzrError("destination %r is not a directory" % to_abs)
854
        if not self.has_filename(to_name):
855
            raise BzrError("destination %r not in working directory" % to_abs)
856
        to_dir_id = inv.path2id(to_name)
857
        if to_dir_id == None and to_name != '':
858
            raise BzrError("destination %r is not a versioned directory" % to_name)
859
        to_dir_ie = inv[to_dir_id]
860
        if to_dir_ie.kind not in ('directory', 'root_directory'):
861
            raise BzrError("destination %r is not a directory" % to_abs)
862
863
        to_idpath = inv.get_idpath(to_dir_id)
864
865
        for f in from_paths:
866
            if not self.has_filename(f):
867
                raise BzrError("%r does not exist in working tree" % f)
868
            f_id = inv.path2id(f)
869
            if f_id == None:
870
                raise BzrError("%r is not versioned" % f)
871
            name_tail = splitpath(f)[-1]
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
872
            dest_path = pathjoin(to_name, name_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
873
            if self.has_filename(dest_path):
874
                raise BzrError("destination %r already exists" % dest_path)
875
            if f_id in to_idpath:
876
                raise BzrError("can't move %r to a subdirectory of itself" % f)
877
878
        # OK, so there's a race here, it's possible that someone will
879
        # create a file in this interval and then the rename might be
880
        # left half-done.  But we should have caught most problems.
881
        orig_inv = deepcopy(self.inventory)
882
        try:
883
            for f in from_paths:
884
                name_tail = splitpath(f)[-1]
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
885
                dest_path = pathjoin(to_name, name_tail)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
886
                result.append((f, dest_path))
887
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
888
                try:
889
                    rename(self.abspath(f), self.abspath(dest_path))
890
                except OSError, e:
891
                    raise BzrError("failed to rename %r to %r: %s" %
892
                                   (f, dest_path, e[1]),
893
                            ["rename rolled back"])
894
        except:
895
            # restore the inventory on error
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
896
            self._set_inventory(orig_inv)
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
897
            raise
898
        self._write_inventory(inv)
899
        return result
900
901
    @needs_write_lock
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
902
    def rename_one(self, from_rel, to_rel):
903
        """Rename one file.
904
905
        This can change the directory or the filename or both.
906
        """
907
        inv = self.inventory
908
        if not self.has_filename(from_rel):
909
            raise BzrError("can't rename: old working file %r does not exist" % from_rel)
910
        if self.has_filename(to_rel):
911
            raise BzrError("can't rename: new working file %r already exists" % to_rel)
912
913
        file_id = inv.path2id(from_rel)
914
        if file_id == None:
915
            raise BzrError("can't rename: old name %r is not versioned" % from_rel)
916
917
        entry = inv[file_id]
918
        from_parent = entry.parent_id
919
        from_name = entry.name
920
        
921
        if inv.path2id(to_rel):
922
            raise BzrError("can't rename: new name %r is already versioned" % to_rel)
923
924
        to_dir, to_tail = os.path.split(to_rel)
925
        to_dir_id = inv.path2id(to_dir)
926
        if to_dir_id == None and to_dir != '':
927
            raise BzrError("can't determine destination directory id for %r" % to_dir)
928
929
        mutter("rename_one:")
930
        mutter("  file_id    {%s}" % file_id)
931
        mutter("  from_rel   %r" % from_rel)
932
        mutter("  to_rel     %r" % to_rel)
933
        mutter("  to_dir     %r" % to_dir)
934
        mutter("  to_dir_id  {%s}" % to_dir_id)
935
936
        inv.rename(file_id, to_dir_id, to_tail)
937
938
        from_abs = self.abspath(from_rel)
939
        to_abs = self.abspath(to_rel)
940
        try:
941
            rename(from_abs, to_abs)
942
        except OSError, e:
943
            inv.rename(file_id, from_parent, from_name)
944
            raise BzrError("failed to rename %r to %r: %s"
945
                    % (from_abs, to_abs, e[1]),
946
                    ["rename rolled back"])
947
        self._write_inventory(inv)
948
949
    @needs_read_lock
453 by Martin Pool
- Split WorkingTree into its own file
950
    def unknowns(self):
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
951
        """Return all unknown files.
952
953
        These are files in the working directory that are not versioned or
954
        control files or ignored.
955
        """
453 by Martin Pool
- Split WorkingTree into its own file
956
        for subp in self.extras():
957
            if not self.is_ignored(subp):
958
                yield subp
959
1534.10.16 by Aaron Bentley
Small tweaks
960
    @deprecated_method(zero_eight)
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
961
    def iter_conflicts(self):
1534.10.16 by Aaron Bentley
Small tweaks
962
        """List all files in the tree that have text or content conflicts.
1534.10.22 by Aaron Bentley
Got ConflictList implemented
963
        DEPRECATED.  Use conflicts instead."""
1534.10.10 by Aaron Bentley
Resolve uses the new stuff.
964
        return self._iter_conflicts()
965
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
966
    def _iter_conflicts(self):
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
967
        conflicted = set()
1732.1.11 by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down
968
        for info in self.list_files():
969
            path = info[0]
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
970
            stem = get_conflicted_stem(path)
971
            if stem is None:
972
                continue
973
            if stem not in conflicted:
974
                conflicted.add(stem)
975
                yield stem
453 by Martin Pool
- Split WorkingTree into its own file
976
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
977
    @needs_write_lock
1185.76.1 by Erik Bågfors
Support for --revision in pull
978
    def pull(self, source, overwrite=False, stop_revision=None):
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
979
        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().
980
        source.lock_read()
981
        try:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
982
            pp = ProgressPhase("Pull phase", 2, top_pb)
983
            pp.next_phase()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
984
            old_revision_history = self.branch.revision_history()
1563.1.4 by Robert Collins
Fix 'bzr pull' on metadir trees.
985
            basis_tree = self.basis_tree()
1534.4.54 by Robert Collins
Merge from integration.
986
            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().
987
            new_revision_history = self.branch.revision_history()
988
            if new_revision_history != old_revision_history:
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
989
                pp.next_phase()
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
990
                if len(old_revision_history):
991
                    other_revision = old_revision_history[-1]
992
                else:
993
                    other_revision = None
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
994
                repository = self.branch.repository
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
995
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
996
                try:
997
                    merge_inner(self.branch,
998
                                self.branch.basis_tree(),
999
                                basis_tree, 
1000
                                this_tree=self, 
1001
                                pb=pb)
1002
                finally:
1003
                    pb.finished()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1004
                self.set_last_revision(self.branch.last_revision())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1005
            return count
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1006
        finally:
1007
            source.unlock()
1551.2.36 by Aaron Bentley
Make pull update the progress bar more nicely
1008
            top_pb.finished()
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
1009
453 by Martin Pool
- Split WorkingTree into its own file
1010
    def extras(self):
1011
        """Yield all unknown files in this WorkingTree.
1012
1013
        If there are any unknown directories then only the directory is
1014
        returned, not all its children.  But if there are unknown files
1015
        under a versioned subdirectory, they are returned.
1016
1017
        Currently returned depth-first, sorted by name within directories.
1018
        """
1019
        ## TODO: Work from given directory downwards
1020
        for path, dir_entry in self.inventory.directories():
1711.2.101 by John Arbash Meinel
Clean up some unnecessary mutter() calls
1021
            # mutter("search for unknowns in %r", path)
453 by Martin Pool
- Split WorkingTree into its own file
1022
            dirabs = self.abspath(path)
1023
            if not isdir(dirabs):
1024
                # e.g. directory deleted
1025
                continue
1026
1027
            fl = []
1028
            for subf in os.listdir(dirabs):
1830.3.3 by John Arbash Meinel
inside workingtree check for normalized filename access
1029
                if subf == '.bzr':
1030
                    continue
1031
                if subf not in dir_entry.children:
1032
                    subf_norm, can_access = osutils.normalized_filename(subf)
1033
                    if subf_norm != subf and can_access:
1034
                        if subf_norm not in dir_entry.children:
1035
                            fl.append(subf_norm)
1036
                    else:
1037
                        fl.append(subf)
453 by Martin Pool
- Split WorkingTree into its own file
1038
            
1039
            fl.sort()
1040
            for subf in fl:
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
1041
                subp = pathjoin(path, subf)
453 by Martin Pool
- Split WorkingTree into its own file
1042
                yield subp
1043
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1044
    def _translate_ignore_rule(self, rule):
1045
        """Translate a single ignore rule to a regex.
1046
1713.2.7 by Robert Collins
Better description of ignore rule types from Martin.
1047
        There are two types of ignore rules.  Those that do not contain a / are
1048
        matched against the tail of the filename (that is, they do not care
1049
        what directory the file is in.)  Rules which do contain a slash must
1050
        match the entire path.  As a special case, './' at the start of the
1051
        string counts as a slash in the string but is removed before matching
1052
        (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.
1053
1054
        :return: The translated regex.
1055
        """
1056
        if rule[:2] in ('./', '.\\'):
1057
            # rootdir rule
1058
            result = fnmatch.translate(rule[2:])
1059
        elif '/' in rule or '\\' in rule:
1060
            # path prefix 
1061
            result = fnmatch.translate(rule)
1062
        else:
1063
            # default rule style.
1064
            result = "(?:.*/)?(?!.*/)" + fnmatch.translate(rule)
1065
        assert result[-1] == '$', "fnmatch.translate did not add the expected $"
1066
        return "(" + result + ")"
1067
1068
    def _combine_ignore_rules(self, rules):
1069
        """Combine a list of ignore rules into a single regex object.
1070
1071
        Each individual rule is combined with | to form a big regex, which then
1072
        has $ added to it to form something like ()|()|()$. The group index for
1073
        each subregex's outermost group is placed in a dictionary mapping back 
1074
        to the rule. This allows quick identification of the matching rule that
1075
        triggered a match.
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1076
        :return: a list of the compiled regex and the matching-group index 
1077
        dictionaries. We return a list because python complains if you try to 
1078
        combine more than 100 regexes.
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1079
        """
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1080
        result = []
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1081
        groups = {}
1082
        next_group = 0
1083
        translated_rules = []
1084
        for rule in rules:
1085
            translated_rule = self._translate_ignore_rule(rule)
1086
            compiled_rule = re.compile(translated_rule)
1087
            groups[next_group] = rule
1088
            next_group += compiled_rule.groups
1089
            translated_rules.append(translated_rule)
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1090
            if next_group == 99:
1091
                result.append((re.compile("|".join(translated_rules)), groups))
1092
                groups = {}
1093
                next_group = 0
1094
                translated_rules = []
1095
        if len(translated_rules):
1096
            result.append((re.compile("|".join(translated_rules)), groups))
1097
        return result
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1098
453 by Martin Pool
- Split WorkingTree into its own file
1099
    def ignored_files(self):
1100
        """Yield list of PATH, IGNORE_PATTERN"""
1101
        for subp in self.extras():
1102
            pat = self.is_ignored(subp)
1103
            if pat != None:
1104
                yield subp, pat
1105
1106
    def get_ignore_list(self):
1107
        """Return list of ignore patterns.
1108
1109
        Cached in the Tree object after the first call.
1110
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1111
        ignoreset = getattr(self, '_ignoreset', None)
1112
        if ignoreset is not None:
1113
            return ignoreset
1114
1115
        ignore_globs = set(bzrlib.DEFAULT_IGNORE)
1116
        ignore_globs.update(ignores.get_runtime_ignores())
1117
1118
        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
1119
453 by Martin Pool
- Split WorkingTree into its own file
1120
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1121
            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
1122
            try:
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1123
                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
1124
            finally:
1125
                f.close()
1126
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1127
        self._ignoreset = ignore_globs
1836.1.4 by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern
1128
        self._ignore_regex = self._combine_ignore_rules(ignore_globs)
1129
        return ignore_globs
453 by Martin Pool
- Split WorkingTree into its own file
1130
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
1131
    def _get_ignore_rules_as_regex(self):
1132
        """Return a regex of the ignore rules and a mapping dict.
1133
1134
        :return: (ignore rules compiled regex, dictionary mapping rule group 
1135
        indices to original rule.)
1136
        """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
1137
        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.
1138
            self.get_ignore_list()
1139
        return self._ignore_regex
1140
453 by Martin Pool
- Split WorkingTree into its own file
1141
    def is_ignored(self, filename):
1142
        r"""Check whether the filename matches an ignore pattern.
1143
1144
        Patterns containing '/' or '\' need to match the whole path;
1145
        others match against only the last component.
1146
1147
        If the file is ignored, returns the pattern which caused it to
1148
        be ignored, otherwise None.  So this can simply be used as a
1149
        boolean if desired."""
1150
1151
        # TODO: Use '**' to match directories, and other extended
1152
        # globbing stuff from cvs/rsync.
1153
1154
        # XXX: fnmatch is actually not quite what we want: it's only
1155
        # approximately the same as real Unix fnmatch, and doesn't
1156
        # treat dotfiles correctly and allows * to match /.
1157
        # Eventually it should be replaced with something more
1158
        # accurate.
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
1159
    
1160
        rules = self._get_ignore_rules_as_regex()
1161
        for regex, mapping in rules:
1162
            match = regex.match(filename)
1163
            if match is not None:
1164
                # one or more of the groups in mapping will have a non-None group 
1165
                # match.
1166
                groups = match.groups()
1167
                rules = [mapping[group] for group in 
1168
                    mapping if groups[group] is not None]
1169
                return rules[0]
1707.2.5 by Robert Collins
slightly improve add
1170
        return None
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1171
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
1172
    def kind(self, file_id):
1173
        return file_kind(self.id2abspath(file_id))
1174
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1175
    @needs_read_lock
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1176
    def last_revision(self):
1177
        """Return the last revision id of this working tree.
1178
1179
        In early branch formats this was == the branch last_revision,
1180
        but that cannot be relied upon - for working tree operations,
1181
        always use tree.last_revision().
1182
        """
1183
        return self.branch.last_revision()
1184
1694.2.6 by Martin Pool
[merge] bzr.dev
1185
    def is_locked(self):
1186
        return self._control_files.is_locked()
1187
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1188
    def lock_read(self):
1189
        """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.
1190
        self.branch.lock_read()
1191
        try:
1192
            return self._control_files.lock_read()
1193
        except:
1194
            self.branch.unlock()
1195
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1196
1197
    def lock_write(self):
1198
        """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.
1199
        self.branch.lock_write()
1200
        try:
1201
            return self._control_files.lock_write()
1202
        except:
1203
            self.branch.unlock()
1204
            raise
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1205
1694.2.6 by Martin Pool
[merge] bzr.dev
1206
    def get_physical_lock_status(self):
1207
        return self._control_files.get_physical_lock_status()
1208
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1209
    def _basis_inventory_name(self):
1210
        return 'basis-inventory'
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1211
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1212
    @needs_write_lock
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1213
    def set_last_revision(self, new_revision):
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1214
        """Change the last revision in the working tree."""
1215
        if self._change_last_revision(new_revision):
1216
            self._cache_basis_inventory(new_revision)
1217
1218
    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.
1219
        """Template method part of set_last_revision to perform the change.
1220
        
1221
        This is used to allow WorkingTree3 instances to not affect branch
1222
        when their last revision is set.
1223
        """
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1224
        if new_revision is None:
1225
            self.branch.set_revision_history([])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1226
            return False
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1227
        # current format is locked in with the branch
1228
        revision_history = self.branch.revision_history()
1229
        try:
1230
            position = revision_history.index(new_revision)
1231
        except ValueError:
1232
            raise errors.NoSuchRevision(self.branch, new_revision)
1233
        self.branch.set_revision_history(revision_history[:position + 1])
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1234
        return True
1235
1236
    def _cache_basis_inventory(self, new_revision):
1237
        """Cache new_revision as the basis inventory."""
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1238
        # TODO: this should allow the ready-to-use inventory to be passed in,
1239
        # as commit already has that ready-to-use [while the format is the
1240
        # same, that is].
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1241
        try:
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1242
            # this double handles the inventory - unpack and repack - 
1243
            # but is easier to understand. We can/should put a conditional
1244
            # in here based on whether the inventory is in the latest format
1245
            # - perhaps we should repack all inventories on a repository
1246
            # upgrade ?
1740.2.3 by Aaron Bentley
Only reserialize the working tree basis inventory when needed.
1247
            # the fast path is to copy the raw xml from the repository. If the
1248
            # xml contains 'revision_id="', then we assume the right 
1249
            # revision_id is set. We must check for this full string, because a
1250
            # root node id can legitimately look like 'revision_id' but cannot
1251
            # contain a '"'.
1252
            xml = self.branch.repository.get_inventory_xml(new_revision)
1253
            if not 'revision_id="' in xml.split('\n', 1)[0]:
1254
                inv = self.branch.repository.deserialise_inventory(
1255
                    new_revision, xml)
1256
                inv.revision_id = new_revision
1257
                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.
1258
            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.
1259
            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.
1260
            sio = StringIO(xml)
1261
            self._control_files.put(path, sio)
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1262
        except WeaveRevisionNotPresent:
1263
            pass
1264
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
1265
    def read_basis_inventory(self):
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1266
        """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.
1267
        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.
1268
        return self._control_files.get(path).read()
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1269
        
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1270
    @needs_read_lock
1271
    def read_working_inventory(self):
1272
        """Read the working inventory."""
1273
        # ElementTree does its own conversion from UTF-8, so open in
1274
        # binary.
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1275
        result = bzrlib.xml5.serializer_v5.read_inventory(
1534.4.28 by Robert Collins
first cut at merge from integration.
1276
            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()
1277
        self._set_inventory(result)
1278
        return result
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1279
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1280
    @needs_write_lock
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1281
    def remove(self, files, verbose=False, to_file=None):
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1282
        """Remove nominated files from the working inventory..
1283
1284
        This does not remove their text.  This does not run on XXX on what? RBC
1285
1286
        TODO: Refuse to remove modified files unless --force is given?
1287
1288
        TODO: Do something useful with directories.
1289
1290
        TODO: Should this remove the text or not?  Tough call; not
1291
        removing may be useful and the user can just use use rm, and
1292
        is the opposite of add.  Removing it is consistent with most
1293
        other tools.  Maybe an option.
1294
        """
1295
        ## TODO: Normalize names
1296
        ## TODO: Remove nested loops; better scalability
1297
        if isinstance(files, basestring):
1298
            files = [files]
1299
1300
        inv = self.inventory
1301
1302
        # do this before any modifications
1303
        for f in files:
1304
            fid = inv.path2id(f)
1305
            if not fid:
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
1306
                # TODO: Perhaps make this just a warning, and continue?
1307
                # This tends to happen when 
1308
                raise NotVersionedError(path=f)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1309
            if verbose:
1310
                # having remove it, it must be either ignored or unknown
1311
                if self.is_ignored(f):
1312
                    new_status = 'I'
1313
                else:
1314
                    new_status = '?'
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1315
                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.
1316
            del inv[fid]
1317
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1318
        self._write_inventory(inv)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1319
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1320
    @needs_write_lock
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1321
    def revert(self, filenames, old_tree=None, backups=True, 
1322
               pb=DummyProgress()):
1534.7.47 by Aaron Bentley
Started work on 'revert'
1323
        from transform import revert
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1324
        from conflicts import resolve
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1325
        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()
1326
            old_tree = self.basis_tree()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1327
        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.
1328
        if not len(filenames):
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
1329
            self.set_pending_merges([])
1534.10.14 by Aaron Bentley
Made revert clear conflicts
1330
            resolve(self)
1331
        else:
1534.10.15 by Aaron Bentley
Revert does resolve
1332
            resolve(self, filenames, ignore_misses=True)
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1333
        return conflicts
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1334
1658.1.3 by Martin Pool
Doc
1335
    # XXX: This method should be deprecated in favour of taking in a proper
1336
    # new Inventory object.
1501 by Robert Collins
Move revert from Branch to WorkingTree.
1337
    @needs_write_lock
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1338
    def set_inventory(self, new_inventory_list):
1339
        from bzrlib.inventory import (Inventory,
1340
                                      InventoryDirectory,
1341
                                      InventoryEntry,
1342
                                      InventoryFile,
1343
                                      InventoryLink)
1344
        inv = Inventory(self.get_root_id())
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1345
        for path, file_id, parent, kind in new_inventory_list:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1346
            name = os.path.basename(path)
1347
            if name == "":
1348
                continue
1349
            # fixme, there should be a factory function inv,add_?? 
1350
            if kind == 'directory':
1351
                inv.add(InventoryDirectory(file_id, name, parent))
1352
            elif kind == 'file':
1658.1.2 by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools
1353
                inv.add(InventoryFile(file_id, name, parent))
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1354
            elif kind == 'symlink':
1355
                inv.add(InventoryLink(file_id, name, parent))
1356
            else:
1357
                raise BzrError("unknown kind %r" % kind)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1358
        self._write_inventory(inv)
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1359
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1360
    @needs_write_lock
1361
    def set_root_id(self, file_id):
1362
        """Set the root id for this tree."""
1363
        inv = self.read_working_inventory()
1364
        orig_root_id = inv.root.file_id
1365
        del inv._byid[inv.root.file_id]
1366
        inv.root.file_id = file_id
1367
        inv._byid[inv.root.file_id] = inv.root
1368
        for fid in inv:
1369
            entry = inv[fid]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1370
            if entry.parent_id == orig_root_id:
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1371
                entry.parent_id = inv.root.file_id
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1372
        self._write_inventory(inv)
1457.1.10 by Robert Collins
Move set_root_id to WorkingTree.
1373
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1374
    def unlock(self):
1375
        """See Branch.unlock.
1376
        
1377
        WorkingTree locking just uses the Branch locking facilities.
1378
        This is current because all working trees have an embedded branch
1379
        within them. IF in the future, we were to make branch data shareable
1380
        between multiple working trees, i.e. via shared storage, then we 
1381
        would probably want to lock both the local tree, and the branch.
1382
        """
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.
1383
        raise NotImplementedError(self.unlock)
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
1384
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1385
    @needs_write_lock
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1386
    def update(self):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1387
        """Update a working tree along its branch.
1388
1389
        This will update the branch if its bound too, which means we have multiple trees involved:
1390
        The new basis tree of the master.
1391
        The old basis tree of the branch.
1392
        The old basis tree of the working tree.
1393
        The current working tree state.
1394
        pathologically all three may be different, and non ancestors of each other.
1395
        Conceptually we want to:
1396
        Preserve the wt.basis->wt.state changes
1397
        Transform the wt.basis to the new master basis.
1398
        Apply a merge of the old branch basis to get any 'local' changes from it into the tree.
1399
        Restore the wt.basis->wt.state changes.
1400
1401
        There isn't a single operation at the moment to do that, so we:
1402
        Merge current state -> basis tree of the master w.r.t. the old tree basis.
1403
        Do a 'normal' merge of the old branch basis if it is relevant.
1404
        """
1587.1.10 by Robert Collins
update updates working tree and branch together.
1405
        old_tip = self.branch.update()
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1406
        if old_tip is not None:
1407
            self.add_pending_merge(old_tip)
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1408
        self.branch.lock_read()
1409
        try:
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1410
            result = 0
1411
            if self.last_revision() != self.branch.last_revision():
1412
                # merge tree state up to new branch tip.
1413
                basis = self.basis_tree()
1414
                to_tree = self.branch.basis_tree()
1415
                result += merge_inner(self.branch,
1416
                                      to_tree,
1417
                                      basis,
1418
                                      this_tree=self)
1419
                self.set_last_revision(self.branch.last_revision())
1420
            if old_tip and old_tip != self.last_revision():
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1421
                # our last revision was not the prior branch last revision
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1422
                # and we have converted that last revision to a pending merge.
1423
                # base is somewhere between the branch tip now
1424
                # and the now pending merge
1425
                from bzrlib.revision import common_ancestor
1426
                try:
1427
                    base_rev_id = common_ancestor(self.branch.last_revision(),
1428
                                                  old_tip,
1429
                                                  self.branch.repository)
1430
                except errors.NoCommonAncestor:
1431
                    base_rev_id = None
1432
                base_tree = self.branch.repository.revision_tree(base_rev_id)
1433
                other_tree = self.branch.repository.revision_tree(old_tip)
1434
                result += merge_inner(self.branch,
1435
                                      other_tree,
1436
                                      base_tree,
1437
                                      this_tree=self)
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1438
            return result
1439
        finally:
1440
            self.branch.unlock()
1441
1442
    @needs_write_lock
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1443
    def _write_inventory(self, inv):
1444
        """Write inventory as the current inventory."""
1445
        sio = StringIO()
1446
        bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1447
        sio.seek(0)
1534.4.28 by Robert Collins
first cut at merge from integration.
1448
        self._control_files.put('inventory', sio)
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
1449
        self._set_inventory(inv)
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1450
        mutter('wrote working inventory')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1451
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1452
    def set_conflicts(self, arg):
1453
        raise UnsupportedOperation(self.set_conflicts, self)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1454
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1455
    def add_conflicts(self, arg):
1456
        raise UnsupportedOperation(self.add_conflicts, self)
1457
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1458
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1459
    def conflicts(self):
1460
        conflicts = ConflictList()
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
1461
        for conflicted in self._iter_conflicts():
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1462
            text = True
1463
            try:
1464
                if file_kind(self.abspath(conflicted)) != "file":
1465
                    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.
1466
            except errors.NoSuchFile:
1467
                text = False
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1468
            if text is True:
1469
                for suffix in ('.THIS', '.OTHER'):
1470
                    try:
1471
                        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.
1472
                        if kind != "file":
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1473
                            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.
1474
                    except errors.NoSuchFile:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1475
                        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.
1476
                    if text == False:
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
1477
                        break
1478
            ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1479
            conflicts.append(Conflict.factory(ctype, path=conflicted,
1480
                             file_id=self.path2id(conflicted)))
1481
        return conflicts
1482
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1483
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.
1484
class WorkingTree2(WorkingTree):
1485
    """This is the Format 2 working tree.
1486
1487
    This was the first weave based working tree. 
1488
     - uses os locks for locking.
1489
     - uses the branch last-revision.
1490
    """
1491
1492
    def unlock(self):
1493
        # we share control files:
1494
        if self._hashcache.needs_write and self._control_files._lock_count==3:
1495
            self._hashcache.write()
1496
        # reverse order of locking.
1497
        try:
1498
            return self._control_files.unlock()
1499
        finally:
1500
            self.branch.unlock()
1501
1502
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1503
class WorkingTree3(WorkingTree):
1504
    """This is the Format 3 working tree.
1505
1506
    This differs from the base WorkingTree by:
1507
     - having its own file lock
1508
     - having its own last-revision property.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1509
1510
    This is new in bzr 0.8
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1511
    """
1512
1513
    @needs_read_lock
1514
    def last_revision(self):
1515
        """See WorkingTree.last_revision."""
1516
        try:
1517
            return self._control_files.get_utf8('last-revision').read()
1518
        except NoSuchFile:
1519
            return None
1520
1521
    def _change_last_revision(self, revision_id):
1522
        """See WorkingTree._change_last_revision."""
1523
        if revision_id is None or revision_id == NULL_REVISION:
1524
            try:
1525
                self._control_files._transport.delete('last-revision')
1526
            except errors.NoSuchFile:
1527
                pass
1528
            return False
1529
        else:
1530
            try:
1531
                self.branch.revision_history().index(revision_id)
1532
            except ValueError:
1533
                raise errors.NoSuchRevision(self.branch, revision_id)
1534
            self._control_files.put_utf8('last-revision', revision_id)
1535
            return True
1536
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1537
    @needs_write_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1538
    def set_conflicts(self, conflicts):
1539
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1534.10.21 by Aaron Bentley
Moved and renamed conflict functions
1540
                      CONFLICT_HEADER_1)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1541
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
1542
    @needs_write_lock
1543
    def add_conflicts(self, new_conflicts):
1544
        conflict_set = set(self.conflicts())
1545
        conflict_set.update(set(list(new_conflicts)))
1546
        self.set_conflicts(ConflictList(sorted(conflict_set,
1547
                                               key=Conflict.sort_key)))
1548
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1549
    @needs_read_lock
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1550
    def conflicts(self):
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1551
        try:
1552
            confile = self._control_files.get('conflicts')
1553
        except NoSuchFile:
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1554
            return ConflictList()
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1555
        try:
1556
            if confile.next() != CONFLICT_HEADER_1 + '\n':
1557
                raise ConflictFormatError()
1558
        except StopIteration:
1559
            raise ConflictFormatError()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
1560
        return ConflictList.from_stanzas(RioReader(confile))
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1561
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.
1562
    def unlock(self):
1563
        if self._hashcache.needs_write and self._control_files._lock_count==1:
1564
            self._hashcache.write()
1565
        # reverse order of locking.
1566
        try:
1567
            return self._control_files.unlock()
1568
        finally:
1569
            self.branch.unlock()
1570
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
1571
1185.14.6 by Aaron Bentley
Made iter_conflicts a WorkingTree method
1572
def get_conflicted_stem(path):
1573
    for suffix in CONFLICT_SUFFIXES:
1574
        if path.endswith(suffix):
1575
            return path[:-len(suffix)]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1576
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1577
@deprecated_function(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1578
def is_control_file(filename):
1534.5.5 by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test.
1579
    """See WorkingTree.is_control_filename(filename)."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1580
    ## FIXME: better check
1581
    filename = normpath(filename)
1582
    while filename != '':
1583
        head, tail = os.path.split(filename)
1584
        ## 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.
1585
        if tail == '.bzr':
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1586
            return True
1587
        if filename == head:
1588
            break
1589
        filename = head
1590
    return False
1591
1592
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1593
class WorkingTreeFormat(object):
1594
    """An encapsulation of the initialization and open routines for a format.
1595
1596
    Formats provide three things:
1597
     * An initialization routine,
1598
     * a format string,
1599
     * an open routine.
1600
1601
    Formats are placed in an dict by their format string for reference 
1602
    during workingtree opening. Its not required that these be instances, they
1603
    can be classes themselves with class methods - it simply depends on 
1604
    whether state is needed for a given format or not.
1605
1606
    Once a format is deprecated, just deprecate the initialize and open
1607
    methods on the format class. Do not deprecate the object, as the 
1608
    object will be created every time regardless.
1609
    """
1610
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1611
    _default_format = None
1612
    """The default format used for new trees."""
1613
1614
    _formats = {}
1615
    """The known formats."""
1616
1617
    @classmethod
1618
    def find_format(klass, a_bzrdir):
1619
        """Return the format for the working tree object in a_bzrdir."""
1620
        try:
1621
            transport = a_bzrdir.get_workingtree_transport(None)
1622
            format_string = transport.get("format").read()
1623
            return klass._formats[format_string]
1624
        except NoSuchFile:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1625
            raise errors.NoWorkingTree(base=transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1626
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
1627
            raise errors.UnknownFormatError(format=format_string)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1628
1629
    @classmethod
1630
    def get_default_format(klass):
1631
        """Return the current default format."""
1632
        return klass._default_format
1633
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1634
    def get_format_string(self):
1635
        """Return the ASCII format string that identifies this format."""
1636
        raise NotImplementedError(self.get_format_string)
1637
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1638
    def get_format_description(self):
1639
        """Return the short description for this format."""
1640
        raise NotImplementedError(self.get_format_description)
1641
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1642
    def is_supported(self):
1643
        """Is this format supported?
1644
1645
        Supported formats can be initialized and opened.
1646
        Unsupported formats may not support initialization or committing or 
1647
        some other features depending on the reason for not being supported.
1648
        """
1649
        return True
1650
1651
    @classmethod
1652
    def register_format(klass, format):
1653
        klass._formats[format.get_format_string()] = format
1654
1655
    @classmethod
1656
    def set_default_format(klass, format):
1657
        klass._default_format = format
1658
1659
    @classmethod
1660
    def unregister_format(klass, format):
1661
        assert klass._formats[format.get_format_string()] is format
1662
        del klass._formats[format.get_format_string()]
1663
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1664
1665
1666
class WorkingTreeFormat2(WorkingTreeFormat):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1667
    """The second working tree format. 
1668
1669
    This format modified the hash cache from the format 1 hash cache.
1670
    """
1671
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1672
    def get_format_description(self):
1673
        """See WorkingTreeFormat.get_format_description()."""
1674
        return "Working tree format 2"
1675
1692.7.9 by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064)
1676
    def stub_initialize_remote(self, control_files):
1677
        """As a special workaround create critical control files for a remote working tree
1678
        
1679
        This ensures that it can later be updated and dealt with locally,
1680
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
1681
        no working tree.  (See bug #43064).
1682
        """
1683
        sio = StringIO()
1684
        inv = Inventory()
1685
        bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
1686
        sio.seek(0)
1687
        control_files.put('inventory', sio)
1688
1689
        control_files.put_utf8('pending-merges', '')
1690
        
1691
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1692
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1693
        """See WorkingTreeFormat.initialize()."""
1694
        if not isinstance(a_bzrdir.transport, LocalTransport):
1695
            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.
1696
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1697
        if revision_id is not None:
1698
            branch.lock_write()
1699
            try:
1700
                revision_history = branch.revision_history()
1701
                try:
1702
                    position = revision_history.index(revision_id)
1703
                except ValueError:
1704
                    raise errors.NoSuchRevision(branch, revision_id)
1705
                branch.set_revision_history(revision_history[:position + 1])
1706
            finally:
1707
                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.
1708
        revision = branch.last_revision()
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
1709
        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.
1710
        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.
1711
                         branch,
1712
                         inv,
1713
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1714
                         _format=self,
1715
                         _bzrdir=a_bzrdir)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1716
        wt._write_inventory(inv)
1717
        wt.set_root_id(inv.root.file_id)
1718
        wt.set_last_revision(revision)
1719
        wt.set_pending_merges([])
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
1720
        build_tree(wt.basis_tree(), wt)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1721
        return wt
1722
1723
    def __init__(self):
1724
        super(WorkingTreeFormat2, self).__init__()
1725
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
1726
1727
    def open(self, a_bzrdir, _found=False):
1728
        """Return the WorkingTree object for a_bzrdir
1729
1730
        _found is a private parameter, do not use it. It is used to indicate
1731
               if format probing has already been done.
1732
        """
1733
        if not _found:
1734
            # we are being called directly and must probe.
1735
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1736
        if not isinstance(a_bzrdir.transport, LocalTransport):
1737
            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.
1738
        return WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1739
                           _internal=True,
1740
                           _format=self,
1741
                           _bzrdir=a_bzrdir)
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1742
1743
1744
class WorkingTreeFormat3(WorkingTreeFormat):
1745
    """The second working tree format updated to record a format marker.
1746
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1747
    This format:
1748
        - exists within a metadir controlling .bzr
1749
        - includes an explicit version marker for the workingtree control
1750
          files, separate from the BzrDir format
1751
        - modifies the hash cache format
1752
        - is new in bzr 0.8
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
1753
        - uses a LockDir to guard access for writes.
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1754
    """
1755
1756
    def get_format_string(self):
1757
        """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
1758
        return "Bazaar-NG Working Tree format 3"
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1759
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1760
    def get_format_description(self):
1761
        """See WorkingTreeFormat.get_format_description()."""
1762
        return "Working tree format 3"
1763
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1764
    _lock_file_name = 'lock'
1765
    _lock_class = LockDir
1766
1767
    def _open_control_files(self, a_bzrdir):
1768
        transport = a_bzrdir.get_workingtree_transport(None)
1769
        return LockableFiles(transport, self._lock_file_name, 
1770
                             self._lock_class)
1771
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1772
    def initialize(self, a_bzrdir, revision_id=None):
1773
        """See WorkingTreeFormat.initialize().
1774
        
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1775
        revision_id allows creating a working tree at a different
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1776
        revision than the branch is at.
1777
        """
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1778
        if not isinstance(a_bzrdir.transport, LocalTransport):
1779
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1780
        transport = a_bzrdir.get_workingtree_transport(self)
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1781
        control_files = self._open_control_files(a_bzrdir)
1782
        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.
1783
        control_files.lock_write()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1784
        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.
1785
        branch = a_bzrdir.open_branch()
1508.1.21 by Robert Collins
Implement -r limit for checkout command.
1786
        if revision_id is None:
1787
            revision_id = branch.last_revision()
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
1788
        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
1789
        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.
1790
                         branch,
1791
                         inv,
1792
                         _internal=True,
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1793
                         _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1794
                         _bzrdir=a_bzrdir,
1795
                         _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.
1796
        wt.lock_write()
1797
        try:
1798
            wt._write_inventory(inv)
1799
            wt.set_root_id(inv.root.file_id)
1800
            wt.set_last_revision(revision_id)
1801
            wt.set_pending_merges([])
1802
            build_tree(wt.basis_tree(), wt)
1803
        finally:
1804
            wt.unlock()
1805
            control_files.unlock()
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1806
        return wt
1807
1808
    def __init__(self):
1809
        super(WorkingTreeFormat3, self).__init__()
1810
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1534.4.45 by Robert Collins
Start WorkingTree -> .bzr/checkout transition
1811
1812
    def open(self, a_bzrdir, _found=False):
1813
        """Return the WorkingTree object for a_bzrdir
1814
1815
        _found is a private parameter, do not use it. It is used to indicate
1816
               if format probing has already been done.
1817
        """
1818
        if not _found:
1819
            # we are being called directly and must probe.
1820
            raise NotImplementedError
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1821
        if not isinstance(a_bzrdir.transport, LocalTransport):
1822
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1852.3.1 by Robert Collins
Trivial cleanups to workingtree.py
1823
        return self._open(a_bzrdir, self._open_control_files(a_bzrdir))
1824
1825
    def _open(self, a_bzrdir, control_files):
1826
        """Open the tree itself.
1827
        
1828
        :param a_bzrdir: the dir for the tree.
1829
        :param control_files: the control files for the tree.
1830
        """
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
1831
        return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'),
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
1832
                           _internal=True,
1833
                           _format=self,
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1834
                           _bzrdir=a_bzrdir,
1835
                           _control_files=control_files)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1836
1534.5.1 by Robert Collins
Give info some reasonable output and tests.
1837
    def __str__(self):
1838
        return self.get_format_string()
1839
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1840
1841
# formats which have no format string are not discoverable
1842
# and not independently creatable, so are not registered.
1843
__default_format = WorkingTreeFormat3()
1844
WorkingTreeFormat.register_format(__default_format)
1845
WorkingTreeFormat.set_default_format(__default_format)
1846
_legacy_formats = [WorkingTreeFormat2(),
1847
                   ]
1848
1849
1850
class WorkingTreeTestProviderAdapter(object):
1851
    """A tool to generate a suite testing multiple workingtree formats at once.
1852
1853
    This is done by copying the test once for each transport and injecting
1854
    the transport_server, transport_readonly_server, and workingtree_format
1855
    classes into each copy. Each copy is also given a new id() to make it
1856
    easy to identify.
1857
    """
1858
1859
    def __init__(self, transport_server, transport_readonly_server, formats):
1860
        self._transport_server = transport_server
1861
        self._transport_readonly_server = transport_readonly_server
1862
        self._formats = formats
1863
    
1852.6.1 by Robert Collins
Start tree implementation tests.
1864
    def _clone_test(self, test, bzrdir_format, workingtree_format, variation):
1865
        """Clone test for adaption."""
1866
        new_test = deepcopy(test)
1867
        new_test.transport_server = self._transport_server
1868
        new_test.transport_readonly_server = self._transport_readonly_server
1869
        new_test.bzrdir_format = bzrdir_format
1870
        new_test.workingtree_format = workingtree_format
1871
        def make_new_test_id():
1872
            new_id = "%s(%s)" % (test.id(), variation)
1873
            return lambda: new_id
1874
        new_test.id = make_new_test_id()
1875
        return new_test
1876
    
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1877
    def adapt(self, test):
1878
        from bzrlib.tests import TestSuite
1879
        result = TestSuite()
1880
        for workingtree_format, bzrdir_format in self._formats:
1852.6.1 by Robert Collins
Start tree implementation tests.
1881
            new_test = self._clone_test(
1882
                test,
1883
                bzrdir_format,
1884
                workingtree_format, workingtree_format.__class__.__name__)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1885
            result.addTest(new_test)
1886
        return result