/brz/remove-bazaar

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