bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2255.7.83
by John Arbash Meinel
 Update some obvious copyright headers to include 2007.  | 
1  | 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 | 
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
2  | 
#
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
7  | 
#
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
8  | 
# This program is distributed in the hope that it will be useful,
 | 
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
12  | 
#
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
13  | 
# You should have received a copy of the GNU General Public License
 | 
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
17  | 
"""WorkingTree object and friends.
 | 
18  | 
||
19  | 
A WorkingTree represents the editable working copy of a branch.
 | 
|
20  | 
Operations which represent the WorkingTree are also done here, 
 | 
|
21  | 
such as renaming or adding files.  The WorkingTree has an inventory 
 | 
|
22  | 
which is updated by these operations.  A commit produces a 
 | 
|
23  | 
new revision based on the workingtree and its inventory.
 | 
|
24  | 
||
25  | 
At the moment every WorkingTree has its own branch.  Remote
 | 
|
26  | 
WorkingTrees aren't supported.
 | 
|
27  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
28  | 
To get a WorkingTree, call bzrdir.open_workingtree() or
 | 
29  | 
WorkingTree.open(dir).
 | 
|
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
30  | 
"""
 | 
31  | 
||
32  | 
# TODO: Give the workingtree sole responsibility for the working inventory;
 | 
|
33  | 
# remove the variable and references to it from the branch.  This may require
 | 
|
34  | 
# updating the commit code so as to update the inventory within the working
 | 
|
35  | 
# 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  | 
36  | 
# At the moment they may alias the inventory and have old copies of it in
 | 
37  | 
# memory.  (Now done? -- mbp 20060309)
 | 
|
| 
956
by Martin Pool
 doc  | 
38  | 
|
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
39  | 
from cStringIO import StringIO  | 
40  | 
import os  | 
|
| 
2423.2.1
by Alexander Belchenko
 Fix for walkdirs in missing dir with Py2.4 @ win32  | 
41  | 
import sys  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
42  | 
|
43  | 
from bzrlib.lazy_import import lazy_import  | 
|
44  | 
lazy_import(globals(), """  | 
|
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
45  | 
from bisect import bisect_left
 | 
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
46  | 
import collections
 | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
47  | 
import errno
 | 
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
48  | 
import itertools
 | 
49  | 
import operator
 | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
50  | 
import stat
 | 
| 
1713.1.6
by Robert Collins
 Move file id random data selection out of the inner loop for 'bzr add'.  | 
51  | 
from time import time
 | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
52  | 
import warnings
 | 
| 
2120.7.5
by Aaron Bentley
 Merge bzr.dev  | 
53  | 
import re
 | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
54  | 
|
| 
1836.1.21
by John Arbash Meinel
 Restore the ability to ignore items by modifying DEFAULT_IGNORE  | 
55  | 
import bzrlib
 | 
| 
1731.2.17
by Aaron Bentley
 Support extracting with checkouts  | 
56  | 
from bzrlib import (
 | 
57  | 
    branch,
 | 
|
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
58  | 
    bzrdir,
 | 
59  | 
    conflicts as _mod_conflicts,
 | 
|
| 
1852.13.23
by Robert Collins
 Merge up.  | 
60  | 
    dirstate,
 | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
61  | 
    errors,
 | 
| 
2116.4.1
by John Arbash Meinel
 Update file and revision id generators.  | 
62  | 
    generate_ids,
 | 
| 
2135.2.7
by Kent Gibson
 Implement JAM's review suggestions.  | 
63  | 
    globbing,
 | 
| 
2201.1.1
by John Arbash Meinel
 Fix bug #76299 by ignoring write errors during readonly hashcache write.  | 
64  | 
    hashcache,
 | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
65  | 
    ignores,
 | 
66  | 
    merge,
 | 
|
67  | 
    osutils,
 | 
|
| 
2598.5.1
by Aaron Bentley
 Start eliminating the use of None to indicate null revision  | 
68  | 
    revision as _mod_revision,
 | 
| 
1908.11.5
by John Arbash Meinel
 [merge] bzr.dev 2240  | 
69  | 
    revisiontree,
 | 
| 
1731.2.17
by Aaron Bentley
 Support extracting with checkouts  | 
70  | 
    repository,
 | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
71  | 
    textui,
 | 
| 
2323.6.1
by Martin Pool
 (broken) Give a message when opening old workingtree formats suggesting upgrade  | 
72  | 
    trace,
 | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
73  | 
    transform,
 | 
| 
2323.6.2
by Martin Pool
 Move responsibility for suggesting upgrades to ui object  | 
74  | 
    ui,
 | 
| 
1986.5.2
by Robert Collins
 ``WorkingTree.set_root_id(None)`` is now deprecated. Please  | 
75  | 
    urlutils,
 | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
76  | 
    xml5,
 | 
| 
1996.3.20
by John Arbash Meinel
 [merge] bzr.dev 2063  | 
77  | 
    xml6,
 | 
| 
2100.3.10
by Aaron Bentley
 Ensure added references are serialized properly, beef up Workingtreee3  | 
78  | 
    xml7,
 | 
| 
1731.2.17
by Aaron Bentley
 Support extracting with checkouts  | 
79  | 
    )
 | 
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
80  | 
import bzrlib.branch
 | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
81  | 
from bzrlib.transport import get_transport
 | 
82  | 
import bzrlib.ui
 | 
|
| 
2255.2.3
by Robert Collins
 Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.  | 
83  | 
from bzrlib.workingtree_4 import WorkingTreeFormat4
 | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
84  | 
""")  | 
85  | 
||
| 
1986.5.6
by Robert Collins
 Merge bzr.dev.  | 
86  | 
from bzrlib import symbol_versioning  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
87  | 
from bzrlib.decorators import needs_read_lock, needs_write_lock  | 
| 
2100.3.8
by Aaron Bentley
 Add add_reference  | 
88  | 
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference  | 
| 
1553.5.63
by Martin Pool
 Lock type is now mandatory for LockableFiles constructor  | 
89  | 
from bzrlib.lockable_files import LockableFiles, TransportLock  | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
90  | 
from bzrlib.lockdir import LockDir  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
91  | 
import bzrlib.mutabletree  | 
| 
1986.1.8
by Robert Collins
 Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.  | 
92  | 
from bzrlib.mutabletree import needs_tree_write_lock  | 
| 
1587.1.14
by Robert Collins
 Make bound branch creation happen via 'checkout'  | 
93  | 
from bzrlib.osutils import (  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
94  | 
compact_date,  | 
95  | 
file_kind,  | 
|
96  | 
isdir,  | 
|
| 
2206.1.8
by Marius Kruger
 Converted move/rename error messages to show source => target.  | 
97  | 
normpath,  | 
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
98  | 
pathjoin,  | 
99  | 
rand_chars,  | 
|
| 
2206.1.8
by Marius Kruger
 Converted move/rename error messages to show source => target.  | 
100  | 
realpath,  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
101  | 
safe_unicode,  | 
102  | 
splitpath,  | 
|
103  | 
supports_executable,  | 
|
104  | 
    )
 | 
|
105  | 
from bzrlib.trace import mutter, note  | 
|
106  | 
from bzrlib.transport.local import LocalTransport  | 
|
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
107  | 
from bzrlib.progress import DummyProgress, ProgressPhase  | 
| 
1551.9.16
by Aaron Bentley
 Implement Tree.annotate_iter for RevisionTree and WorkingTree  | 
108  | 
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION  | 
| 
1534.10.3
by Aaron Bentley
 Simplify set_merge_modified with rio_file  | 
109  | 
from bzrlib.rio import RioReader, rio_file, Stanza  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
110  | 
from bzrlib.symbol_versioning import (deprecated_passed,  | 
111  | 
deprecated_method,  | 
|
112  | 
deprecated_function,  | 
|
113  | 
DEPRECATED_PARAMETER,  | 
|
114  | 
zero_eight,  | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
115  | 
zero_eleven,  | 
| 
2116.4.1
by John Arbash Meinel
 Update file and revision id generators.  | 
116  | 
zero_thirteen,  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
117  | 
        )
 | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
118  | 
|
119  | 
||
120  | 
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"  | 
|
121  | 
CONFLICT_HEADER_1 = "BZR conflict list format 1"  | 
|
| 
1685.1.30
by John Arbash Meinel
 PEP8 for workingtree.py  | 
122  | 
|
| 
2423.2.1
by Alexander Belchenko
 Fix for walkdirs in missing dir with Py2.4 @ win32  | 
123  | 
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT  | 
124  | 
||
| 
2116.4.1
by John Arbash Meinel
 Update file and revision id generators.  | 
125  | 
|
126  | 
@deprecated_function(zero_thirteen)  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
127  | 
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'.  | 
128  | 
"""Return new file id for the basename 'name'.  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
129  | 
|
| 
2116.4.1
by John Arbash Meinel
 Update file and revision id generators.  | 
130  | 
    Use bzrlib.generate_ids.gen_file_id() instead
 | 
| 
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.  | 
131  | 
    """
 | 
| 
2116.4.1
by John Arbash Meinel
 Update file and revision id generators.  | 
132  | 
return generate_ids.gen_file_id(name)  | 
133  | 
||
134  | 
||
135  | 
@deprecated_function(zero_thirteen)  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
136  | 
def gen_root_id():  | 
| 
2116.4.1
by John Arbash Meinel
 Update file and revision id generators.  | 
137  | 
"""Return a new tree-root file id.  | 
138  | 
||
139  | 
    This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
 | 
|
140  | 
    """
 | 
|
141  | 
return generate_ids.gen_root_id()  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
142  | 
|
143  | 
||
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
144  | 
class TreeEntry(object):  | 
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
145  | 
"""An entry that implements the minimum interface used by commands.  | 
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
146  | 
|
147  | 
    This needs further inspection, it may be better to have 
 | 
|
148  | 
    InventoryEntries without ids - though that seems wrong. For now,
 | 
|
149  | 
    this is a parallel hierarchy to InventoryEntry, and needs to become
 | 
|
150  | 
    one of several things: decorates to that hierarchy, children of, or
 | 
|
151  | 
    parents of it.
 | 
|
| 
1399.1.3
by Robert Collins
 move change detection for text and metadata from delta to entry.detect_changes  | 
152  | 
    Another note is that these objects are currently only used when there is
 | 
153  | 
    no InventoryEntry available - i.e. for unversioned objects.
 | 
|
154  | 
    Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
 | 
|
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
155  | 
    """
 | 
156  | 
||
157  | 
def __eq__(self, other):  | 
|
158  | 
        # yes, this us ugly, TODO: best practice __eq__ style.
 | 
|
159  | 
return (isinstance(other, TreeEntry)  | 
|
160  | 
and other.__class__ == self.__class__)  | 
|
161  | 
||
162  | 
def kind_character(self):  | 
|
163  | 
return "???"  | 
|
164  | 
||
165  | 
||
166  | 
class TreeDirectory(TreeEntry):  | 
|
167  | 
"""See TreeEntry. This is a directory in a working tree."""  | 
|
168  | 
||
169  | 
def __eq__(self, other):  | 
|
170  | 
return (isinstance(other, TreeDirectory)  | 
|
171  | 
and other.__class__ == self.__class__)  | 
|
172  | 
||
173  | 
def kind_character(self):  | 
|
174  | 
return "/"  | 
|
175  | 
||
176  | 
||
177  | 
class TreeFile(TreeEntry):  | 
|
178  | 
"""See TreeEntry. This is a regular file in a working tree."""  | 
|
179  | 
||
180  | 
def __eq__(self, other):  | 
|
181  | 
return (isinstance(other, TreeFile)  | 
|
182  | 
and other.__class__ == self.__class__)  | 
|
183  | 
||
184  | 
def kind_character(self):  | 
|
185  | 
return ''  | 
|
186  | 
||
187  | 
||
188  | 
class TreeLink(TreeEntry):  | 
|
189  | 
"""See TreeEntry. This is a symlink in a working tree."""  | 
|
190  | 
||
191  | 
def __eq__(self, other):  | 
|
192  | 
return (isinstance(other, TreeLink)  | 
|
193  | 
and other.__class__ == self.__class__)  | 
|
194  | 
||
195  | 
def kind_character(self):  | 
|
196  | 
return ''  | 
|
197  | 
||
198  | 
||
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
199  | 
class WorkingTree(bzrlib.mutabletree.MutableTree):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
200  | 
"""Working copy tree.  | 
201  | 
||
202  | 
    The inventory is held in the `Branch` working-inventory, and the
 | 
|
203  | 
    files are in a directory on disk.
 | 
|
204  | 
||
205  | 
    It is possible for a `WorkingTree` to have a filename which is
 | 
|
206  | 
    not listed in the Inventory and vice versa.
 | 
|
207  | 
    """
 | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
208  | 
|
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
209  | 
def __init__(self, basedir='.',  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
210  | 
branch=DEPRECATED_PARAMETER,  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
211  | 
_inventory=None,  | 
212  | 
_control_files=None,  | 
|
213  | 
_internal=False,  | 
|
214  | 
_format=None,  | 
|
215  | 
_bzrdir=None):  | 
|
| 
2367.2.1
by Robert Collins
 Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)  | 
216  | 
"""Construct a WorkingTree instance. This is not a public API.  | 
| 
1457.1.1
by Robert Collins
 rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.  | 
217  | 
|
| 
2367.2.1
by Robert Collins
 Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)  | 
218  | 
        :param branch: A branch to override probing for the branch.
 | 
| 
1457.1.1
by Robert Collins
 rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.  | 
219  | 
        """
 | 
| 
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.  | 
220  | 
self._format = _format  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
221  | 
self.bzrdir = _bzrdir  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
222  | 
if not _internal:  | 
| 
2367.2.1
by Robert Collins
 Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)  | 
223  | 
raise errors.BzrError("Please use bzrdir.open_workingtree or "  | 
224  | 
"WorkingTree.open() to obtain a WorkingTree.")  | 
|
| 
1185.16.72
by Martin Pool
 [merge] from robert and fix up tests  | 
225  | 
assert isinstance(basedir, basestring), \  | 
226  | 
"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.  | 
227  | 
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.  | 
228  | 
mutter("opening working tree %r", basedir)  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
229  | 
if deprecated_passed(branch):  | 
| 
1681.1.1
by Robert Collins
 Make WorkingTree.branch a read only property. (Robert Collins)  | 
230  | 
self._branch = branch  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
231  | 
else:  | 
| 
1681.1.1
by Robert Collins
 Make WorkingTree.branch a read only property. (Robert Collins)  | 
232  | 
self._branch = self.bzrdir.open_branch()  | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
233  | 
self.basedir = realpath(basedir)  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
234  | 
        # 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.  | 
235  | 
if isinstance(self._format, WorkingTreeFormat2):  | 
236  | 
            # share control object
 | 
|
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
237  | 
self._control_files = self.branch.control_files  | 
238  | 
else:  | 
|
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
239  | 
            # assume all other formats have their own control files.
 | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
240  | 
assert isinstance(_control_files, LockableFiles), \  | 
241  | 
"_control_files must be a LockableFiles, not %r" \  | 
|
242  | 
% _control_files  | 
|
243  | 
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.  | 
244  | 
        # update the whole cache up front and write to disk if anything changed;
 | 
245  | 
        # in the future we might want to do this more selectively
 | 
|
| 
1467
by Robert Collins
 WorkingTree.__del__ has been removed.  | 
246  | 
        # two possible ways offer themselves : in self._unlock, write the cache
 | 
247  | 
        # if needed, or, when the cache sees a change, append it to the hash
 | 
|
248  | 
        # cache file, and have the parser take the most recent entry for a
 | 
|
249  | 
        # given path only.
 | 
|
| 
2220.1.6
by Marius Kruger
 * change error message telling user about --after option sightly  | 
250  | 
wt_trans = self.bzrdir.get_workingtree_transport(None)  | 
251  | 
cache_filename = wt_trans.local_abspath('stat-cache')  | 
|
| 
2201.1.1
by John Arbash Meinel
 Fix bug #76299 by ignoring write errors during readonly hashcache write.  | 
252  | 
self._hashcache = hashcache.HashCache(basedir, cache_filename,  | 
253  | 
self._control_files._file_mode)  | 
|
254  | 
hc = self._hashcache  | 
|
| 
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.  | 
255  | 
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.  | 
256  | 
        # 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  | 
257  | 
        #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.  | 
258  | 
|
259  | 
if hc.needs_write:  | 
|
260  | 
mutter("write hc")  | 
|
261  | 
hc.write()  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
262  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
263  | 
if _inventory is None:  | 
| 
2334.1.1
by John Arbash Meinel
 Lazily read working inventory in workingtree.py,  | 
264  | 
            # This will be acquired on lock_read() or lock_write()
 | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
265  | 
self._inventory_is_modified = False  | 
| 
2334.1.1
by John Arbash Meinel
 Lazily read working inventory in workingtree.py,  | 
266  | 
self._inventory = None  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
267  | 
else:  | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
268  | 
            # the caller of __init__ has provided an inventory,
 | 
269  | 
            # we assume they know what they are doing - as its only
 | 
|
270  | 
            # the Format factory and creation methods that are
 | 
|
271  | 
            # permitted to do this.
 | 
|
272  | 
self._set_inventory(_inventory, dirty=False)  | 
|
| 
1185.60.6
by Aaron Bentley
 Fixed hashcache  | 
273  | 
|
| 
1681.1.1
by Robert Collins
 Make WorkingTree.branch a read only property. (Robert Collins)  | 
274  | 
branch = property(  | 
275  | 
fget=lambda self: self._branch,  | 
|
276  | 
doc="""The branch this WorkingTree is connected to.  | 
|
277  | 
||
278  | 
            This cannot be set - it is reflective of the actual disk structure
 | 
|
279  | 
            the working tree has been constructed from.
 | 
|
280  | 
""")  | 
|
281  | 
||
| 
1687.1.9
by Robert Collins
 Teach WorkingTree about break-lock.  | 
282  | 
def break_lock(self):  | 
283  | 
"""Break a lock if one is present from another instance.  | 
|
284  | 
||
285  | 
        Uses the ui factory to ask for confirmation if the lock may be from
 | 
|
286  | 
        an active process.
 | 
|
287  | 
||
288  | 
        This will probe the repository for its lock as well.
 | 
|
289  | 
        """
 | 
|
290  | 
self._control_files.break_lock()  | 
|
291  | 
self.branch.break_lock()  | 
|
292  | 
||
| 
2100.3.14
by Aaron Bentley
 Test workingtree4 format, prevent use with old repos  | 
293  | 
def requires_rich_root(self):  | 
294  | 
return self._format.requires_rich_root  | 
|
295  | 
||
| 
2100.3.20
by Aaron Bentley
 Implement tree comparison for tree references  | 
296  | 
def supports_tree_reference(self):  | 
| 
2255.2.232
by Robert Collins
 Make WorkingTree4 report support for references based on the repositories capabilities.  | 
297  | 
return False  | 
| 
2100.3.20
by Aaron Bentley
 Implement tree comparison for tree references  | 
298  | 
|
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
299  | 
def _set_inventory(self, inv, dirty):  | 
300  | 
"""Set the internal cached inventory.  | 
|
301  | 
||
302  | 
        :param inv: The inventory to set.
 | 
|
303  | 
        :param dirty: A boolean indicating whether the inventory is the same
 | 
|
304  | 
            logical inventory as whats on disk. If True the inventory is not
 | 
|
305  | 
            the same and should be written to disk or data will be lost, if
 | 
|
306  | 
            False then the inventory is the same as that on disk and any
 | 
|
307  | 
            serialisation would be unneeded overhead.
 | 
|
308  | 
        """
 | 
|
| 
1910.2.6
by Aaron Bentley
 Update for merge review, handle deprecations  | 
309  | 
assert inv.root is not None  | 
| 
1508.1.10
by Robert Collins
 bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)  | 
310  | 
self._inventory = inv  | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
311  | 
self._inventory_is_modified = dirty  | 
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
312  | 
|
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
313  | 
    @staticmethod
 | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
314  | 
def open(path=None, _unsupported=False):  | 
315  | 
"""Open an existing working tree at path.  | 
|
316  | 
||
317  | 
        """
 | 
|
318  | 
if path is None:  | 
|
319  | 
path = os.path.getcwdu()  | 
|
320  | 
control = bzrdir.BzrDir.open(path, _unsupported)  | 
|
321  | 
return control.open_workingtree(_unsupported)  | 
|
322  | 
||
323  | 
    @staticmethod
 | 
|
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
324  | 
def open_containing(path=None):  | 
325  | 
"""Open an existing working tree which has its root about path.  | 
|
326  | 
        
 | 
|
327  | 
        This probes for a working tree at path and searches upwards from there.
 | 
|
328  | 
||
329  | 
        Basically we keep looking up until we find the control directory or
 | 
|
330  | 
        run into /.  If there isn't one, raises NotBranchError.
 | 
|
331  | 
        TODO: give this a new exception.
 | 
|
332  | 
        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  | 
333  | 
|
334  | 
        :return: The WorkingTree that contains 'path', and the rest of path
 | 
|
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
335  | 
        """
 | 
336  | 
if path is None:  | 
|
| 
1830.3.14
by John Arbash Meinel
 WorkingTree.open_containing() was directly calling os.getcwdu(), which on mac returns the wrong normalization, and on win32 would have the wrong slashes  | 
337  | 
path = osutils.getcwd()  | 
| 
1685.1.28
by John Arbash Meinel
 Changing open_containing to always return a unicode path.  | 
338  | 
control, relpath = bzrdir.BzrDir.open_containing(path)  | 
| 
1685.1.27
by John Arbash Meinel
 BzrDir works in URLs, but WorkingTree works in unicode paths  | 
339  | 
|
| 
1685.1.28
by John Arbash Meinel
 Changing open_containing to always return a unicode path.  | 
340  | 
return control.open_workingtree(), relpath  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
341  | 
|
342  | 
    @staticmethod
 | 
|
343  | 
def open_downlevel(path=None):  | 
|
344  | 
"""Open an unsupported working tree.  | 
|
345  | 
||
346  | 
        Only intended for advanced situations like upgrading part of a bzrdir.
 | 
|
347  | 
        """
 | 
|
348  | 
return WorkingTree.open(path, _unsupported=True)  | 
|
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
349  | 
|
| 
2255.2.170
by Martin Pool
 merge dirstate  | 
350  | 
    # should be deprecated - this is slow and in any case treating them as a
 | 
351  | 
    # container is (we now know) bad style -- mbp 20070302
 | 
|
352  | 
    ## @deprecated_method(zero_fifteen)
 | 
|
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
353  | 
def __iter__(self):  | 
354  | 
"""Iterate through file_ids for this tree.  | 
|
355  | 
||
356  | 
        file_ids are in a WorkingTree if they are in the working inventory
 | 
|
357  | 
        and the working file exists.
 | 
|
358  | 
        """
 | 
|
359  | 
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.  | 
360  | 
for path, ie in inv.iter_entries():  | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
361  | 
if osutils.lexists(self.abspath(path)):  | 
| 
866
by Martin Pool
 - use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created.  | 
362  | 
yield ie.file_id  | 
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
363  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
364  | 
def __repr__(self):  | 
365  | 
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  | 
366  | 
getattr(self, 'basedir', None))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
367  | 
|
368  | 
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 \  | 
369  | 
return pathjoin(self.basedir, filename)  | 
| 
2292.1.30
by Marius Kruger
 * Minor text fixes.  | 
370  | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
371  | 
def basis_tree(self):  | 
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
372  | 
"""Return RevisionTree for the current last revision.  | 
373  | 
        
 | 
|
374  | 
        If the left most parent is a ghost then the returned tree will be an
 | 
|
375  | 
        empty tree - one obtained by calling repository.revision_tree(None).
 | 
|
376  | 
        """
 | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
377  | 
try:  | 
378  | 
revision_id = self.get_parent_ids()[0]  | 
|
379  | 
except IndexError:  | 
|
380  | 
            # no parents, return an empty revision tree.
 | 
|
381  | 
            # in the future this should return the tree for
 | 
|
382  | 
            # 'empty:' - the implicit root empty tree.
 | 
|
383  | 
return self.branch.repository.revision_tree(None)  | 
|
| 
1908.11.2
by Robert Collins
 Implement WorkingTree interface conformance tests for  | 
384  | 
try:  | 
385  | 
return self.revision_tree(revision_id)  | 
|
386  | 
except errors.NoSuchRevision:  | 
|
387  | 
            pass
 | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
388  | 
        # No cached copy available, retrieve from the repository.
 | 
389  | 
        # FIXME? RBC 20060403 should we cache the inventory locally
 | 
|
390  | 
        # at this point ?
 | 
|
| 
1927.2.1
by Robert Collins
 Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.  | 
391  | 
try:  | 
392  | 
return self.branch.repository.revision_tree(revision_id)  | 
|
393  | 
except errors.RevisionNotPresent:  | 
|
394  | 
            # the basis tree *may* be a ghost or a low level error may have
 | 
|
395  | 
            # occured. If the revision is present, its a problem, if its not
 | 
|
396  | 
            # its a ghost.
 | 
|
397  | 
if self.branch.repository.has_revision(revision_id):  | 
|
398  | 
                raise
 | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
399  | 
            # the basis tree is a ghost so return an empty tree.
 | 
| 
1927.2.1
by Robert Collins
 Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.  | 
400  | 
return self.branch.repository.revision_tree(None)  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
401  | 
|
| 
2665.3.2
by Daniel Watkins
 Created _cleanup() method in WorkingTree.  | 
402  | 
def _cleanup(self):  | 
403  | 
self._flush_ignore_list_cache()  | 
|
404  | 
||
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
405  | 
    @staticmethod
 | 
| 
1534.4.47
by Robert Collins
 Split out repository into .bzr/repository  | 
406  | 
@deprecated_method(zero_eight)  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
407  | 
def create(branch, directory):  | 
408  | 
"""Create a workingtree for branch at directory.  | 
|
409  | 
||
410  | 
        If existing_directory already exists it must have a .bzr directory.
 | 
|
411  | 
        If it does not exist, it will be created.
 | 
|
412  | 
||
413  | 
        This returns a new WorkingTree object for the new checkout.
 | 
|
414  | 
||
415  | 
        TODO FIXME RBC 20060124 when we have checkout formats in place this
 | 
|
416  | 
        should accept an optional revisionid to checkout [and reject this if
 | 
|
417  | 
        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  | 
418  | 
|
419  | 
        XXX: When BzrDir is present, these should be created through that 
 | 
|
420  | 
        interface instead.
 | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
421  | 
        """
 | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
422  | 
warnings.warn('delete WorkingTree.create', stacklevel=3)  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
423  | 
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.  | 
424  | 
if branch.bzrdir.root_transport.base == transport.base:  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
425  | 
            # same dir 
 | 
426  | 
return branch.bzrdir.create_workingtree()  | 
|
427  | 
        # different directory, 
 | 
|
428  | 
        # create a branch reference
 | 
|
429  | 
        # and now a working tree.
 | 
|
430  | 
raise NotImplementedError  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
431  | 
|
432  | 
    @staticmethod
 | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
433  | 
@deprecated_method(zero_eight)  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
434  | 
def create_standalone(directory):  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
435  | 
"""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.  | 
436  | 
|
437  | 
        Directory must exist and be empty.
 | 
|
| 
1551.1.2
by Martin Pool
 Deprecation warnings for popular APIs that will change in BzrDir  | 
438  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
439  | 
        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.  | 
440  | 
        """
 | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
441  | 
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.  | 
442  | 
|
| 
1713.1.9
by Robert Collins
 Paired performance tuning of bzr add. (Robert Collins, Martin Pool).  | 
443  | 
def relpath(self, path):  | 
444  | 
"""Return the local path portion from a given path.  | 
|
445  | 
        
 | 
|
446  | 
        The path may be absolute or relative. If its a relative path it is 
 | 
|
447  | 
        interpreted relative to the python current working directory.
 | 
|
448  | 
        """
 | 
|
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
449  | 
return osutils.relpath(self.basedir, path)  | 
| 
1457.1.3
by Robert Collins
 make Branch.relpath delegate to the working tree.  | 
450  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
451  | 
def has_filename(self, filename):  | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
452  | 
return osutils.lexists(self.abspath(filename))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
453  | 
|
| 
2743.3.3
by Ian Clatworthy
 Skip path lookup for tree.get_file() when we already know the path  | 
454  | 
def get_file(self, file_id, path=None):  | 
455  | 
if path is None:  | 
|
456  | 
path = self.id2path(file_id)  | 
|
457  | 
return self.get_file_byname(path)  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
458  | 
|
| 
1852.6.9
by Robert Collins
 Add more test trees to the tree-implementations tests.  | 
459  | 
def get_file_text(self, file_id):  | 
460  | 
return self.get_file(file_id).read()  | 
|
461  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
462  | 
def get_file_byname(self, filename):  | 
463  | 
return file(self.abspath(filename), 'rb')  | 
|
464  | 
||
| 
2255.2.18
by Robert Collins
 Dirstate: all tree_implementation tests passing.  | 
465  | 
    @needs_read_lock
 | 
| 
1551.15.46
by Aaron Bentley
 Move plan merge to tree  | 
466  | 
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):  | 
| 
1551.9.16
by Aaron Bentley
 Implement Tree.annotate_iter for RevisionTree and WorkingTree  | 
467  | 
"""See Tree.annotate_iter  | 
468  | 
||
469  | 
        This implementation will use the basis tree implementation if possible.
 | 
|
470  | 
        Lines not in the basis are attributed to CURRENT_REVISION
 | 
|
471  | 
||
472  | 
        If there are pending merges, lines added by those merges will be
 | 
|
473  | 
        incorrectly attributed to CURRENT_REVISION (but after committing, the
 | 
|
474  | 
        attribution will be correct).
 | 
|
475  | 
        """
 | 
|
476  | 
basis = self.basis_tree()  | 
|
| 
2255.2.238
by Robert Collins
 Fix annotate_iter to lock the basis tree appropriately.  | 
477  | 
basis.lock_read()  | 
478  | 
try:  | 
|
479  | 
changes = self._iter_changes(basis, True, [self.id2path(file_id)],  | 
|
480  | 
require_versioned=True).next()  | 
|
481  | 
changed_content, kind = changes[2], changes[6]  | 
|
482  | 
if not changed_content:  | 
|
483  | 
return basis.annotate_iter(file_id)  | 
|
484  | 
if kind[1] is None:  | 
|
485  | 
return None  | 
|
486  | 
import annotate  | 
|
487  | 
if kind[0] != 'file':  | 
|
488  | 
old_lines = []  | 
|
489  | 
else:  | 
|
490  | 
old_lines = list(basis.annotate_iter(file_id))  | 
|
491  | 
old = [old_lines]  | 
|
492  | 
for tree in self.branch.repository.revision_trees(  | 
|
493  | 
self.get_parent_ids()[1:]):  | 
|
494  | 
if file_id not in tree:  | 
|
495  | 
                    continue
 | 
|
496  | 
old.append(list(tree.annotate_iter(file_id)))  | 
|
497  | 
return annotate.reannotate(old, self.get_file(file_id).readlines(),  | 
|
| 
1551.15.46
by Aaron Bentley
 Move plan merge to tree  | 
498  | 
default_revision)  | 
| 
2255.2.238
by Robert Collins
 Fix annotate_iter to lock the basis tree appropriately.  | 
499  | 
finally:  | 
500  | 
basis.unlock()  | 
|
| 
1551.9.18
by Aaron Bentley
 Updates from review comments  | 
501  | 
|
| 
1551.15.46
by Aaron Bentley
 Move plan merge to tree  | 
502  | 
def _get_ancestors(self, default_revision):  | 
503  | 
ancestors = set([default_revision])  | 
|
504  | 
for parent_id in self.get_parent_ids():  | 
|
505  | 
ancestors.update(self.branch.repository.get_ancestry(  | 
|
506  | 
parent_id, topo_sorted=False))  | 
|
507  | 
return ancestors  | 
|
508  | 
||
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
509  | 
def get_parent_ids(self):  | 
510  | 
"""See Tree.get_parent_ids.  | 
|
511  | 
        
 | 
|
512  | 
        This implementation reads the pending merges list and last_revision
 | 
|
513  | 
        value and uses that to decide what the parents list should be.
 | 
|
514  | 
        """
 | 
|
| 
2598.5.3
by Aaron Bentley
 Push NULL_REVISION deeper  | 
515  | 
last_rev = _mod_revision.ensure_null(self._last_revision())  | 
| 
2598.5.7
by Aaron Bentley
 Updates from review  | 
516  | 
if _mod_revision.NULL_REVISION == last_rev:  | 
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
517  | 
parents = []  | 
518  | 
else:  | 
|
519  | 
parents = [last_rev]  | 
|
| 
1908.6.10
by Robert Collins
 forward to get_parent_ids in pending_merges.  | 
520  | 
try:  | 
| 
2249.5.7
by John Arbash Meinel
 Make sure WorkingTree revision_ids are also returned as utf8 strings  | 
521  | 
merges_file = self._control_files.get('pending-merges')  | 
| 
2206.1.7
by Marius Kruger
 * errors  | 
522  | 
except errors.NoSuchFile:  | 
| 
1908.6.10
by Robert Collins
 forward to get_parent_ids in pending_merges.  | 
523  | 
            pass
 | 
524  | 
else:  | 
|
525  | 
for l in merges_file.readlines():  | 
|
| 
2858.2.1
by Martin Pool
 Remove most calls to safe_file_id and safe_revision_id.  | 
526  | 
revision_id = l.rstrip('\n')  | 
| 
2249.5.9
by John Arbash Meinel
 Update WorkingTree to use safe_revision_id when appropriate  | 
527  | 
parents.append(revision_id)  | 
| 
1908.6.10
by Robert Collins
 forward to get_parent_ids in pending_merges.  | 
528  | 
return parents  | 
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
529  | 
|
| 
1986.5.1
by Robert Collins
 (Robert Collins, John Meinel) Change WorkingTree.get_root_id to not trigger read_working_inventory and instead use the one inside the current transaction.  | 
530  | 
    @needs_read_lock
 | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
531  | 
def get_root_id(self):  | 
532  | 
"""Return the id of this trees root"""  | 
|
| 
1986.5.1
by Robert Collins
 (Robert Collins, John Meinel) Change WorkingTree.get_root_id to not trigger read_working_inventory and instead use the one inside the current transaction.  | 
533  | 
return self._inventory.root.file_id  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
534  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
535  | 
def _get_store_filename(self, file_id):  | 
| 
1508.1.1
by Robert Collins
 Provide a open_containing for WorkingTree.  | 
536  | 
        ## XXX: badly named; this is not in the store at all
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
537  | 
return self.abspath(self.id2path(file_id))  | 
538  | 
||
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
539  | 
    @needs_read_lock
 | 
| 
2387.1.1
by Robert Collins
 Remove the --basis parameter to clone etc. (Robert Collins)  | 
540  | 
def clone(self, to_bzrdir, revision_id=None):  | 
| 
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.  | 
541  | 
"""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()  | 
542  | 
        
 | 
| 
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.  | 
543  | 
        Specifically modified files are kept as modified, but
 | 
544  | 
        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()  | 
545  | 
|
| 
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.  | 
546  | 
        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()  | 
547  | 
|
548  | 
        revision
 | 
|
549  | 
            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.  | 
550  | 
            revision, and and difference between the source trees last revision
 | 
551  | 
            and this one merged in.
 | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
552  | 
        """
 | 
| 
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.  | 
553  | 
        # assumes the target bzr dir format is compatible.
 | 
554  | 
result = self._format.initialize(to_bzrdir)  | 
|
555  | 
self.copy_content_into(result, revision_id)  | 
|
556  | 
return result  | 
|
557  | 
||
558  | 
    @needs_read_lock
 | 
|
559  | 
def copy_content_into(self, tree, revision_id=None):  | 
|
560  | 
"""Copy the current content and user files of this tree into tree."""  | 
|
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
561  | 
tree.set_root_id(self.get_root_id())  | 
| 
1534.4.50
by Robert Collins
 Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.  | 
562  | 
if revision_id is None:  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
563  | 
merge.transform_tree(tree, self)  | 
| 
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.  | 
564  | 
else:  | 
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
565  | 
            # TODO now merge from tree.last_revision to revision (to preserve
 | 
566  | 
            # user local changes)
 | 
|
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
567  | 
merge.transform_tree(tree, self)  | 
| 
1908.6.3
by Robert Collins
 Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.  | 
568  | 
tree.set_parent_ids([revision_id])  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
569  | 
|
| 
1248
by Martin Pool
 - new weave based cleanup [broken]  | 
570  | 
def id2abspath(self, file_id):  | 
571  | 
return self.abspath(self.id2path(file_id))  | 
|
572  | 
||
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
573  | 
def has_id(self, file_id):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
574  | 
        # files that have been deleted are excluded
 | 
| 
2255.2.82
by Robert Collins
 various notes about find_ids_across_trees  | 
575  | 
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.  | 
576  | 
if not inv.has_id(file_id):  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
577  | 
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.  | 
578  | 
path = inv.id2path(file_id)  | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
579  | 
return osutils.lexists(self.abspath(path))  | 
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
580  | 
|
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
581  | 
def has_or_had_id(self, file_id):  | 
582  | 
if file_id == self.inventory.root.file_id:  | 
|
583  | 
return True  | 
|
584  | 
return self.inventory.has_id(file_id)  | 
|
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
585  | 
|
586  | 
__contains__ = has_id  | 
|
587  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
588  | 
def get_file_size(self, file_id):  | 
| 
1248
by Martin Pool
 - new weave based cleanup [broken]  | 
589  | 
return os.path.getsize(self.id2abspath(file_id))  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
590  | 
|
| 
1185.60.6
by Aaron Bentley
 Fixed hashcache  | 
591  | 
    @needs_read_lock
 | 
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
592  | 
def get_file_sha1(self, file_id, path=None, stat_value=None):  | 
| 
1732.1.19
by John Arbash Meinel
 If you have the path, use it rather than looking it up again  | 
593  | 
if not path:  | 
594  | 
path = self._inventory.id2path(file_id)  | 
|
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
595  | 
return self._hashcache.get_sha1(path, stat_value)  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
596  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
597  | 
def get_file_mtime(self, file_id, path=None):  | 
598  | 
if not path:  | 
|
| 
2255.7.36
by John Arbash Meinel
 All trees should implement get_file_mtime()  | 
599  | 
path = self.inventory.id2path(file_id)  | 
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
600  | 
return os.lstat(self.abspath(path)).st_mtime  | 
601  | 
||
| 
2911.5.2
by John Arbash Meinel
 Ensure that WT3 properly extracts the executable bit from the basis inventory.  | 
602  | 
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):  | 
603  | 
file_id = self.path2id(path)  | 
|
604  | 
return self._inventory[file_id].executable  | 
|
605  | 
||
606  | 
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):  | 
|
607  | 
mode = stat_result.st_mode  | 
|
608  | 
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)  | 
|
609  | 
||
| 
1732.1.19
by John Arbash Meinel
 If you have the path, use it rather than looking it up again  | 
610  | 
if not supports_executable():  | 
611  | 
def is_executable(self, file_id, path=None):  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
612  | 
return self._inventory[file_id].executable  | 
| 
2911.5.2
by John Arbash Meinel
 Ensure that WT3 properly extracts the executable bit from the basis inventory.  | 
613  | 
|
614  | 
_is_executable_from_path_and_stat = \  | 
|
| 
2911.5.4
by John Arbash Meinel
 Switch around to properly look up the executable bit in the basis.  | 
615  | 
            _is_executable_from_path_and_stat_from_basis
 | 
| 
1732.1.19
by John Arbash Meinel
 If you have the path, use it rather than looking it up again  | 
616  | 
else:  | 
617  | 
def is_executable(self, file_id, path=None):  | 
|
618  | 
if not path:  | 
|
| 
2255.2.15
by Robert Collins
 Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.  | 
619  | 
path = self.id2path(file_id)  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
620  | 
mode = os.lstat(self.abspath(path)).st_mode  | 
| 
1733.1.4
by Robert Collins
 Cosmetic niceties for debugging, extra comments etc.  | 
621  | 
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
622  | 
|
| 
2911.5.2
by John Arbash Meinel
 Ensure that WT3 properly extracts the executable bit from the basis inventory.  | 
623  | 
_is_executable_from_path_and_stat = \  | 
| 
2911.5.4
by John Arbash Meinel
 Switch around to properly look up the executable bit in the basis.  | 
624  | 
            _is_executable_from_path_and_stat_from_stat
 | 
| 
2911.5.2
by John Arbash Meinel
 Ensure that WT3 properly extracts the executable bit from the basis inventory.  | 
625  | 
|
| 
2255.2.168
by Martin Pool
 merge robert, debugging  | 
626  | 
    @needs_tree_write_lock
 | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
627  | 
def _add(self, files, ids, kinds):  | 
628  | 
"""See MutableTree._add."""  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
629  | 
        # TODO: Re-adding a file that is removed in the working copy
 | 
630  | 
        # should probably put it back with the previous ID.
 | 
|
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
631  | 
        # the read and write working inventory should not occur in this 
 | 
632  | 
        # function - they should be part of lock_write and unlock.
 | 
|
| 
2568.2.3
by Robert Collins
 Fix WorkingTree(3).add to not reset the entire inventory but modify the existing one.  | 
633  | 
inv = self.inventory  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
634  | 
for f, file_id, kind in zip(files, ids, kinds):  | 
635  | 
assert kind is not None  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
636  | 
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'.  | 
637  | 
inv.add_path(f, kind=kind)  | 
638  | 
else:  | 
|
639  | 
inv.add_path(f, kind=kind, file_id=file_id)  | 
|
| 
2568.2.3
by Robert Collins
 Fix WorkingTree(3).add to not reset the entire inventory but modify the existing one.  | 
640  | 
self._inventory_is_modified = True  | 
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
641  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
642  | 
    @needs_tree_write_lock
 | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
643  | 
def _gather_kinds(self, files, kinds):  | 
644  | 
"""See MutableTree._gather_kinds."""  | 
|
645  | 
for pos, f in enumerate(files):  | 
|
646  | 
if kinds[pos] is None:  | 
|
647  | 
fullpath = normpath(self.abspath(f))  | 
|
648  | 
try:  | 
|
649  | 
kinds[pos] = file_kind(fullpath)  | 
|
650  | 
except OSError, e:  | 
|
651  | 
if e.errno == errno.ENOENT:  | 
|
| 
2206.1.7
by Marius Kruger
 * errors  | 
652  | 
raise errors.NoSuchFile(fullpath)  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
653  | 
|
| 
1508.1.5
by Robert Collins
 Move add from Branch to WorkingTree.  | 
654  | 
    @needs_write_lock
 | 
| 
1908.5.9
by Robert Collins
 Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.  | 
655  | 
def add_parent_tree_id(self, revision_id, allow_leftmost_as_ghost=False):  | 
| 
1908.5.4
by Robert Collins
 Add add_parent_tree_id WorkingTree helper api.  | 
656  | 
"""Add revision_id as a parent.  | 
657  | 
||
658  | 
        This is equivalent to retrieving the current list of parent ids
 | 
|
659  | 
        and setting the list to its value plus revision_id.
 | 
|
660  | 
||
661  | 
        :param revision_id: The revision id to add to the parent list. It may
 | 
|
| 
1908.5.12
by Robert Collins
 Apply review feedback - paired with Martin.  | 
662  | 
        be a ghost revision as long as its not the first parent to be added,
 | 
663  | 
        or the allow_leftmost_as_ghost parameter is set True.
 | 
|
664  | 
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
 | 
|
| 
1908.5.4
by Robert Collins
 Add add_parent_tree_id WorkingTree helper api.  | 
665  | 
        """
 | 
| 
1908.5.13
by Robert Collins
 Adding a parent when the first is a ghost already should not require forcing it.  | 
666  | 
parents = self.get_parent_ids() + [revision_id]  | 
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
667  | 
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1  | 
| 
2206.1.7
by Marius Kruger
 * errors  | 
668  | 
or allow_leftmost_as_ghost)  | 
| 
1908.5.4
by Robert Collins
 Add add_parent_tree_id WorkingTree helper api.  | 
669  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
670  | 
    @needs_tree_write_lock
 | 
| 
1908.5.9
by Robert Collins
 Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.  | 
671  | 
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False):  | 
| 
1908.5.6
by Robert Collins
 Add add_parent_tree to WorkingTree.  | 
672  | 
"""Add revision_id, tree tuple as a parent.  | 
673  | 
||
674  | 
        This is equivalent to retrieving the current list of parent trees
 | 
|
675  | 
        and setting the list to its value plus parent_tuple. See also
 | 
|
676  | 
        add_parent_tree_id - if you only have a parent id available it will be
 | 
|
677  | 
        simpler to use that api. If you have the parent already available, using
 | 
|
678  | 
        this api is preferred.
 | 
|
679  | 
||
| 
1908.5.12
by Robert Collins
 Apply review feedback - paired with Martin.  | 
680  | 
        :param parent_tuple: The (revision id, tree) to add to the parent list.
 | 
681  | 
            If the revision_id is a ghost, pass None for the tree.
 | 
|
682  | 
        :param allow_leftmost_as_ghost: Allow the first parent to be a ghost.
 | 
|
| 
1908.5.6
by Robert Collins
 Add add_parent_tree to WorkingTree.  | 
683  | 
        """
 | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
684  | 
parent_ids = self.get_parent_ids() + [parent_tuple[0]]  | 
685  | 
if len(parent_ids) > 1:  | 
|
686  | 
            # the leftmost may have already been a ghost, preserve that if it
 | 
|
687  | 
            # was.
 | 
|
688  | 
allow_leftmost_as_ghost = True  | 
|
689  | 
self.set_parent_ids(parent_ids,  | 
|
| 
1908.5.9
by Robert Collins
 Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.  | 
690  | 
allow_leftmost_as_ghost=allow_leftmost_as_ghost)  | 
| 
1908.5.6
by Robert Collins
 Add add_parent_tree to WorkingTree.  | 
691  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
692  | 
    @needs_tree_write_lock
 | 
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
693  | 
def add_pending_merge(self, *revision_ids):  | 
694  | 
        # TODO: Perhaps should check at this point that the
 | 
|
695  | 
        # history of the revision is actually present?
 | 
|
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
696  | 
parents = self.get_parent_ids()  | 
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
697  | 
updated = False  | 
698  | 
for rev_id in revision_ids:  | 
|
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
699  | 
if rev_id in parents:  | 
700  | 
                continue
 | 
|
701  | 
parents.append(rev_id)  | 
|
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
702  | 
updated = True  | 
703  | 
if updated:  | 
|
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
704  | 
self.set_parent_ids(parents, allow_leftmost_as_ghost=True)  | 
| 
1457.1.15
by Robert Collins
 Move add_pending_merge to WorkingTree.  | 
705  | 
|
| 
2776.1.9
by Robert Collins
 Review feedback.  | 
706  | 
def path_content_summary(self, path, _lstat=osutils.lstat,  | 
| 
2776.1.7
by Robert Collins
 * New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a  | 
707  | 
_mapper=osutils.file_kind_from_stat_mode):  | 
708  | 
"""See Tree.path_content_summary."""  | 
|
709  | 
abspath = self.abspath(path)  | 
|
710  | 
try:  | 
|
711  | 
stat_result = _lstat(abspath)  | 
|
712  | 
except OSError, e:  | 
|
713  | 
if getattr(e, 'errno', None) == errno.ENOENT:  | 
|
714  | 
                # no file.
 | 
|
715  | 
return ('missing', None, None, None)  | 
|
| 
2776.1.9
by Robert Collins
 Review feedback.  | 
716  | 
            # propagate other errors
 | 
| 
2776.1.7
by Robert Collins
 * New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a  | 
717  | 
            raise
 | 
718  | 
kind = _mapper(stat_result.st_mode)  | 
|
719  | 
if kind == 'file':  | 
|
720  | 
size = stat_result.st_size  | 
|
721  | 
            # try for a stat cache lookup
 | 
|
| 
2911.5.2
by John Arbash Meinel
 Ensure that WT3 properly extracts the executable bit from the basis inventory.  | 
722  | 
executable = self._is_executable_from_path_and_stat(path, stat_result)  | 
| 
2776.1.8
by Robert Collins
 Retrieve the sha from the dirstate for path_content_summary on hash cache hits; slight performance hit but a big win for incremental commits.  | 
723  | 
return (kind, size, executable, self._sha_from_stat(  | 
724  | 
path, stat_result))  | 
|
| 
2776.1.7
by Robert Collins
 * New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a  | 
725  | 
elif kind == 'directory':  | 
726  | 
            # perhaps it looks like a plain directory, but it's really a
 | 
|
727  | 
            # reference.
 | 
|
728  | 
if self._directory_is_tree_reference(path):  | 
|
729  | 
kind = 'tree-reference'  | 
|
730  | 
return kind, None, None, None  | 
|
731  | 
elif kind == 'symlink':  | 
|
732  | 
return ('symlink', None, None, os.readlink(abspath))  | 
|
733  | 
else:  | 
|
734  | 
return (kind, None, None, None)  | 
|
735  | 
||
| 
1908.7.7
by Robert Collins
 Deprecated WorkingTree.pending_merges.  | 
736  | 
@deprecated_method(zero_eleven)  | 
| 
1185.69.2
by John Arbash Meinel
 Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch  | 
737  | 
    @needs_read_lock
 | 
| 
1457.1.14
by Robert Collins
 Move pending_merges() to WorkingTree.  | 
738  | 
def pending_merges(self):  | 
739  | 
"""Return a list of pending merges.  | 
|
740  | 
||
741  | 
        These are revisions that have been merged into the working
 | 
|
742  | 
        directory but not yet committed.
 | 
|
| 
1908.7.9
by Robert Collins
 WorkingTree.last_revision and WorkingTree.pending_merges are deprecated.  | 
743  | 
|
744  | 
        As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
 | 
|
745  | 
        instead - which is available on all tree objects.
 | 
|
| 
1457.1.14
by Robert Collins
 Move pending_merges() to WorkingTree.  | 
746  | 
        """
 | 
| 
1908.6.10
by Robert Collins
 forward to get_parent_ids in pending_merges.  | 
747  | 
return self.get_parent_ids()[1:]  | 
| 
1457.1.14
by Robert Collins
 Move pending_merges() to WorkingTree.  | 
748  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
749  | 
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):  | 
750  | 
"""Common ghost checking functionality from set_parent_*.  | 
|
751  | 
||
752  | 
        This checks that the left hand-parent exists if there are any
 | 
|
753  | 
        revisions present.
 | 
|
754  | 
        """
 | 
|
755  | 
if len(revision_ids) > 0:  | 
|
756  | 
leftmost_id = revision_ids[0]  | 
|
757  | 
if (not allow_leftmost_as_ghost and not  | 
|
758  | 
self.branch.repository.has_revision(leftmost_id)):  | 
|
759  | 
raise errors.GhostRevisionUnusableHere(leftmost_id)  | 
|
760  | 
||
761  | 
def _set_merges_from_parent_ids(self, parent_ids):  | 
|
762  | 
merges = parent_ids[1:]  | 
|
| 
2294.1.2
by John Arbash Meinel
 Track down and add tests that all tree.commit() can handle  | 
763  | 
self._control_files.put_bytes('pending-merges', '\n'.join(merges))  | 
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
764  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
765  | 
    @needs_tree_write_lock
 | 
| 
1908.5.9
by Robert Collins
 Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.  | 
766  | 
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):  | 
| 
1908.5.5
by Robert Collins
 Add WorkingTree.set_parent_ids.  | 
767  | 
"""Set the parent ids to revision_ids.  | 
768  | 
        
 | 
|
769  | 
        See also set_parent_trees. This api will try to retrieve the tree data
 | 
|
770  | 
        for each element of revision_ids from the trees repository. If you have
 | 
|
771  | 
        tree data already available, it is more efficient to use
 | 
|
772  | 
        set_parent_trees rather than set_parent_ids. set_parent_ids is however
 | 
|
773  | 
        an easier API to use.
 | 
|
774  | 
||
775  | 
        :param revision_ids: The revision_ids to set as the parent ids of this
 | 
|
776  | 
            working tree. Any of these may be ghosts.
 | 
|
777  | 
        """
 | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
778  | 
self._check_parents_for_ghosts(revision_ids,  | 
779  | 
allow_leftmost_as_ghost=allow_leftmost_as_ghost)  | 
|
| 
2598.5.2
by Aaron Bentley
 Got all tests passing with Branch returning 'null:' for null revision  | 
780  | 
for revision_id in revision_ids:  | 
781  | 
_mod_revision.check_not_reserved_id(revision_id)  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
782  | 
|
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
783  | 
if len(revision_ids) > 0:  | 
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
784  | 
self.set_last_revision(revision_ids[0])  | 
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
785  | 
else:  | 
| 
2598.5.3
by Aaron Bentley
 Push NULL_REVISION deeper  | 
786  | 
self.set_last_revision(_mod_revision.NULL_REVISION)  | 
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
787  | 
|
788  | 
self._set_merges_from_parent_ids(revision_ids)  | 
|
| 
1908.5.5
by Robert Collins
 Add WorkingTree.set_parent_ids.  | 
789  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
790  | 
    @needs_tree_write_lock
 | 
| 
1908.5.9
by Robert Collins
 Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.  | 
791  | 
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
792  | 
"""See MutableTree.set_parent_trees."""  | 
| 
2858.2.1
by Martin Pool
 Remove most calls to safe_file_id and safe_revision_id.  | 
793  | 
parent_ids = [rev for (rev, tree) in parents_list]  | 
| 
2598.5.2
by Aaron Bentley
 Got all tests passing with Branch returning 'null:' for null revision  | 
794  | 
for revision_id in parent_ids:  | 
795  | 
_mod_revision.check_not_reserved_id(revision_id)  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
796  | 
|
797  | 
self._check_parents_for_ghosts(parent_ids,  | 
|
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
798  | 
allow_leftmost_as_ghost=allow_leftmost_as_ghost)  | 
| 
1908.5.2
by Robert Collins
 Create and test set_parent_trees.  | 
799  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
800  | 
if len(parent_ids) == 0:  | 
| 
2598.5.3
by Aaron Bentley
 Push NULL_REVISION deeper  | 
801  | 
leftmost_parent_id = _mod_revision.NULL_REVISION  | 
| 
2041.1.3
by John Arbash Meinel
 Call _cache_basis_inventory directly rather than set_last_revision  | 
802  | 
leftmost_parent_tree = None  | 
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
803  | 
else:  | 
804  | 
leftmost_parent_id, leftmost_parent_tree = parents_list[0]  | 
|
805  | 
||
| 
2041.1.3
by John Arbash Meinel
 Call _cache_basis_inventory directly rather than set_last_revision  | 
806  | 
if self._change_last_revision(leftmost_parent_id):  | 
807  | 
if leftmost_parent_tree is None:  | 
|
| 
2041.1.4
by John Arbash Meinel
 NEWS and documentation  | 
808  | 
                # If we don't have a tree, fall back to reading the
 | 
809  | 
                # parent tree from the repository.
 | 
|
| 
2041.1.3
by John Arbash Meinel
 Call _cache_basis_inventory directly rather than set_last_revision  | 
810  | 
self._cache_basis_inventory(leftmost_parent_id)  | 
811  | 
else:  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
812  | 
inv = leftmost_parent_tree.inventory  | 
813  | 
xml = self._create_basis_xml_from_inventory(  | 
|
814  | 
leftmost_parent_id, inv)  | 
|
815  | 
self._write_basis_inventory(xml)  | 
|
816  | 
self._set_merges_from_parent_ids(parent_ids)  | 
|
817  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
818  | 
    @needs_tree_write_lock
 | 
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
819  | 
def set_pending_merges(self, rev_list):  | 
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
820  | 
parents = self.get_parent_ids()  | 
821  | 
leftmost = parents[:1]  | 
|
822  | 
new_parents = leftmost + rev_list  | 
|
823  | 
self.set_parent_ids(new_parents)  | 
|
| 
1457.1.16
by Robert Collins
 Move set_pending_merges to WorkingTree.  | 
824  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
825  | 
    @needs_tree_write_lock
 | 
| 
1534.7.192
by Aaron Bentley
 Record hashes produced by merges  | 
826  | 
def set_merge_modified(self, modified_hashes):  | 
| 
1534.10.3
by Aaron Bentley
 Simplify set_merge_modified with rio_file  | 
827  | 
def iter_stanzas():  | 
828  | 
for file_id, hash in modified_hashes.iteritems():  | 
|
| 
2294.1.10
by John Arbash Meinel
 Switch all apis over to utf8 file ids. All tests pass  | 
829  | 
yield Stanza(file_id=file_id.decode('utf8'), hash=hash)  | 
| 
1534.10.3
by Aaron Bentley
 Simplify set_merge_modified with rio_file  | 
830  | 
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)  | 
831  | 
||
| 
2776.1.8
by Robert Collins
 Retrieve the sha from the dirstate for path_content_summary on hash cache hits; slight performance hit but a big win for incremental commits.  | 
832  | 
def _sha_from_stat(self, path, stat_result):  | 
833  | 
"""Get a sha digest from the tree's stat cache.  | 
|
834  | 
||
835  | 
        The default implementation assumes no stat cache is present.
 | 
|
836  | 
||
837  | 
        :param path: The path.
 | 
|
838  | 
        :param stat_result: The stat result being looked up.
 | 
|
839  | 
        """
 | 
|
840  | 
return None  | 
|
841  | 
||
| 
1534.10.3
by Aaron Bentley
 Simplify set_merge_modified with rio_file  | 
842  | 
def _put_rio(self, filename, stanzas, header):  | 
| 
2298.1.1
by Martin Pool
 Add test for merge_modified  | 
843  | 
self._must_be_locked()  | 
| 
1534.10.3
by Aaron Bentley
 Simplify set_merge_modified with rio_file  | 
844  | 
my_file = rio_file(stanzas, header)  | 
845  | 
self._control_files.put(filename, my_file)  | 
|
| 
1534.7.192
by Aaron Bentley
 Record hashes produced by merges  | 
846  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
847  | 
@needs_write_lock # because merge pulls data into the branch.  | 
| 
1551.15.69
by Aaron Bentley
 Add merge_type to merge_from_branch  | 
848  | 
def merge_from_branch(self, branch, to_revision=None, from_revision=None,  | 
849  | 
merge_type=None):  | 
|
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
850  | 
"""Merge from a branch into this working tree.  | 
851  | 
||
852  | 
        :param branch: The branch to merge from.
 | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
853  | 
        :param to_revision: If non-None, the merge will merge to to_revision,
 | 
854  | 
            but not beyond it. to_revision does not need to be in the history
 | 
|
| 
2206.1.7
by Marius Kruger
 * errors  | 
855  | 
            of the branch when it is supplied. If None, to_revision defaults to
 | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
856  | 
            branch.last_revision().
 | 
857  | 
        """
 | 
|
858  | 
from bzrlib.merge import Merger, Merge3Merger  | 
|
859  | 
pb = bzrlib.ui.ui_factory.nested_progress_bar()  | 
|
860  | 
try:  | 
|
861  | 
merger = Merger(self.branch, this_tree=self, pb=pb)  | 
|
862  | 
merger.pp = ProgressPhase("Merge phase", 5, pb)  | 
|
863  | 
merger.pp.next_phase()  | 
|
864  | 
            # check that there are no
 | 
|
865  | 
            # local alterations
 | 
|
866  | 
merger.check_basis(check_clean=True, require_commits=False)  | 
|
867  | 
if to_revision is None:  | 
|
| 
2598.5.4
by Aaron Bentley
 Restore original Branch.last_revision behavior, fix bits that care  | 
868  | 
to_revision = _mod_revision.ensure_null(branch.last_revision())  | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
869  | 
merger.other_rev_id = to_revision  | 
| 
2598.5.2
by Aaron Bentley
 Got all tests passing with Branch returning 'null:' for null revision  | 
870  | 
if _mod_revision.is_null(merger.other_rev_id):  | 
| 
2490.2.28
by Aaron Bentley
 Fix handling of null revision  | 
871  | 
raise errors.NoCommits(branch)  | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
872  | 
self.branch.fetch(branch, last_revision=merger.other_rev_id)  | 
873  | 
merger.other_basis = merger.other_rev_id  | 
|
874  | 
merger.other_tree = self.branch.repository.revision_tree(  | 
|
875  | 
merger.other_rev_id)  | 
|
| 
2100.3.29
by Aaron Bentley
 Get merge working initially  | 
876  | 
merger.other_branch = branch  | 
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
877  | 
merger.pp.next_phase()  | 
| 
1551.15.68
by Aaron Bentley
 Add support for base to merge_from_branch  | 
878  | 
if from_revision is None:  | 
879  | 
merger.find_base()  | 
|
880  | 
else:  | 
|
881  | 
merger.set_base_revision(from_revision, branch)  | 
|
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
882  | 
if merger.base_rev_id == merger.other_rev_id:  | 
883  | 
raise errors.PointlessMerge  | 
|
884  | 
merger.backup_files = False  | 
|
| 
1551.15.69
by Aaron Bentley
 Add merge_type to merge_from_branch  | 
885  | 
if merge_type is None:  | 
886  | 
merger.merge_type = Merge3Merger  | 
|
887  | 
else:  | 
|
888  | 
merger.merge_type = merge_type  | 
|
| 
1979.2.1
by Robert Collins
 (robertc) adds a convenience method "merge_from_branch" to WorkingTree.  | 
889  | 
merger.set_interesting_files(None)  | 
890  | 
merger.show_base = False  | 
|
891  | 
merger.reprocess = False  | 
|
892  | 
conflicts = merger.do_merge()  | 
|
893  | 
merger.set_pending()  | 
|
894  | 
finally:  | 
|
895  | 
pb.finished()  | 
|
896  | 
return conflicts  | 
|
897  | 
||
| 
2255.2.156
by Martin Pool
 Merge WorkingTree implementation back from trunk  | 
898  | 
    @needs_read_lock
 | 
899  | 
def merge_modified(self):  | 
|
| 
2298.1.1
by Martin Pool
 Add test for merge_modified  | 
900  | 
"""Return a dictionary of files modified by a merge.  | 
901  | 
||
902  | 
        The list is initialized by WorkingTree.set_merge_modified, which is 
 | 
|
903  | 
        typically called after we make some automatic updates to the tree
 | 
|
904  | 
        because of a merge.
 | 
|
905  | 
||
906  | 
        This returns a map of file_id->sha1, containing only files which are
 | 
|
907  | 
        still in the working inventory and have that text hash.
 | 
|
908  | 
        """
 | 
|
| 
2255.2.156
by Martin Pool
 Merge WorkingTree implementation back from trunk  | 
909  | 
try:  | 
910  | 
hashfile = self._control_files.get('merge-hashes')  | 
|
911  | 
except errors.NoSuchFile:  | 
|
912  | 
return {}  | 
|
913  | 
merge_hashes = {}  | 
|
914  | 
try:  | 
|
915  | 
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':  | 
|
916  | 
raise errors.MergeModifiedFormatError()  | 
|
917  | 
except StopIteration:  | 
|
918  | 
raise errors.MergeModifiedFormatError()  | 
|
919  | 
for s in RioReader(hashfile):  | 
|
| 
2309.4.9
by John Arbash Meinel
 WorkingTree.merged_modified() needs to switch back to utf8 file ids.  | 
920  | 
            # RioReader reads in Unicode, so convert file_ids back to utf8
 | 
921  | 
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)  | 
|
| 
2255.2.156
by Martin Pool
 Merge WorkingTree implementation back from trunk  | 
922  | 
if file_id not in self.inventory:  | 
923  | 
                continue
 | 
|
| 
2298.1.1
by Martin Pool
 Add test for merge_modified  | 
924  | 
text_hash = s.get("hash")  | 
925  | 
if text_hash == self.get_file_sha1(file_id):  | 
|
926  | 
merge_hashes[file_id] = text_hash  | 
|
| 
2255.2.156
by Martin Pool
 Merge WorkingTree implementation back from trunk  | 
927  | 
return merge_hashes  | 
928  | 
||
929  | 
    @needs_write_lock
 | 
|
930  | 
def mkdir(self, path, file_id=None):  | 
|
931  | 
"""See MutableTree.mkdir()."""  | 
|
932  | 
if file_id is None:  | 
|
933  | 
file_id = generate_ids.gen_file_id(os.path.basename(path))  | 
|
934  | 
os.mkdir(self.abspath(path))  | 
|
935  | 
self.add(path, file_id, 'directory')  | 
|
936  | 
return file_id  | 
|
937  | 
||
938  | 
def get_symlink_target(self, file_id):  | 
|
939  | 
return os.readlink(self.id2abspath(file_id))  | 
|
940  | 
||
| 
1731.2.1
by Aaron Bentley
 Initial subsume implementation  | 
941  | 
    @needs_write_lock
 | 
942  | 
def subsume(self, other_tree):  | 
|
| 
1731.2.4
by Aaron Bentley
 Ensure subsume works with Knit2 repos  | 
943  | 
def add_children(inventory, entry):  | 
944  | 
for child_entry in entry.children.values():  | 
|
945  | 
inventory._byid[child_entry.file_id] = child_entry  | 
|
946  | 
if child_entry.kind == 'directory':  | 
|
947  | 
add_children(inventory, child_entry)  | 
|
| 
1731.2.2
by Aaron Bentley
 Test subsume failure modes  | 
948  | 
if other_tree.get_root_id() == self.get_root_id():  | 
| 
2255.2.194
by Robert Collins
 [BROKEN] Many updates to stop using experimental formats in tests.  | 
949  | 
raise errors.BadSubsumeSource(self, other_tree,  | 
| 
1731.2.2
by Aaron Bentley
 Test subsume failure modes  | 
950  | 
'Trees have the same root')  | 
951  | 
try:  | 
|
952  | 
other_tree_path = self.relpath(other_tree.basedir)  | 
|
953  | 
except errors.PathNotChild:  | 
|
| 
2255.2.194
by Robert Collins
 [BROKEN] Many updates to stop using experimental formats in tests.  | 
954  | 
raise errors.BadSubsumeSource(self, other_tree,  | 
| 
1731.2.2
by Aaron Bentley
 Test subsume failure modes  | 
955  | 
'Tree is not contained by the other')  | 
| 
1731.2.4
by Aaron Bentley
 Ensure subsume works with Knit2 repos  | 
956  | 
new_root_parent = self.path2id(osutils.dirname(other_tree_path))  | 
957  | 
if new_root_parent is None:  | 
|
| 
2255.2.194
by Robert Collins
 [BROKEN] Many updates to stop using experimental formats in tests.  | 
958  | 
raise errors.BadSubsumeSource(self, other_tree,  | 
| 
1731.2.3
by Aaron Bentley
 Handle unversioned parents during subsume  | 
959  | 
'Parent directory is not versioned.')  | 
| 
1731.2.5
by Aaron Bentley
 Ensure versionedfile will be produced for subsumed tree root  | 
960  | 
        # We need to ensure that the result of a fetch will have a
 | 
961  | 
        # versionedfile for the other_tree root, and only fetching into
 | 
|
962  | 
        # RepositoryKnit2 guarantees that.
 | 
|
| 
1731.2.10
by Aaron Bentley
 Change test for rich root data  | 
963  | 
if not self.branch.repository.supports_rich_root():  | 
| 
1731.2.5
by Aaron Bentley
 Ensure versionedfile will be produced for subsumed tree root  | 
964  | 
raise errors.SubsumeTargetNeedsUpgrade(other_tree)  | 
| 
1731.2.4
by Aaron Bentley
 Ensure subsume works with Knit2 repos  | 
965  | 
other_tree.lock_tree_write()  | 
966  | 
try:  | 
|
| 
2255.2.194
by Robert Collins
 [BROKEN] Many updates to stop using experimental formats in tests.  | 
967  | 
new_parents = other_tree.get_parent_ids()  | 
| 
1731.2.4
by Aaron Bentley
 Ensure subsume works with Knit2 repos  | 
968  | 
other_root = other_tree.inventory.root  | 
969  | 
other_root.parent_id = new_root_parent  | 
|
970  | 
other_root.name = osutils.basename(other_tree_path)  | 
|
971  | 
self.inventory.add(other_root)  | 
|
972  | 
add_children(self.inventory, other_root)  | 
|
973  | 
self._write_inventory(self.inventory)  | 
|
| 
2255.14.1
by Martin Pool
 Add BzrDir.retire_bzrdir and partly fix subsume  | 
974  | 
            # normally we don't want to fetch whole repositories, but i think
 | 
975  | 
            # here we really do want to consolidate the whole thing.
 | 
|
| 
2255.2.194
by Robert Collins
 [BROKEN] Many updates to stop using experimental formats in tests.  | 
976  | 
for parent_id in other_tree.get_parent_ids():  | 
977  | 
self.branch.fetch(other_tree.branch, parent_id)  | 
|
978  | 
self.add_parent_tree_id(parent_id)  | 
|
| 
1731.2.4
by Aaron Bentley
 Ensure subsume works with Knit2 repos  | 
979  | 
finally:  | 
980  | 
other_tree.unlock()  | 
|
| 
2255.2.214
by Robert Collins
 Get _iter_changes on dirstate passing the subtree tests.  | 
981  | 
other_tree.bzrdir.retire_bzrdir()  | 
| 
1731.2.1
by Aaron Bentley
 Initial subsume implementation  | 
982  | 
|
| 
2776.1.7
by Robert Collins
 * New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a  | 
983  | 
def _directory_is_tree_reference(self, relpath):  | 
984  | 
        # as a special case, if a directory contains control files then 
 | 
|
985  | 
        # it's a tree reference, except that the root of the tree is not
 | 
|
986  | 
return relpath and osutils.isdir(self.abspath(relpath) + u"/.bzr")  | 
|
987  | 
        # TODO: We could ask all the control formats whether they
 | 
|
988  | 
        # recognize this directory, but at the moment there's no cheap api
 | 
|
989  | 
        # to do that.  Since we probably can only nest bzr checkouts and
 | 
|
990  | 
        # they always use this name it's ok for now.  -- mbp 20060306
 | 
|
991  | 
        #
 | 
|
992  | 
        # FIXME: There is an unhandled case here of a subdirectory
 | 
|
993  | 
        # containing .bzr but not a branch; that will probably blow up
 | 
|
994  | 
        # when you try to commit it.  It might happen if there is a
 | 
|
995  | 
        # checkout in a subdirectory.  This can be avoided by not adding
 | 
|
996  | 
        # it.  mbp 20070306
 | 
|
997  | 
||
| 
1731.2.16
by Aaron Bentley
 Get extract working for standalone trees  | 
998  | 
    @needs_tree_write_lock
 | 
| 
1731.2.17
by Aaron Bentley
 Support extracting with checkouts  | 
999  | 
def extract(self, file_id, format=None):  | 
| 
1731.2.16
by Aaron Bentley
 Get extract working for standalone trees  | 
1000  | 
"""Extract a subtree from this tree.  | 
1001  | 
        
 | 
|
1002  | 
        A new branch will be created, relative to the path for this tree.
 | 
|
1003  | 
        """
 | 
|
| 
1551.10.26
by Aaron Bentley
 Allow extract when tree is locked  | 
1004  | 
self.flush()  | 
| 
1731.2.17
by Aaron Bentley
 Support extracting with checkouts  | 
1005  | 
def mkdirs(path):  | 
1006  | 
segments = osutils.splitpath(path)  | 
|
1007  | 
transport = self.branch.bzrdir.root_transport  | 
|
1008  | 
for name in segments:  | 
|
1009  | 
transport = transport.clone(name)  | 
|
| 
2475.3.3
by John Arbash Meinel
 Change calls to try/mkdir('.')/except FileExists to ensure_base()  | 
1010  | 
transport.ensure_base()  | 
| 
1731.2.17
by Aaron Bentley
 Support extracting with checkouts  | 
1011  | 
return transport  | 
1012  | 
||
| 
1731.2.16
by Aaron Bentley
 Get extract working for standalone trees  | 
1013  | 
sub_path = self.id2path(file_id)  | 
| 
1731.2.17
by Aaron Bentley
 Support extracting with checkouts  | 
1014  | 
branch_transport = mkdirs(sub_path)  | 
1015  | 
if format is None:  | 
|
| 
2255.2.194
by Robert Collins
 [BROKEN] Many updates to stop using experimental formats in tests.  | 
1016  | 
format = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')  | 
| 
2475.3.3
by John Arbash Meinel
 Change calls to try/mkdir('.')/except FileExists to ensure_base()  | 
1017  | 
branch_transport.ensure_base()  | 
| 
1731.2.16
by Aaron Bentley
 Get extract working for standalone trees  | 
1018  | 
branch_bzrdir = format.initialize_on_transport(branch_transport)  | 
1019  | 
try:  | 
|
1020  | 
repo = branch_bzrdir.find_repository()  | 
|
1021  | 
except errors.NoRepositoryPresent:  | 
|
1022  | 
repo = branch_bzrdir.create_repository()  | 
|
1023  | 
assert repo.supports_rich_root()  | 
|
1024  | 
else:  | 
|
1025  | 
if not repo.supports_rich_root():  | 
|
| 
1731.2.18
by Aaron Bentley
 Get extract in repository under test  | 
1026  | 
raise errors.RootNotRich()  | 
| 
1731.2.16
by Aaron Bentley
 Get extract working for standalone trees  | 
1027  | 
new_branch = branch_bzrdir.create_branch()  | 
| 
1731.2.21
by Aaron Bentley
 Ensure extracting a subtree dupes the branch  | 
1028  | 
new_branch.pull(self.branch)  | 
| 
1731.2.16
by Aaron Bentley
 Get extract working for standalone trees  | 
1029  | 
for parent_id in self.get_parent_ids():  | 
1030  | 
new_branch.fetch(self.branch, parent_id)  | 
|
1031  | 
tree_transport = self.bzrdir.root_transport.clone(sub_path)  | 
|
1032  | 
if tree_transport.base != branch_transport.base:  | 
|
1033  | 
tree_bzrdir = format.initialize_on_transport(tree_transport)  | 
|
| 
1731.2.17
by Aaron Bentley
 Support extracting with checkouts  | 
1034  | 
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)  | 
| 
1731.2.16
by Aaron Bentley
 Get extract working for standalone trees  | 
1035  | 
else:  | 
1036  | 
tree_bzrdir = branch_bzrdir  | 
|
| 
1731.2.18
by Aaron Bentley
 Get extract in repository under test  | 
1037  | 
wt = tree_bzrdir.create_workingtree(NULL_REVISION)  | 
| 
1731.2.16
by Aaron Bentley
 Get extract working for standalone trees  | 
1038  | 
wt.set_parent_ids(self.get_parent_ids())  | 
1039  | 
my_inv = self.inventory  | 
|
1040  | 
child_inv = Inventory(root_id=None)  | 
|
1041  | 
new_root = my_inv[file_id]  | 
|
1042  | 
my_inv.remove_recursive_id(file_id)  | 
|
1043  | 
new_root.parent_id = None  | 
|
1044  | 
child_inv.add(new_root)  | 
|
1045  | 
self._write_inventory(my_inv)  | 
|
1046  | 
wt._write_inventory(child_inv)  | 
|
1047  | 
return wt  | 
|
1048  | 
||
| 
2255.2.152
by Martin Pool
 (broken) merge aaron's workingtree format changes  | 
1049  | 
def _serialize(self, inventory, out_file):  | 
| 
2817.2.1
by Robert Collins
 * Inventory serialisation no longer double-sha's the content.  | 
1050  | 
xml5.serializer_v5.write_inventory(self._inventory, out_file,  | 
1051  | 
working=True)  | 
|
| 
2255.2.152
by Martin Pool
 (broken) merge aaron's workingtree format changes  | 
1052  | 
|
1053  | 
def _deserialize(selt, in_file):  | 
|
1054  | 
return xml5.serializer_v5.read_inventory(in_file)  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1055  | 
|
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
1056  | 
def flush(self):  | 
1057  | 
"""Write the in memory inventory to disk."""  | 
|
1058  | 
        # TODO: Maybe this should only write on dirty ?
 | 
|
1059  | 
if self._control_files._lock_mode != 'w':  | 
|
1060  | 
raise errors.NotWriteLocked(self)  | 
|
1061  | 
sio = StringIO()  | 
|
| 
2100.3.10
by Aaron Bentley
 Ensure added references are serialized properly, beef up Workingtreee3  | 
1062  | 
self._serialize(self._inventory, sio)  | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
1063  | 
sio.seek(0)  | 
1064  | 
self._control_files.put('inventory', sio)  | 
|
1065  | 
self._inventory_is_modified = False  | 
|
1066  | 
||
| 
1551.10.29
by Aaron Bentley
 Fix tree.list_files when file kind changes  | 
1067  | 
def _kind(self, relpath):  | 
1068  | 
return osutils.file_kind(self.abspath(relpath))  | 
|
1069  | 
||
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
1070  | 
def list_files(self, include_root=False):  | 
| 
1732.1.6
by John Arbash Meinel
 Fix documentation bug in workingtree.list_files  | 
1071  | 
"""Recursively list all files as (path, class, kind, id, entry).  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1072  | 
|
1073  | 
        Lists, but does not descend into unversioned directories.
 | 
|
1074  | 
||
1075  | 
        This does not include files that have been deleted in this
 | 
|
1076  | 
        tree.
 | 
|
1077  | 
||
1078  | 
        Skips the control directory.
 | 
|
1079  | 
        """
 | 
|
| 
2255.2.60
by John Arbash Meinel
 Add an explicit exception since tree.list_files() requires a lock (at least for dirstate  | 
1080  | 
        # list_files is an iterator, so @needs_read_lock doesn't work properly
 | 
1081  | 
        # with it. So callers should be careful to always read_lock the tree.
 | 
|
1082  | 
if not self.is_locked():  | 
|
1083  | 
raise errors.ObjectNotLocked(self)  | 
|
1084  | 
||
| 
2255.2.52
by Robert Collins
 Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.  | 
1085  | 
inv = self.inventory  | 
| 
1910.2.56
by Aaron Bentley
 More work on bundles  | 
1086  | 
if include_root is True:  | 
1087  | 
yield ('', 'V', 'directory', inv.root.file_id, inv.root)  | 
|
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
1088  | 
        # Convert these into local objects to save lookup times
 | 
| 
1836.1.22
by John Arbash Meinel
 [merge] bzr.dev 1861  | 
1089  | 
pathjoin = osutils.pathjoin  | 
| 
1551.10.29
by Aaron Bentley
 Fix tree.list_files when file kind changes  | 
1090  | 
file_kind = self._kind  | 
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
1091  | 
|
1092  | 
        # transport.base ends in a slash, we want the piece
 | 
|
1093  | 
        # between the last two slashes
 | 
|
1094  | 
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]  | 
|
1095  | 
||
| 
1732.1.11
by John Arbash Meinel
 Trying multiple things to get WorkingTree.list_files time down  | 
1096  | 
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}  | 
1097  | 
||
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
1098  | 
        # directory file_id, relative path, absolute path, reverse sorted children
 | 
1099  | 
children = os.listdir(self.basedir)  | 
|
1100  | 
children.sort()  | 
|
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
1101  | 
        # jam 20060527 The kernel sized tree seems equivalent whether we 
 | 
1102  | 
        # use a deque and popleft to keep them sorted, or if we use a plain
 | 
|
1103  | 
        # 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.  | 
1104  | 
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  | 
1105  | 
stack = [(inv.root.file_id, u'', self.basedir, children)]  | 
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
1106  | 
while stack:  | 
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
1107  | 
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  | 
1108  | 
|
1109  | 
while children:  | 
|
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
1110  | 
f = children.popleft()  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1111  | 
                ## TODO: If we find a subdirectory with its own .bzr
 | 
1112  | 
                ## directory, then that is a separate tree and we
 | 
|
1113  | 
                ## should exclude it.
 | 
|
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
1114  | 
|
1115  | 
                # the bzrdir for this tree
 | 
|
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
1116  | 
if transport_base_dir == f:  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1117  | 
                    continue
 | 
1118  | 
||
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
1119  | 
                # we know that from_dir_relpath and from_dir_abspath never end in a slash
 | 
1120  | 
                # 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  | 
1121  | 
                # than the checks of pathjoin(), all relative paths will have an extra slash
 | 
1122  | 
                # at the beginning
 | 
|
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
1123  | 
fp = from_dir_relpath + '/' + f  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1124  | 
|
1125  | 
                # absolute path
 | 
|
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
1126  | 
fap = from_dir_abspath + '/' + f  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1127  | 
|
1128  | 
f_ie = inv.get_child(from_dir_id, f)  | 
|
1129  | 
if f_ie:  | 
|
1130  | 
c = 'V'  | 
|
| 
1551.6.36
by Aaron Bentley
 Revert --debris/--detritus changes  | 
1131  | 
elif self.is_ignored(fp[1:]):  | 
1132  | 
c = 'I'  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1133  | 
else:  | 
| 
1830.3.3
by John Arbash Meinel
 inside workingtree check for normalized filename access  | 
1134  | 
                    # we may not have found this file, because of a unicode issue
 | 
1135  | 
f_norm, can_access = osutils.normalized_filename(f)  | 
|
1136  | 
if f == f_norm or not can_access:  | 
|
1137  | 
                        # No change, so treat this file normally
 | 
|
1138  | 
c = '?'  | 
|
1139  | 
else:  | 
|
1140  | 
                        # this file can be accessed by a normalized path
 | 
|
1141  | 
                        # check again if it is versioned
 | 
|
1142  | 
                        # these lines are repeated here for performance
 | 
|
1143  | 
f = f_norm  | 
|
1144  | 
fp = from_dir_relpath + '/' + f  | 
|
1145  | 
fap = from_dir_abspath + '/' + f  | 
|
1146  | 
f_ie = inv.get_child(from_dir_id, f)  | 
|
1147  | 
if f_ie:  | 
|
1148  | 
c = 'V'  | 
|
1149  | 
elif self.is_ignored(fp[1:]):  | 
|
1150  | 
c = 'I'  | 
|
1151  | 
else:  | 
|
1152  | 
c = '?'  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1153  | 
|
1154  | 
fk = file_kind(fap)  | 
|
1155  | 
||
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
1156  | 
                # make a last minute entry
 | 
1157  | 
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  | 
1158  | 
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  | 
1159  | 
else:  | 
| 
1732.1.11
by John Arbash Meinel
 Trying multiple things to get WorkingTree.list_files time down  | 
1160  | 
try:  | 
| 
1732.1.21
by John Arbash Meinel
 We don't need to strip off 2 characters, just do one, minor memory improvement  | 
1161  | 
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  | 
1162  | 
except KeyError:  | 
| 
1732.1.21
by John Arbash Meinel
 We don't need to strip off 2 characters, just do one, minor memory improvement  | 
1163  | 
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.  | 
1164  | 
                    continue
 | 
| 
1399.1.2
by Robert Collins
 push kind character creation into InventoryEntry and TreeEntry  | 
1165  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1166  | 
if fk != 'directory':  | 
1167  | 
                    continue
 | 
|
1168  | 
||
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
1169  | 
                # 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.  | 
1170  | 
new_children = os.listdir(fap)  | 
1171  | 
new_children.sort()  | 
|
1172  | 
new_children = collections.deque(new_children)  | 
|
1173  | 
stack.append((f_ie.file_id, fp, fap, new_children))  | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1174  | 
                # Break out of inner loop,
 | 
| 
2206.1.7
by Marius Kruger
 * errors  | 
1175  | 
                # so that we start outer loop with child
 | 
| 
1732.1.9
by John Arbash Meinel
 Non-recursive implementation of WorkingTree.list_files  | 
1176  | 
                break
 | 
| 
1732.1.22
by John Arbash Meinel
 Bug in list_files if the last entry in a directory is another directory  | 
1177  | 
else:  | 
1178  | 
                # 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.  | 
1179  | 
stack.pop()  | 
| 
1732.1.13
by John Arbash Meinel
 A large improvement from not popping the parent off until we have done all children.  | 
1180  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1181  | 
    @needs_tree_write_lock
 | 
| 
2123.3.8
by Steffen Eichenberg
 new parameter to_dir must be a named parameter  | 
1182  | 
def move(self, from_paths, to_dir=None, after=False, **kwargs):  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1183  | 
"""Rename files.  | 
1184  | 
||
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1185  | 
        to_dir must exist in the inventory.
 | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1186  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1187  | 
        If to_dir exists and is a directory, the files are moved into
 | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1188  | 
        it, keeping their old names.  
 | 
1189  | 
||
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1190  | 
        Note that to_dir is only the last component of the new name;
 | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1191  | 
        this doesn't change the directory.
 | 
1192  | 
||
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1193  | 
        For each entry in from_paths the move mode will be determined
 | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1194  | 
        independently.
 | 
1195  | 
||
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1196  | 
        The first mode moves the file in the filesystem and updates the
 | 
1197  | 
        inventory. The second mode only updates the inventory without
 | 
|
1198  | 
        touching the file on the filesystem. This is the new mode introduced
 | 
|
| 
2220.1.6
by Marius Kruger
 * change error message telling user about --after option sightly  | 
1199  | 
        in version 0.15.
 | 
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1200  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1201  | 
        move uses the second mode if 'after == True' and the target is not
 | 
1202  | 
        versioned but present in the working tree.
 | 
|
1203  | 
||
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1204  | 
        move uses the second mode if 'after == False' and the source is
 | 
1205  | 
        versioned but no longer in the working tree, and the target is not
 | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1206  | 
        versioned but present in the working tree.
 | 
1207  | 
||
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1208  | 
        move uses the first mode if 'after == False' and the source is
 | 
1209  | 
        versioned and present in the working tree, and the target is not
 | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1210  | 
        versioned and not present in the working tree.
 | 
1211  | 
||
1212  | 
        Everything else results in an error.
 | 
|
1213  | 
||
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1214  | 
        This returns a list of (from_path, to_path) pairs for each
 | 
| 
2220.1.6
by Marius Kruger
 * change error message telling user about --after option sightly  | 
1215  | 
        entry that is moved.
 | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1216  | 
        """
 | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1217  | 
rename_entries = []  | 
1218  | 
rename_tuples = []  | 
|
1219  | 
||
1220  | 
        # check for deprecated use of signature
 | 
|
1221  | 
if to_dir is None:  | 
|
1222  | 
to_dir = kwargs.get('to_name', None)  | 
|
1223  | 
if to_dir is None:  | 
|
1224  | 
raise TypeError('You must supply a target directory')  | 
|
1225  | 
else:  | 
|
1226  | 
symbol_versioning.warn('The parameter to_name was deprecated'  | 
|
1227  | 
' in version 0.13. Use to_dir instead',  | 
|
1228  | 
DeprecationWarning)  | 
|
1229  | 
||
1230  | 
        # check destination directory
 | 
|
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1231  | 
assert not isinstance(from_paths, basestring)  | 
1232  | 
inv = self.inventory  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1233  | 
to_abs = self.abspath(to_dir)  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1234  | 
if not isdir(to_abs):  | 
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1235  | 
raise errors.BzrMoveFailedError('',to_dir,  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1236  | 
errors.NotADirectory(to_abs))  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1237  | 
if not self.has_filename(to_dir):  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1238  | 
raise errors.BzrMoveFailedError('',to_dir,  | 
1239  | 
errors.NotInWorkingDirectory(to_dir))  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1240  | 
to_dir_id = inv.path2id(to_dir)  | 
| 
2123.3.6
by Steffen Eichenberg
 unified error messages  | 
1241  | 
if to_dir_id is None:  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1242  | 
raise errors.BzrMoveFailedError('',to_dir,  | 
1243  | 
errors.NotVersionedError(path=str(to_dir)))  | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1244  | 
|
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1245  | 
to_dir_ie = inv[to_dir_id]  | 
| 
1731.1.2
by Aaron Bentley
 Removed all remaining uses of root_directory  | 
1246  | 
if to_dir_ie.kind != 'directory':  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1247  | 
raise errors.BzrMoveFailedError('',to_dir,  | 
1248  | 
errors.NotADirectory(to_abs))  | 
|
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1249  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1250  | 
        # create rename entries and tuples
 | 
1251  | 
for from_rel in from_paths:  | 
|
1252  | 
from_tail = splitpath(from_rel)[-1]  | 
|
1253  | 
from_id = inv.path2id(from_rel)  | 
|
1254  | 
if from_id is None:  | 
|
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1255  | 
raise errors.BzrMoveFailedError(from_rel,to_dir,  | 
1256  | 
errors.NotVersionedError(path=str(from_rel)))  | 
|
| 
2206.1.4
by Marius Kruger
 Improved WorkingTree.move excptions. (as requested)  | 
1257  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1258  | 
from_entry = inv[from_id]  | 
1259  | 
from_parent_id = from_entry.parent_id  | 
|
1260  | 
to_rel = pathjoin(to_dir, from_tail)  | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1261  | 
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,  | 
| 
2123.3.2
by Steffen Eichenberg
 fixed the most obvious bugs  | 
1262  | 
from_id=from_id,  | 
1263  | 
from_tail=from_tail,  | 
|
1264  | 
from_parent_id=from_parent_id,  | 
|
1265  | 
to_rel=to_rel, to_tail=from_tail,  | 
|
1266  | 
to_parent_id=to_dir_id)  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1267  | 
rename_entries.append(rename_entry)  | 
1268  | 
rename_tuples.append((from_rel, to_rel))  | 
|
1269  | 
||
1270  | 
        # determine which move mode to use. checks also for movability
 | 
|
1271  | 
rename_entries = self._determine_mv_mode(rename_entries, after)  | 
|
1272  | 
||
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
1273  | 
original_modified = self._inventory_is_modified  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1274  | 
try:  | 
| 
2220.1.6
by Marius Kruger
 * change error message telling user about --after option sightly  | 
1275  | 
if len(from_paths):  | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
1276  | 
self._inventory_is_modified = True  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1277  | 
self._move(rename_entries)  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1278  | 
except:  | 
1279  | 
            # restore the inventory on error
 | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1280  | 
self._inventory_is_modified = original_modified  | 
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1281  | 
            raise
 | 
1282  | 
self._write_inventory(inv)  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1283  | 
return rename_tuples  | 
1284  | 
||
1285  | 
def _determine_mv_mode(self, rename_entries, after=False):  | 
|
1286  | 
"""Determines for each from-to pair if both inventory and working tree  | 
|
1287  | 
        or only the inventory has to be changed.
 | 
|
1288  | 
||
1289  | 
        Also does basic plausability tests.
 | 
|
1290  | 
        """
 | 
|
1291  | 
inv = self.inventory  | 
|
1292  | 
||
1293  | 
for rename_entry in rename_entries:  | 
|
1294  | 
            # store to local variables for easier reference
 | 
|
1295  | 
from_rel = rename_entry.from_rel  | 
|
1296  | 
from_id = rename_entry.from_id  | 
|
1297  | 
to_rel = rename_entry.to_rel  | 
|
1298  | 
to_id = inv.path2id(to_rel)  | 
|
1299  | 
only_change_inv = False  | 
|
1300  | 
||
1301  | 
            # check the inventory for source and destination
 | 
|
1302  | 
if from_id is None:  | 
|
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1303  | 
raise errors.BzrMoveFailedError(from_rel,to_rel,  | 
1304  | 
errors.NotVersionedError(path=str(from_rel)))  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1305  | 
if to_id is not None:  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1306  | 
raise errors.BzrMoveFailedError(from_rel,to_rel,  | 
1307  | 
errors.AlreadyVersionedError(path=str(to_rel)))  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1308  | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1309  | 
            # try to determine the mode for rename (only change inv or change
 | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1310  | 
            # inv and file system)
 | 
1311  | 
if after:  | 
|
1312  | 
if not self.has_filename(to_rel):  | 
|
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1313  | 
raise errors.BzrMoveFailedError(from_id,to_rel,  | 
1314  | 
errors.NoSuchFile(path=str(to_rel),  | 
|
1315  | 
extra="New file has not been created yet"))  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1316  | 
only_change_inv = True  | 
1317  | 
elif not self.has_filename(from_rel) and self.has_filename(to_rel):  | 
|
1318  | 
only_change_inv = True  | 
|
1319  | 
elif self.has_filename(from_rel) and not self.has_filename(to_rel):  | 
|
1320  | 
only_change_inv = False  | 
|
1321  | 
else:  | 
|
1322  | 
                # something is wrong, so lets determine what exactly
 | 
|
1323  | 
if not self.has_filename(from_rel) and \  | 
|
1324  | 
not self.has_filename(to_rel):  | 
|
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1325  | 
raise errors.BzrRenameFailedError(from_rel,to_rel,  | 
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1326  | 
errors.PathsDoNotExist(paths=(str(from_rel),  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1327  | 
str(to_rel))))  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1328  | 
else:  | 
| 
2220.1.11
by Marius Kruger
 * bzrlib/errors.py  | 
1329  | 
raise errors.RenameFailedFilesExist(from_rel, to_rel,  | 
1330  | 
extra="(Use --after to update the Bazaar id)")  | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1331  | 
rename_entry.only_change_inv = only_change_inv  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1332  | 
return rename_entries  | 
1333  | 
||
1334  | 
def _move(self, rename_entries):  | 
|
1335  | 
"""Moves a list of files.  | 
|
1336  | 
||
1337  | 
        Depending on the value of the flag 'only_change_inv', the
 | 
|
1338  | 
        file will be moved on the file system or not.
 | 
|
1339  | 
        """
 | 
|
1340  | 
inv = self.inventory  | 
|
1341  | 
moved = []  | 
|
1342  | 
||
1343  | 
for entry in rename_entries:  | 
|
1344  | 
try:  | 
|
1345  | 
self._move_entry(entry)  | 
|
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1346  | 
except:  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1347  | 
self._rollback_move(moved)  | 
1348  | 
                raise
 | 
|
1349  | 
moved.append(entry)  | 
|
1350  | 
||
1351  | 
def _rollback_move(self, moved):  | 
|
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1352  | 
"""Try to rollback a previous move in case of an filesystem error."""  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1353  | 
inv = self.inventory  | 
1354  | 
for entry in moved:  | 
|
1355  | 
try:  | 
|
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1356  | 
self._move_entry(_RenameEntry(entry.to_rel, entry.from_id,  | 
1357  | 
entry.to_tail, entry.to_parent_id, entry.from_rel,  | 
|
1358  | 
entry.from_tail, entry.from_parent_id,  | 
|
1359  | 
entry.only_change_inv))  | 
|
| 
2220.1.14
by Aaron Bentley
 Cleanup formatting and error handling  | 
1360  | 
except errors.BzrMoveFailedError, e:  | 
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1361  | 
raise errors.BzrMoveFailedError( '', '', "Rollback failed."  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1362  | 
                        " The working tree is in an inconsistent state."
 | 
1363  | 
                        " Please consider doing a 'bzr revert'."
 | 
|
| 
2220.1.14
by Aaron Bentley
 Cleanup formatting and error handling  | 
1364  | 
" Error message is: %s" % e)  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1365  | 
|
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1366  | 
def _move_entry(self, entry):  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1367  | 
inv = self.inventory  | 
1368  | 
from_rel_abs = self.abspath(entry.from_rel)  | 
|
1369  | 
to_rel_abs = self.abspath(entry.to_rel)  | 
|
1370  | 
if from_rel_abs == to_rel_abs:  | 
|
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1371  | 
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel,  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1372  | 
"Source and target are identical.")  | 
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1373  | 
|
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1374  | 
if not entry.only_change_inv:  | 
1375  | 
try:  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1376  | 
osutils.rename(from_rel_abs, to_rel_abs)  | 
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1377  | 
except OSError, e:  | 
1378  | 
raise errors.BzrMoveFailedError(entry.from_rel,  | 
|
1379  | 
entry.to_rel, e[1])  | 
|
1380  | 
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail)  | 
|
| 
1508.1.8
by Robert Collins
 move move() from Branch to WorkingTree.  | 
1381  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1382  | 
    @needs_tree_write_lock
 | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1383  | 
def rename_one(self, from_rel, to_rel, after=False):  | 
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
1384  | 
"""Rename one file.  | 
1385  | 
||
1386  | 
        This can change the directory or the filename or both.
 | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1387  | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1388  | 
        rename_one has several 'modes' to work. First, it can rename a physical
 | 
1389  | 
        file and change the file_id. That is the normal mode. Second, it can
 | 
|
1390  | 
        only change the file_id without touching any physical file. This is
 | 
|
1391  | 
        the new mode introduced in version 0.15.
 | 
|
1392  | 
||
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1393  | 
        rename_one uses the second mode if 'after == True' and 'to_rel' is not
 | 
1394  | 
        versioned but present in the working tree.
 | 
|
1395  | 
||
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1396  | 
        rename_one uses the second mode if 'after == False' and 'from_rel' is
 | 
1397  | 
        versioned but no longer in the working tree, and 'to_rel' is not
 | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1398  | 
        versioned but present in the working tree.
 | 
1399  | 
||
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1400  | 
        rename_one uses the first mode if 'after == False' and 'from_rel' is
 | 
1401  | 
        versioned and present in the working tree, and 'to_rel' is not
 | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1402  | 
        versioned and not present in the working tree.
 | 
1403  | 
||
1404  | 
        Everything else results in an error.
 | 
|
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
1405  | 
        """
 | 
1406  | 
inv = self.inventory  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1407  | 
rename_entries = []  | 
1408  | 
||
1409  | 
        # create rename entries and tuples
 | 
|
1410  | 
from_tail = splitpath(from_rel)[-1]  | 
|
1411  | 
from_id = inv.path2id(from_rel)  | 
|
1412  | 
if from_id is None:  | 
|
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1413  | 
raise errors.BzrRenameFailedError(from_rel,to_rel,  | 
1414  | 
errors.NotVersionedError(path=str(from_rel)))  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1415  | 
from_entry = inv[from_id]  | 
1416  | 
from_parent_id = from_entry.parent_id  | 
|
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
1417  | 
to_dir, to_tail = os.path.split(to_rel)  | 
1418  | 
to_dir_id = inv.path2id(to_dir)  | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1419  | 
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel,  | 
| 
2123.3.2
by Steffen Eichenberg
 fixed the most obvious bugs  | 
1420  | 
from_id=from_id,  | 
1421  | 
from_tail=from_tail,  | 
|
1422  | 
from_parent_id=from_parent_id,  | 
|
1423  | 
to_rel=to_rel, to_tail=to_tail,  | 
|
1424  | 
to_parent_id=to_dir_id)  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1425  | 
rename_entries.append(rename_entry)  | 
1426  | 
||
1427  | 
        # determine which move mode to use. checks also for movability
 | 
|
1428  | 
rename_entries = self._determine_mv_mode(rename_entries, after)  | 
|
1429  | 
||
1430  | 
        # check if the target changed directory and if the target directory is
 | 
|
1431  | 
        # versioned
 | 
|
| 
2123.3.6
by Steffen Eichenberg
 unified error messages  | 
1432  | 
if to_dir_id is None:  | 
| 
2206.1.9
by Marius Kruger
 * Change move/rename errors yet again  | 
1433  | 
raise errors.BzrMoveFailedError(from_rel,to_rel,  | 
1434  | 
errors.NotVersionedError(path=str(to_dir)))  | 
|
| 
2220.1.9
by Marius Kruger
 Remove all trailing white space this bundle would have  | 
1435  | 
|
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1436  | 
        # all checks done. now we can continue with our actual work
 | 
1437  | 
mutter('rename_one:\n'  | 
|
1438  | 
' from_id {%s}\n'  | 
|
1439  | 
' from_rel: %r\n'  | 
|
1440  | 
' to_rel: %r\n'  | 
|
1441  | 
' to_dir %r\n'  | 
|
1442  | 
' to_dir_id {%s}\n',  | 
|
1443  | 
from_id, from_rel, to_rel, to_dir, to_dir_id)  | 
|
1444  | 
||
1445  | 
self._move(rename_entries)  | 
|
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
1446  | 
self._write_inventory(inv)  | 
1447  | 
||
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1448  | 
class _RenameEntry(object):  | 
| 
2123.3.2
by Steffen Eichenberg
 fixed the most obvious bugs  | 
1449  | 
def __init__(self, from_rel, from_id, from_tail, from_parent_id,  | 
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1450  | 
to_rel, to_tail, to_parent_id, only_change_inv=False):  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1451  | 
self.from_rel = from_rel  | 
1452  | 
self.from_id = from_id  | 
|
1453  | 
self.from_tail = from_tail  | 
|
1454  | 
self.from_parent_id = from_parent_id  | 
|
1455  | 
self.to_rel = to_rel  | 
|
1456  | 
self.to_tail = to_tail  | 
|
1457  | 
self.to_parent_id = to_parent_id  | 
|
| 
2220.1.12
by Marius Kruger
 * Fix errors.py import order  | 
1458  | 
self.only_change_inv = only_change_inv  | 
| 
2123.3.1
by Steffen Eichenberg
 the mv command is now able to move files that have already been moved on the file system  | 
1459  | 
|
| 
1508.1.7
by Robert Collins
 Move rename_one from Branch to WorkingTree. (Robert Collins).  | 
1460  | 
    @needs_read_lock
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1461  | 
def unknowns(self):  | 
| 
1508.1.6
by Robert Collins
 Move Branch.unknowns() to WorkingTree.  | 
1462  | 
"""Return all unknown files.  | 
1463  | 
||
1464  | 
        These are files in the working directory that are not versioned or
 | 
|
1465  | 
        control files or ignored.
 | 
|
1466  | 
        """
 | 
|
| 
2255.2.15
by Robert Collins
 Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.  | 
1467  | 
        # force the extras method to be fully executed before returning, to 
 | 
1468  | 
        # prevent race conditions with the lock
 | 
|
1469  | 
return iter(  | 
|
1470  | 
[subp for subp in self.extras() if not self.is_ignored(subp)])  | 
|
| 
2323.6.1
by Martin Pool
 (broken) Give a message when opening old workingtree formats suggesting upgrade  | 
1471  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1472  | 
    @needs_tree_write_lock
 | 
| 
1988.2.1
by Robert Collins
 WorkingTree has a new api ``unversion`` which allow the unversioning of  | 
1473  | 
def unversion(self, file_ids):  | 
1474  | 
"""Remove the file ids in file_ids from the current versioned set.  | 
|
1475  | 
||
1476  | 
        When a file_id is unversioned, all of its children are automatically
 | 
|
1477  | 
        unversioned.
 | 
|
1478  | 
||
1479  | 
        :param file_ids: The file ids to stop versioning.
 | 
|
1480  | 
        :raises: NoSuchId if any fileid is not currently versioned.
 | 
|
1481  | 
        """
 | 
|
1482  | 
for file_id in file_ids:  | 
|
1483  | 
if self._inventory.has_id(file_id):  | 
|
| 
1988.2.6
by Robert Collins
 Review feedback.  | 
1484  | 
self._inventory.remove_recursive_id(file_id)  | 
| 
1988.2.1
by Robert Collins
 WorkingTree has a new api ``unversion`` which allow the unversioning of  | 
1485  | 
else:  | 
1486  | 
raise errors.NoSuchId(self, file_id)  | 
|
1487  | 
if len(file_ids):  | 
|
1488  | 
            # in the future this should just set a dirty bit to wait for the 
 | 
|
1489  | 
            # final unlock. However, until all methods of workingtree start
 | 
|
1490  | 
            # with the current in -memory inventory rather than triggering 
 | 
|
1491  | 
            # a read, it is more complex - we need to teach read_inventory
 | 
|
1492  | 
            # to know when to read, and when to not read first... and possibly
 | 
|
1493  | 
            # to save first when the in memory one may be corrupted.
 | 
|
1494  | 
            # so for now, we just only write it if it is indeed dirty.
 | 
|
1495  | 
            # - RBC 20060907
 | 
|
1496  | 
self._write_inventory(self._inventory)  | 
|
1497  | 
||
| 
1534.10.16
by Aaron Bentley
 Small tweaks  | 
1498  | 
@deprecated_method(zero_eight)  | 
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1499  | 
def iter_conflicts(self):  | 
| 
1534.10.16
by Aaron Bentley
 Small tweaks  | 
1500  | 
"""List all files in the tree that have text or content conflicts.  | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
1501  | 
        DEPRECATED.  Use conflicts instead."""
 | 
| 
1534.10.10
by Aaron Bentley
 Resolve uses the new stuff.  | 
1502  | 
return self._iter_conflicts()  | 
1503  | 
||
| 
1534.10.9
by Aaron Bentley
 Switched display functions to conflict_lines  | 
1504  | 
def _iter_conflicts(self):  | 
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1505  | 
conflicted = set()  | 
| 
1732.1.11
by John Arbash Meinel
 Trying multiple things to get WorkingTree.list_files time down  | 
1506  | 
for info in self.list_files():  | 
1507  | 
path = info[0]  | 
|
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1508  | 
stem = get_conflicted_stem(path)  | 
1509  | 
if stem is None:  | 
|
1510  | 
                continue
 | 
|
1511  | 
if stem not in conflicted:  | 
|
1512  | 
conflicted.add(stem)  | 
|
1513  | 
yield stem  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1514  | 
|
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1515  | 
    @needs_write_lock
 | 
| 
1551.11.10
by Aaron Bentley
 Add change reporting to pull  | 
1516  | 
def pull(self, source, overwrite=False, stop_revision=None,  | 
| 
2817.4.3
by Vincent Ladeuil
 Add tests for commit, reuse master branch transport.  | 
1517  | 
change_reporter=None, possible_transports=None):  | 
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
1518  | 
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().  | 
1519  | 
source.lock_read()  | 
1520  | 
try:  | 
|
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
1521  | 
pp = ProgressPhase("Pull phase", 2, top_pb)  | 
1522  | 
pp.next_phase()  | 
|
| 
2249.4.2
by Wouter van Heyst
 Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.  | 
1523  | 
old_revision_info = self.branch.last_revision_info()  | 
| 
1563.1.4
by Robert Collins
 Fix 'bzr pull' on metadir trees.  | 
1524  | 
basis_tree = self.basis_tree()  | 
| 
2817.4.3
by Vincent Ladeuil
 Add tests for commit, reuse master branch transport.  | 
1525  | 
count = self.branch.pull(source, overwrite, stop_revision,  | 
1526  | 
possible_transports=possible_transports)  | 
|
| 
2249.4.2
by Wouter van Heyst
 Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.  | 
1527  | 
new_revision_info = self.branch.last_revision_info()  | 
1528  | 
if new_revision_info != old_revision_info:  | 
|
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
1529  | 
pp.next_phase()  | 
| 
1185.67.2
by Aaron Bentley
 Renamed Branch.storage to Branch.repository  | 
1530  | 
repository = self.branch.repository  | 
| 
1594.1.3
by Robert Collins
 Fixup pb usage to use nested_progress_bar.  | 
1531  | 
pb = bzrlib.ui.ui_factory.nested_progress_bar()  | 
| 
2255.2.38
by Robert Collins
 Fix WorkingTree4.pull to work.  | 
1532  | 
basis_tree.lock_read()  | 
| 
1594.1.3
by Robert Collins
 Fixup pb usage to use nested_progress_bar.  | 
1533  | 
try:  | 
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1534  | 
new_basis_tree = self.branch.basis_tree()  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
1535  | 
merge.merge_inner(  | 
1536  | 
self.branch,  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1537  | 
new_basis_tree,  | 
1538  | 
basis_tree,  | 
|
1539  | 
this_tree=self,  | 
|
| 
1551.11.10
by Aaron Bentley
 Add change reporting to pull  | 
1540  | 
pb=pb,  | 
1541  | 
change_reporter=change_reporter)  | 
|
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
1542  | 
if (basis_tree.inventory.root is None and  | 
| 
1731.1.47
by Aaron Bentley
 Merge bzr.dev  | 
1543  | 
new_basis_tree.inventory.root is not None):  | 
1544  | 
self.set_root_id(new_basis_tree.inventory.root.file_id)  | 
|
| 
1594.1.3
by Robert Collins
 Fixup pb usage to use nested_progress_bar.  | 
1545  | 
finally:  | 
1546  | 
pb.finished()  | 
|
| 
2255.2.38
by Robert Collins
 Fix WorkingTree4.pull to work.  | 
1547  | 
basis_tree.unlock()  | 
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1548  | 
                # TODO - dedup parents list with things merged by pull ?
 | 
| 
1908.6.3
by Robert Collins
 Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.  | 
1549  | 
                # reuse the revisiontree we merged against to set the new
 | 
1550  | 
                # tree data.
 | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1551  | 
parent_trees = [(self.branch.last_revision(), new_basis_tree)]  | 
| 
1908.6.3
by Robert Collins
 Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.  | 
1552  | 
                # we have to pull the merge trees out again, because 
 | 
1553  | 
                # merge_inner has set the ids. - this corner is not yet 
 | 
|
1554  | 
                # layered well enough to prevent double handling.
 | 
|
| 
2255.2.38
by Robert Collins
 Fix WorkingTree4.pull to work.  | 
1555  | 
                # XXX TODO: Fix the double handling: telling the tree about
 | 
1556  | 
                # the already known parent data is wasteful.
 | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
1557  | 
merges = self.get_parent_ids()[1:]  | 
1558  | 
parent_trees.extend([  | 
|
1559  | 
(parent, repository.revision_tree(parent)) for  | 
|
1560  | 
parent in merges])  | 
|
1561  | 
self.set_parent_trees(parent_trees)  | 
|
| 
1185.33.44
by Martin Pool
 [patch] show number of revisions pushed/pulled/merged (Robey Pointer)  | 
1562  | 
return count  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1563  | 
finally:  | 
1564  | 
source.unlock()  | 
|
| 
1551.2.36
by Aaron Bentley
 Make pull update the progress bar more nicely  | 
1565  | 
top_pb.finished()  | 
| 
1442.1.67
by Robert Collins
 Factor out the guts of 'pull' from the command into WorkingTree.pull().  | 
1566  | 
|
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
1567  | 
    @needs_write_lock
 | 
1568  | 
def put_file_bytes_non_atomic(self, file_id, bytes):  | 
|
1569  | 
"""See MutableTree.put_file_bytes_non_atomic."""  | 
|
1570  | 
stream = file(self.id2abspath(file_id), 'wb')  | 
|
1571  | 
try:  | 
|
1572  | 
stream.write(bytes)  | 
|
1573  | 
finally:  | 
|
1574  | 
stream.close()  | 
|
1575  | 
        # TODO: update the hashcache here ?
 | 
|
1576  | 
||
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1577  | 
def extras(self):  | 
| 
2255.7.85
by Robert Collins
 Teach _iter_changes to gather unversioned path details upon request.  | 
1578  | 
"""Yield all unversioned files in this WorkingTree.  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1579  | 
|
| 
2255.7.85
by Robert Collins
 Teach _iter_changes to gather unversioned path details upon request.  | 
1580  | 
        If there are any unversioned directories then only the directory is
 | 
1581  | 
        returned, not all its children.  But if there are unversioned files
 | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1582  | 
        under a versioned subdirectory, they are returned.
 | 
1583  | 
||
1584  | 
        Currently returned depth-first, sorted by name within directories.
 | 
|
| 
2255.7.85
by Robert Collins
 Teach _iter_changes to gather unversioned path details upon request.  | 
1585  | 
        This is the same order used by 'osutils.walkdirs'.
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1586  | 
        """
 | 
1587  | 
        ## TODO: Work from given directory downwards
 | 
|
1588  | 
for path, dir_entry in self.inventory.directories():  | 
|
| 
1711.2.101
by John Arbash Meinel
 Clean up some unnecessary mutter() calls  | 
1589  | 
            # mutter("search for unknowns in %r", path)
 | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1590  | 
dirabs = self.abspath(path)  | 
1591  | 
if not isdir(dirabs):  | 
|
1592  | 
                # e.g. directory deleted
 | 
|
1593  | 
                continue
 | 
|
1594  | 
||
1595  | 
fl = []  | 
|
1596  | 
for subf in os.listdir(dirabs):  | 
|
| 
1830.3.3
by John Arbash Meinel
 inside workingtree check for normalized filename access  | 
1597  | 
if subf == '.bzr':  | 
1598  | 
                    continue
 | 
|
1599  | 
if subf not in dir_entry.children:  | 
|
1600  | 
subf_norm, can_access = osutils.normalized_filename(subf)  | 
|
1601  | 
if subf_norm != subf and can_access:  | 
|
1602  | 
if subf_norm not in dir_entry.children:  | 
|
1603  | 
fl.append(subf_norm)  | 
|
1604  | 
else:  | 
|
1605  | 
fl.append(subf)  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1606  | 
|
1607  | 
fl.sort()  | 
|
1608  | 
for subf in fl:  | 
|
| 
1732.1.1
by John Arbash Meinel
 deprecating appendpath, it does exactly what pathjoin does  | 
1609  | 
subp = pathjoin(path, subf)  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1610  | 
yield subp  | 
1611  | 
||
1612  | 
def ignored_files(self):  | 
|
1613  | 
"""Yield list of PATH, IGNORE_PATTERN"""  | 
|
1614  | 
for subp in self.extras():  | 
|
1615  | 
pat = self.is_ignored(subp)  | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
1616  | 
if pat is not None:  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1617  | 
yield subp, pat  | 
1618  | 
||
1619  | 
def get_ignore_list(self):  | 
|
1620  | 
"""Return list of ignore patterns.  | 
|
1621  | 
||
1622  | 
        Cached in the Tree object after the first call.
 | 
|
1623  | 
        """
 | 
|
| 
1836.1.30
by John Arbash Meinel
 Change ignore functions to use sets instead of lists.  | 
1624  | 
ignoreset = getattr(self, '_ignoreset', None)  | 
1625  | 
if ignoreset is not None:  | 
|
1626  | 
return ignoreset  | 
|
1627  | 
||
| 
2696.1.1
by Martin Pool
 Remove things deprecated in 0.11 and earlier  | 
1628  | 
ignore_globs = set()  | 
| 
1836.1.30
by John Arbash Meinel
 Change ignore functions to use sets instead of lists.  | 
1629  | 
ignore_globs.update(ignores.get_runtime_ignores())  | 
1630  | 
ignore_globs.update(ignores.get_user_ignores())  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1631  | 
if self.has_filename(bzrlib.IGNORE_FILENAME):  | 
1632  | 
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)  | 
|
| 
1836.1.4
by John Arbash Meinel
 Cleanup is_ignored to handle comment lines, and a global ignore pattern  | 
1633  | 
try:  | 
| 
1836.1.30
by John Arbash Meinel
 Change ignore functions to use sets instead of lists.  | 
1634  | 
ignore_globs.update(ignores.parse_ignore_file(f))  | 
| 
1836.1.4
by John Arbash Meinel
 Cleanup is_ignored to handle comment lines, and a global ignore pattern  | 
1635  | 
finally:  | 
1636  | 
f.close()  | 
|
| 
1836.1.30
by John Arbash Meinel
 Change ignore functions to use sets instead of lists.  | 
1637  | 
self._ignoreset = ignore_globs  | 
| 
1836.1.4
by John Arbash Meinel
 Cleanup is_ignored to handle comment lines, and a global ignore pattern  | 
1638  | 
return ignore_globs  | 
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1639  | 
|
| 
2135.2.7
by Kent Gibson
 Implement JAM's review suggestions.  | 
1640  | 
def _flush_ignore_list_cache(self):  | 
| 
2135.2.1
by Kent Gibson
 Added glob module to replace broken fnmatch based ignore pattern matching (#57637)  | 
1641  | 
"""Resets the cached ignore list to force a cache rebuild."""  | 
1642  | 
self._ignoreset = None  | 
|
1643  | 
self._ignoreglobster = None  | 
|
| 
1713.2.3
by Robert Collins
 Combine ignore rules into a single regex preventing pathological behaviour during add.  | 
1644  | 
|
| 
453
by Martin Pool
 - Split WorkingTree into its own file  | 
1645  | 
def is_ignored(self, filename):  | 
1646  | 
r"""Check whether the filename matches an ignore pattern.  | 
|
1647  | 
||
1648  | 
        Patterns containing '/' or '\' need to match the whole path;
 | 
|
1649  | 
        others match against only the last component.
 | 
|
1650  | 
||
1651  | 
        If the file is ignored, returns the pattern which caused it to
 | 
|
1652  | 
        be ignored, otherwise None.  So this can simply be used as a
 | 
|
1653  | 
        boolean if desired."""
 | 
|
| 
2135.2.1
by Kent Gibson
 Added glob module to replace broken fnmatch based ignore pattern matching (#57637)  | 
1654  | 
if getattr(self, '_ignoreglobster', None) is None:  | 
| 
2135.2.7
by Kent Gibson
 Implement JAM's review suggestions.  | 
1655  | 
self._ignoreglobster = globbing.Globster(self.get_ignore_list())  | 
| 
2135.2.1
by Kent Gibson
 Added glob module to replace broken fnmatch based ignore pattern matching (#57637)  | 
1656  | 
return self._ignoreglobster.match(filename)  | 
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
1657  | 
|
| 
1185.12.28
by Aaron Bentley
 Removed use of readonly path for executability test  | 
1658  | 
def kind(self, file_id):  | 
1659  | 
return file_kind(self.id2abspath(file_id))  | 
|
1660  | 
||
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
1661  | 
def _comparison_data(self, entry, path):  | 
1662  | 
abspath = self.abspath(path)  | 
|
1663  | 
try:  | 
|
1664  | 
stat_value = os.lstat(abspath)  | 
|
1665  | 
except OSError, e:  | 
|
1666  | 
if getattr(e, 'errno', None) == errno.ENOENT:  | 
|
1667  | 
stat_value = None  | 
|
1668  | 
kind = None  | 
|
1669  | 
executable = False  | 
|
1670  | 
else:  | 
|
1671  | 
                raise
 | 
|
1672  | 
else:  | 
|
1673  | 
mode = stat_value.st_mode  | 
|
1674  | 
kind = osutils.file_kind_from_stat_mode(mode)  | 
|
1675  | 
if not supports_executable():  | 
|
| 
2409.1.2
by Dmitry Vasiliev
 Used one-line conditional expression instead of the multi-line one  | 
1676  | 
executable = entry is not None and entry.executable  | 
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
1677  | 
else:  | 
1678  | 
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)  | 
|
1679  | 
return kind, executable, stat_value  | 
|
1680  | 
||
1681  | 
def _file_size(self, entry, stat_value):  | 
|
1682  | 
return stat_value.st_size  | 
|
1683  | 
||
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1684  | 
def last_revision(self):  | 
| 
1986.1.6
by Robert Collins
 Add MemoryTree.last_revision.  | 
1685  | 
"""Return the last revision of the branch for this tree.  | 
1686  | 
||
1687  | 
        This format tree does not support a separate marker for last-revision
 | 
|
1688  | 
        compared to the branch.
 | 
|
1689  | 
||
1690  | 
        See MutableTree.last_revision
 | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1691  | 
        """
 | 
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
1692  | 
return self._last_revision()  | 
1693  | 
||
1694  | 
    @needs_read_lock
 | 
|
1695  | 
def _last_revision(self):  | 
|
1696  | 
"""helper for get_parent_ids."""  | 
|
| 
2598.5.10
by Aaron Bentley
 Return NULL_REVISION instead of None for the null revision  | 
1697  | 
return _mod_revision.ensure_null(self.branch.last_revision())  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1698  | 
|
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
1699  | 
def is_locked(self):  | 
1700  | 
return self._control_files.is_locked()  | 
|
1701  | 
||
| 
2298.1.1
by Martin Pool
 Add test for merge_modified  | 
1702  | 
def _must_be_locked(self):  | 
1703  | 
if not self.is_locked():  | 
|
1704  | 
raise errors.ObjectNotLocked(self)  | 
|
1705  | 
||
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1706  | 
def lock_read(self):  | 
1707  | 
"""See Branch.lock_read, and WorkingTree.unlock."""  | 
|
| 
2255.2.204
by Robert Collins
 Fix info and status again.  | 
1708  | 
if not self.is_locked():  | 
1709  | 
self._reset_data()  | 
|
| 
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.  | 
1710  | 
self.branch.lock_read()  | 
1711  | 
try:  | 
|
1712  | 
return self._control_files.lock_read()  | 
|
1713  | 
except:  | 
|
1714  | 
self.branch.unlock()  | 
|
1715  | 
            raise
 | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1716  | 
|
| 
1997.1.1
by Robert Collins
 Add WorkingTree.lock_tree_write.  | 
1717  | 
def lock_tree_write(self):  | 
| 
1986.1.8
by Robert Collins
 Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.  | 
1718  | 
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""  | 
| 
2255.2.204
by Robert Collins
 Fix info and status again.  | 
1719  | 
if not self.is_locked():  | 
1720  | 
self._reset_data()  | 
|
| 
1997.1.1
by Robert Collins
 Add WorkingTree.lock_tree_write.  | 
1721  | 
self.branch.lock_read()  | 
1722  | 
try:  | 
|
1723  | 
return self._control_files.lock_write()  | 
|
1724  | 
except:  | 
|
1725  | 
self.branch.unlock()  | 
|
1726  | 
            raise
 | 
|
1727  | 
||
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1728  | 
def lock_write(self):  | 
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
1729  | 
"""See MutableTree.lock_write, and WorkingTree.unlock."""  | 
| 
2255.2.204
by Robert Collins
 Fix info and status again.  | 
1730  | 
if not self.is_locked():  | 
1731  | 
self._reset_data()  | 
|
| 
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.  | 
1732  | 
self.branch.lock_write()  | 
1733  | 
try:  | 
|
1734  | 
return self._control_files.lock_write()  | 
|
1735  | 
except:  | 
|
1736  | 
self.branch.unlock()  | 
|
1737  | 
            raise
 | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1738  | 
|
| 
1694.2.6
by Martin Pool
 [merge] bzr.dev  | 
1739  | 
def get_physical_lock_status(self):  | 
1740  | 
return self._control_files.get_physical_lock_status()  | 
|
1741  | 
||
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1742  | 
def _basis_inventory_name(self):  | 
| 
1910.2.31
by Aaron Bentley
 Fix bugs in basis inventory handling, change filename  | 
1743  | 
return 'basis-inventory-cache'  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1744  | 
|
| 
2255.2.204
by Robert Collins
 Fix info and status again.  | 
1745  | 
def _reset_data(self):  | 
1746  | 
"""Reset transient data that cannot be revalidated."""  | 
|
1747  | 
self._inventory_is_modified = False  | 
|
1748  | 
result = self._deserialize(self._control_files.get('inventory'))  | 
|
1749  | 
self._set_inventory(result, dirty=False)  | 
|
1750  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1751  | 
    @needs_tree_write_lock
 | 
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1752  | 
def set_last_revision(self, new_revision):  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1753  | 
"""Change the last revision in the working tree."""  | 
1754  | 
if self._change_last_revision(new_revision):  | 
|
1755  | 
self._cache_basis_inventory(new_revision)  | 
|
1756  | 
||
1757  | 
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.  | 
1758  | 
"""Template method part of set_last_revision to perform the change.  | 
1759  | 
        
 | 
|
1760  | 
        This is used to allow WorkingTree3 instances to not affect branch
 | 
|
1761  | 
        when their last revision is set.
 | 
|
1762  | 
        """
 | 
|
| 
2598.5.1
by Aaron Bentley
 Start eliminating the use of None to indicate null revision  | 
1763  | 
if _mod_revision.is_null(new_revision):  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1764  | 
self.branch.set_revision_history([])  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1765  | 
return False  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1766  | 
try:  | 
| 
1908.1.1
by Robert Collins
 Relax WorkingTree.set_last-revision to allow any revision to be set.  | 
1767  | 
self.branch.generate_revision_history(new_revision)  | 
1768  | 
except errors.NoSuchRevision:  | 
|
1769  | 
            # not present in the repo - dont try to set it deeper than the tip
 | 
|
1770  | 
self.branch.set_revision_history([new_revision])  | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1771  | 
return True  | 
1772  | 
||
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
1773  | 
def _write_basis_inventory(self, xml):  | 
1774  | 
"""Write the basis inventory XML to the basis-inventory file"""  | 
|
1775  | 
assert isinstance(xml, str), 'serialised xml must be bytestring.'  | 
|
1776  | 
path = self._basis_inventory_name()  | 
|
1777  | 
sio = StringIO(xml)  | 
|
1778  | 
self._control_files.put(path, sio)  | 
|
1779  | 
||
1780  | 
def _create_basis_xml_from_inventory(self, revision_id, inventory):  | 
|
1781  | 
"""Create the text that will be saved in basis-inventory"""  | 
|
| 
2858.2.3
by Martin Pool
 Fix incorrect deletion from _create_basis_xml_from_inventory (thanks igc)  | 
1782  | 
inventory.revision_id = revision_id  | 
| 
2100.3.14
by Aaron Bentley
 Test workingtree4 format, prevent use with old repos  | 
1783  | 
return xml7.serializer_v7.write_inventory_to_string(inventory)  | 
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
1784  | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
1785  | 
def _cache_basis_inventory(self, new_revision):  | 
1786  | 
"""Cache new_revision as the basis inventory."""  | 
|
| 
1740.2.3
by Aaron Bentley
 Only reserialize the working tree basis inventory when needed.  | 
1787  | 
        # TODO: this should allow the ready-to-use inventory to be passed in,
 | 
1788  | 
        # as commit already has that ready-to-use [while the format is the
 | 
|
1789  | 
        # same, that is].
 | 
|
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1790  | 
try:  | 
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1791  | 
            # this double handles the inventory - unpack and repack - 
 | 
1792  | 
            # but is easier to understand. We can/should put a conditional
 | 
|
1793  | 
            # in here based on whether the inventory is in the latest format
 | 
|
1794  | 
            # - perhaps we should repack all inventories on a repository
 | 
|
1795  | 
            # upgrade ?
 | 
|
| 
1740.2.3
by Aaron Bentley
 Only reserialize the working tree basis inventory when needed.  | 
1796  | 
            # the fast path is to copy the raw xml from the repository. If the
 | 
1797  | 
            # xml contains 'revision_id="', then we assume the right 
 | 
|
1798  | 
            # revision_id is set. We must check for this full string, because a
 | 
|
1799  | 
            # root node id can legitimately look like 'revision_id' but cannot
 | 
|
1800  | 
            # contain a '"'.
 | 
|
1801  | 
xml = self.branch.repository.get_inventory_xml(new_revision)  | 
|
| 
1910.2.22
by Aaron Bentley
 Make commits preserve root entry data  | 
1802  | 
firstline = xml.split('\n', 1)[0]  | 
1803  | 
if (not 'revision_id="' in firstline or  | 
|
| 
2100.3.14
by Aaron Bentley
 Test workingtree4 format, prevent use with old repos  | 
1804  | 
'format="7"' not in firstline):  | 
| 
1740.2.3
by Aaron Bentley
 Only reserialize the working tree basis inventory when needed.  | 
1805  | 
inv = self.branch.repository.deserialise_inventory(  | 
1806  | 
new_revision, xml)  | 
|
| 
2041.1.2
by John Arbash Meinel
 Update WorkingTree.set_parent_trees() to directly cache inv.  | 
1807  | 
xml = self._create_basis_xml_from_inventory(new_revision, inv)  | 
1808  | 
self._write_basis_inventory(xml)  | 
|
| 
1908.1.1
by Robert Collins
 Relax WorkingTree.set_last-revision to allow any revision to be set.  | 
1809  | 
except (errors.NoSuchRevision, errors.RevisionNotPresent):  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1810  | 
            pass
 | 
1811  | 
||
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
1812  | 
def read_basis_inventory(self):  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1813  | 
"""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.  | 
1814  | 
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.  | 
1815  | 
return self._control_files.get(path).read()  | 
| 
1185.33.59
by Martin Pool
 [patch] keep a cached basis inventory (Johan Rydberg)  | 
1816  | 
|
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1817  | 
    @needs_read_lock
 | 
1818  | 
def read_working_inventory(self):  | 
|
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
1819  | 
"""Read the working inventory.  | 
1820  | 
        
 | 
|
| 
1986.5.7
by Robert Collins
 Merge reviews.  | 
1821  | 
        :raises errors.InventoryModified: read_working_inventory will fail
 | 
1822  | 
            when the current in memory inventory has been modified.
 | 
|
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
1823  | 
        """
 | 
1824  | 
        # conceptually this should be an implementation detail of the tree. 
 | 
|
1825  | 
        # XXX: Deprecate this.
 | 
|
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1826  | 
        # ElementTree does its own conversion from UTF-8, so open in
 | 
1827  | 
        # binary.
 | 
|
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
1828  | 
if self._inventory_is_modified:  | 
1829  | 
raise errors.InventoryModified(self)  | 
|
| 
2100.3.10
by Aaron Bentley
 Ensure added references are serialized properly, beef up Workingtreee3  | 
1830  | 
result = self._deserialize(self._control_files.get('inventory'))  | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
1831  | 
self._set_inventory(result, dirty=False)  | 
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
1832  | 
return result  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
1833  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1834  | 
    @needs_tree_write_lock
 | 
| 
2292.1.22
by Marius Kruger
 Implement TODO: Normalize names.  | 
1835  | 
def remove(self, files, verbose=False, to_file=None, keep_files=True,  | 
| 
2292.1.10
by Marius Kruger
 * workingtree.remove  | 
1836  | 
force=False):  | 
| 
2475.5.2
by Marius Kruger
 * blackbox/test_remove  | 
1837  | 
"""Remove nominated files from the working inventory.  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1838  | 
|
| 
2292.1.22
by Marius Kruger
 Implement TODO: Normalize names.  | 
1839  | 
        :files: File paths relative to the basedir.
 | 
| 
2292.1.7
by Marius Kruger
 First pass at only deleting files on 'bzr remove' when  | 
1840  | 
        :keep_files: If true, the files will also be kept.
 | 
| 
2292.1.10
by Marius Kruger
 * workingtree.remove  | 
1841  | 
        :force: Delete files and directories, even if they are changed and
 | 
1842  | 
            even if the directories are not empty.
 | 
|
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1843  | 
        """
 | 
1844  | 
if isinstance(files, basestring):  | 
|
1845  | 
files = [files]  | 
|
1846  | 
||
| 
1551.15.12
by Aaron Bentley
 Stop using inventory directly in WorkingTree.remove  | 
1847  | 
inv_delta = []  | 
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1848  | 
|
1849  | 
new_files=set()  | 
|
| 
2655.2.16
by Marius Kruger
 * Rename `unknown_files_in_directory` to `unknown_nested_files`, which  | 
1850  | 
unknown_nested_files=set()  | 
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1851  | 
|
1852  | 
def recurse_directory_to_add_files(directory):  | 
|
| 
2655.2.16
by Marius Kruger
 * Rename `unknown_files_in_directory` to `unknown_nested_files`, which  | 
1853  | 
            # Recurse directory and add all files
 | 
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1854  | 
            # so we can check if they have changed.
 | 
| 
1551.15.11
by Aaron Bentley
 Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees  | 
1855  | 
for parent_info, file_infos in\  | 
1856  | 
osutils.walkdirs(self.abspath(directory),  | 
|
1857  | 
directory):  | 
|
1858  | 
for relpath, basename, kind, lstat, abspath in file_infos:  | 
|
| 
2655.2.16
by Marius Kruger
 * Rename `unknown_files_in_directory` to `unknown_nested_files`, which  | 
1859  | 
                    # Is it versioned or ignored?
 | 
1860  | 
if self.path2id(relpath) or self.is_ignored(relpath):  | 
|
1861  | 
                        # Add nested content for deletion.
 | 
|
| 
2655.2.6
by Marius Kruger
 * workingtree.remove  | 
1862  | 
new_files.add(relpath)  | 
| 
2655.2.16
by Marius Kruger
 * Rename `unknown_files_in_directory` to `unknown_nested_files`, which  | 
1863  | 
else:  | 
1864  | 
                        # Files which are not versioned and not ignored
 | 
|
1865  | 
                        # should be treated as unknown.
 | 
|
1866  | 
unknown_nested_files.add((relpath, None, kind))  | 
|
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1867  | 
|
1868  | 
for filename in files:  | 
|
1869  | 
            # Get file name into canonical form.
 | 
|
| 
1551.15.11
by Aaron Bentley
 Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees  | 
1870  | 
abspath = self.abspath(filename)  | 
1871  | 
filename = self.relpath(abspath)  | 
|
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1872  | 
if len(filename) > 0:  | 
1873  | 
new_files.add(filename)  | 
|
| 
1551.15.15
by Aaron Bentley
 Remove redundant listdir  | 
1874  | 
if osutils.isdir(abspath):  | 
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1875  | 
recurse_directory_to_add_files(filename)  | 
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1876  | 
|
| 
2655.2.15
by Marius Kruger
 Apply Alexander's comments:  | 
1877  | 
files = list(new_files)  | 
| 
2292.1.22
by Marius Kruger
 Implement TODO: Normalize names.  | 
1878  | 
|
| 
2475.5.2
by Marius Kruger
 * blackbox/test_remove  | 
1879  | 
if len(files) == 0:  | 
1880  | 
return # nothing to do  | 
|
1881  | 
||
| 
2292.1.22
by Marius Kruger
 Implement TODO: Normalize names.  | 
1882  | 
        # Sort needed to first handle directory content before the directory
 | 
1883  | 
files.sort(reverse=True)  | 
|
| 
2655.2.6
by Marius Kruger
 * workingtree.remove  | 
1884  | 
|
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1885  | 
        # Bail out if we are going to delete files we shouldn't
 | 
| 
2292.1.11
by Marius Kruger
 * workingtree.remove  | 
1886  | 
if not keep_files and not force:  | 
| 
2655.2.16
by Marius Kruger
 * Rename `unknown_files_in_directory` to `unknown_nested_files`, which  | 
1887  | 
has_changed_files = len(unknown_nested_files) > 0  | 
| 
2475.5.2
by Marius Kruger
 * blackbox/test_remove  | 
1888  | 
if not has_changed_files:  | 
1889  | 
for (file_id, path, content_change, versioned, parent_id, name,  | 
|
1890  | 
kind, executable) in self._iter_changes(self.basis_tree(),  | 
|
1891  | 
include_unchanged=True, require_versioned=False,  | 
|
1892  | 
want_unversioned=True, specific_files=files):  | 
|
| 
2655.2.17
by Marius Kruger
 Minor doc and spacing updates.  | 
1893  | 
                    # Check if it's an unknown (but not ignored) OR
 | 
| 
2655.2.12
by Marius Kruger
 Remove unknown ignored files wihtout needing --force'  | 
1894  | 
                    # changed (but not deleted) :
 | 
1895  | 
if not self.is_ignored(path[1]) and (  | 
|
1896  | 
versioned == (False, False) or  | 
|
| 
2655.2.8
by Marius Kruger
 * workingtree_implementations/test_remove  | 
1897  | 
content_change and kind[1] != None):  | 
| 
2475.5.2
by Marius Kruger
 * blackbox/test_remove  | 
1898  | 
has_changed_files = True  | 
1899  | 
                        break
 | 
|
1900  | 
||
1901  | 
if has_changed_files:  | 
|
| 
2655.2.17
by Marius Kruger
 Minor doc and spacing updates.  | 
1902  | 
                # Make delta show ALL applicable changes in error message.
 | 
| 
2475.5.2
by Marius Kruger
 * blackbox/test_remove  | 
1903  | 
tree_delta = self.changes_from(self.basis_tree(),  | 
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1904  | 
require_versioned=False, want_unversioned=True,  | 
| 
2475.5.2
by Marius Kruger
 * blackbox/test_remove  | 
1905  | 
specific_files=files)  | 
| 
2655.2.16
by Marius Kruger
 * Rename `unknown_files_in_directory` to `unknown_nested_files`, which  | 
1906  | 
for unknown_file in unknown_nested_files:  | 
| 
2655.2.6
by Marius Kruger
 * workingtree.remove  | 
1907  | 
if unknown_file not in tree_delta.unversioned:  | 
1908  | 
tree_delta.unversioned.extend((unknown_file,))  | 
|
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1909  | 
raise errors.BzrRemoveChangedFilesError(tree_delta)  | 
| 
2292.1.7
by Marius Kruger
 First pass at only deleting files on 'bzr remove' when  | 
1910  | 
|
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1911  | 
        # Build inv_delta and delete files where applicaple,
 | 
| 
2655.2.17
by Marius Kruger
 Minor doc and spacing updates.  | 
1912  | 
        # do this before any modifications to inventory.
 | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1913  | 
for f in files:  | 
| 
1551.15.12
by Aaron Bentley
 Stop using inventory directly in WorkingTree.remove  | 
1914  | 
fid = self.path2id(f)  | 
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1915  | 
message = None  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1916  | 
if not fid:  | 
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1917  | 
message = "%s is not versioned." % (f,)  | 
| 
2245.5.1
by Marius Kruger
 Let bzr rm rather give a warning than an error when trying to remove a non-versioned file.  | 
1918  | 
else:  | 
1919  | 
if verbose:  | 
|
| 
2292.1.10
by Marius Kruger
 * workingtree.remove  | 
1920  | 
                    # having removed it, it must be either ignored or unknown
 | 
| 
2245.5.1
by Marius Kruger
 Let bzr rm rather give a warning than an error when trying to remove a non-versioned file.  | 
1921  | 
if self.is_ignored(f):  | 
1922  | 
new_status = 'I'  | 
|
1923  | 
else:  | 
|
1924  | 
new_status = '?'  | 
|
| 
1551.15.12
by Aaron Bentley
 Stop using inventory directly in WorkingTree.remove  | 
1925  | 
textui.show_status(new_status, self.kind(fid), f,  | 
| 
2245.5.1
by Marius Kruger
 Let bzr rm rather give a warning than an error when trying to remove a non-versioned file.  | 
1926  | 
to_file=to_file)  | 
| 
2655.2.17
by Marius Kruger
 Minor doc and spacing updates.  | 
1927  | 
                # Unversion file
 | 
| 
1551.15.12
by Aaron Bentley
 Stop using inventory directly in WorkingTree.remove  | 
1928  | 
inv_delta.append((f, None, fid, None))  | 
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1929  | 
message = "removed %s" % (f,)  | 
| 
2292.1.7
by Marius Kruger
 First pass at only deleting files on 'bzr remove' when  | 
1930  | 
|
| 
2292.1.13
by Marius Kruger
 * merge the unversion command back into the remove command,  | 
1931  | 
if not keep_files:  | 
| 
2292.1.30
by Marius Kruger
 * Minor text fixes.  | 
1932  | 
abs_path = self.abspath(f)  | 
1933  | 
if osutils.lexists(abs_path):  | 
|
1934  | 
if (osutils.isdir(abs_path) and  | 
|
1935  | 
len(os.listdir(abs_path)) > 0):  | 
|
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1936  | 
if force:  | 
1937  | 
osutils.rmtree(abs_path)  | 
|
1938  | 
else:  | 
|
| 
2655.2.6
by Marius Kruger
 * workingtree.remove  | 
1939  | 
message = "%s is not an empty directory "\  | 
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1940  | 
"and won't be deleted." % (f,)  | 
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1941  | 
else:  | 
| 
2292.1.30
by Marius Kruger
 * Minor text fixes.  | 
1942  | 
osutils.delete_any(abs_path)  | 
| 
2655.2.4
by Marius Kruger
 * workingtree.remove  | 
1943  | 
message = "deleted %s" % (f,)  | 
| 
2292.1.13
by Marius Kruger
 * merge the unversion command back into the remove command,  | 
1944  | 
elif message is not None:  | 
| 
2655.2.17
by Marius Kruger
 Minor doc and spacing updates.  | 
1945  | 
                    # Only care if we haven't done anything yet.
 | 
1946  | 
message = "%s does not exist." % (f,)  | 
|
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
1947  | 
|
| 
2655.2.17
by Marius Kruger
 Minor doc and spacing updates.  | 
1948  | 
            # Print only one message (if any) per file.
 | 
| 
2292.1.1
by Marius Kruger
 "bzr remove" and "bzr rm" will now remove the working file.  | 
1949  | 
if message is not None:  | 
1950  | 
note(message)  | 
|
| 
1551.15.12
by Aaron Bentley
 Stop using inventory directly in WorkingTree.remove  | 
1951  | 
self.apply_inventory_delta(inv_delta)  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
1952  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1953  | 
    @needs_tree_write_lock
 | 
| 
2748.3.2
by Aaron Bentley
 Fix revert, remove-tree, and various tests to use None for 'no files specified'  | 
1954  | 
def revert(self, filenames=None, old_tree=None, backups=True,  | 
| 
2225.1.1
by Aaron Bentley
 Added revert change display, with tests  | 
1955  | 
pb=DummyProgress(), report_changes=False):  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
1956  | 
from bzrlib.conflicts import resolve  | 
| 
2748.3.3
by Aaron Bentley
 Add a deprecation warning for revert([]), and handle as revert(None) for now  | 
1957  | 
if filenames == []:  | 
1958  | 
filenames = None  | 
|
1959  | 
symbol_versioning.warn('Using [] to revert all files is deprecated'  | 
|
1960  | 
' as of bzr 0.91. Please use None (the default) instead.',  | 
|
1961  | 
DeprecationWarning, stacklevel=2)  | 
|
| 
1501
by Robert Collins
 Move revert from Branch to WorkingTree.  | 
1962  | 
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()  | 
1963  | 
old_tree = self.basis_tree()  | 
| 
2225.1.1
by Aaron Bentley
 Added revert change display, with tests  | 
1964  | 
conflicts = transform.revert(self, old_tree, filenames, backups, pb,  | 
1965  | 
report_changes)  | 
|
| 
2748.3.2
by Aaron Bentley
 Fix revert, remove-tree, and various tests to use None for 'no files specified'  | 
1966  | 
if filenames is None:  | 
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
1967  | 
self.set_parent_ids(self.get_parent_ids()[:1])  | 
| 
1534.10.14
by Aaron Bentley
 Made revert clear conflicts  | 
1968  | 
resolve(self)  | 
1969  | 
else:  | 
|
| 
1534.10.15
by Aaron Bentley
 Revert does resolve  | 
1970  | 
resolve(self, filenames, ignore_misses=True)  | 
| 
1558.7.13
by Aaron Bentley
 WorkingTree.revert returns conflicts  | 
1971  | 
return conflicts  | 
| 
1501
by Robert Collins
 Move revert from Branch to WorkingTree.  | 
1972  | 
|
| 
1908.11.2
by Robert Collins
 Implement WorkingTree interface conformance tests for  | 
1973  | 
def revision_tree(self, revision_id):  | 
1974  | 
"""See Tree.revision_tree.  | 
|
1975  | 
||
1976  | 
        WorkingTree can supply revision_trees for the basis revision only
 | 
|
1977  | 
        because there is only one cached inventory in the bzr directory.
 | 
|
1978  | 
        """
 | 
|
1979  | 
if revision_id == self.last_revision():  | 
|
1980  | 
try:  | 
|
1981  | 
xml = self.read_basis_inventory()  | 
|
| 
1852.16.5
by John Arbash Meinel
 [merge] bzr.dev 2255, resolve conflicts, update copyrights  | 
1982  | 
except errors.NoSuchFile:  | 
| 
1908.11.2
by Robert Collins
 Implement WorkingTree interface conformance tests for  | 
1983  | 
                pass
 | 
1984  | 
else:  | 
|
| 
1908.11.3
by Robert Collins
 Merge bzr.dev  | 
1985  | 
try:  | 
| 
2255.6.5
by Aaron Bentley
 fix revision_tree tests  | 
1986  | 
inv = xml7.serializer_v7.read_inventory_from_string(xml)  | 
| 
1908.11.3
by Robert Collins
 Merge bzr.dev  | 
1987  | 
                    # dont use the repository revision_tree api because we want
 | 
1988  | 
                    # to supply the inventory.
 | 
|
1989  | 
if inv.revision_id == revision_id:  | 
|
| 
1908.11.5
by John Arbash Meinel
 [merge] bzr.dev 2240  | 
1990  | 
return revisiontree.RevisionTree(self.branch.repository,  | 
| 
1908.11.3
by Robert Collins
 Merge bzr.dev  | 
1991  | 
inv, revision_id)  | 
1992  | 
except errors.BadInventoryFormat:  | 
|
1993  | 
                    pass
 | 
|
| 
1908.11.2
by Robert Collins
 Implement WorkingTree interface conformance tests for  | 
1994  | 
        # raise if there was no inventory, or if we read the wrong inventory.
 | 
1995  | 
raise errors.NoSuchRevisionInTree(self, revision_id)  | 
|
1996  | 
||
| 
1658.1.3
by Martin Pool
 Doc  | 
1997  | 
    # XXX: This method should be deprecated in favour of taking in a proper
 | 
1998  | 
    # new Inventory object.
 | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
1999  | 
    @needs_tree_write_lock
 | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
2000  | 
def set_inventory(self, new_inventory_list):  | 
2001  | 
from bzrlib.inventory import (Inventory,  | 
|
2002  | 
InventoryDirectory,  | 
|
2003  | 
InventoryEntry,  | 
|
2004  | 
InventoryFile,  | 
|
2005  | 
InventoryLink)  | 
|
2006  | 
inv = Inventory(self.get_root_id())  | 
|
| 
1658.1.2
by Martin Pool
 Revert changes to WorkingTree.set_inventory to unbreak bzrtools  | 
2007  | 
for path, file_id, parent, kind in new_inventory_list:  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
2008  | 
name = os.path.basename(path)  | 
2009  | 
if name == "":  | 
|
2010  | 
                continue
 | 
|
2011  | 
            # fixme, there should be a factory function inv,add_?? 
 | 
|
2012  | 
if kind == 'directory':  | 
|
2013  | 
inv.add(InventoryDirectory(file_id, name, parent))  | 
|
2014  | 
elif kind == 'file':  | 
|
| 
1658.1.2
by Martin Pool
 Revert changes to WorkingTree.set_inventory to unbreak bzrtools  | 
2015  | 
inv.add(InventoryFile(file_id, name, parent))  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
2016  | 
elif kind == 'symlink':  | 
2017  | 
inv.add(InventoryLink(file_id, name, parent))  | 
|
2018  | 
else:  | 
|
| 
2206.1.7
by Marius Kruger
 * errors  | 
2019  | 
raise errors.BzrError("unknown kind %r" % kind)  | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
2020  | 
self._write_inventory(inv)  | 
| 
1497
by Robert Collins
 Move Branch.read_working_inventory to WorkingTree.  | 
2021  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
2022  | 
    @needs_tree_write_lock
 | 
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
2023  | 
def set_root_id(self, file_id):  | 
2024  | 
"""Set the root id for this tree."""  | 
|
| 
2858.2.4
by Martin Pool
 Restore deprecated behaviour of accepting None for WorkingTree.set_root_id (thanks igc)  | 
2025  | 
        # for compatability 
 | 
2026  | 
if file_id is None:  | 
|
2027  | 
symbol_versioning.warn(symbol_versioning.zero_twelve  | 
|
2028  | 
% 'WorkingTree.set_root_id with fileid=None',  | 
|
2029  | 
DeprecationWarning,  | 
|
2030  | 
stacklevel=3)  | 
|
2031  | 
file_id = ROOT_ID  | 
|
2032  | 
else:  | 
|
2033  | 
file_id = osutils.safe_file_id(file_id)  | 
|
| 
2255.2.15
by Robert Collins
 Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.  | 
2034  | 
self._set_root_id(file_id)  | 
2035  | 
||
2036  | 
def _set_root_id(self, file_id):  | 
|
2037  | 
"""Set the root id for this tree, in a format specific manner.  | 
|
2038  | 
||
2039  | 
        :param file_id: The file id to assign to the root. It must not be 
 | 
|
2040  | 
            present in the current inventory or an error will occur. It must
 | 
|
2041  | 
            not be None, but rather a valid file id.
 | 
|
2042  | 
        """
 | 
|
| 
1986.5.2
by Robert Collins
 ``WorkingTree.set_root_id(None)`` is now deprecated. Please  | 
2043  | 
inv = self._inventory  | 
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
2044  | 
orig_root_id = inv.root.file_id  | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
2045  | 
        # TODO: it might be nice to exit early if there was nothing
 | 
2046  | 
        # to do, saving us from trigger a sync on unlock.
 | 
|
2047  | 
self._inventory_is_modified = True  | 
|
2048  | 
        # we preserve the root inventory entry object, but
 | 
|
2049  | 
        # unlinkit from the byid index
 | 
|
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
2050  | 
del inv._byid[inv.root.file_id]  | 
2051  | 
inv.root.file_id = file_id  | 
|
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
2052  | 
        # and link it into the index with the new changed id.
 | 
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
2053  | 
inv._byid[inv.root.file_id] = inv.root  | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
2054  | 
        # and finally update all children to reference the new id.
 | 
2055  | 
        # XXX: this should be safe to just look at the root.children
 | 
|
2056  | 
        # list, not the WHOLE INVENTORY.
 | 
|
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
2057  | 
for fid in inv:  | 
2058  | 
entry = inv[fid]  | 
|
| 
1534.4.35
by Robert Collins
 Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()  | 
2059  | 
if entry.parent_id == orig_root_id:  | 
| 
1457.1.10
by Robert Collins
 Move set_root_id to WorkingTree.  | 
2060  | 
entry.parent_id = inv.root.file_id  | 
2061  | 
||
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
2062  | 
def unlock(self):  | 
2063  | 
"""See Branch.unlock.  | 
|
2064  | 
        
 | 
|
2065  | 
        WorkingTree locking just uses the Branch locking facilities.
 | 
|
2066  | 
        This is current because all working trees have an embedded branch
 | 
|
2067  | 
        within them. IF in the future, we were to make branch data shareable
 | 
|
2068  | 
        between multiple working trees, i.e. via shared storage, then we 
 | 
|
2069  | 
        would probably want to lock both the local tree, and the branch.
 | 
|
2070  | 
        """
 | 
|
| 
1852.4.2
by Robert Collins
 Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.  | 
2071  | 
raise NotImplementedError(self.unlock)  | 
| 
1442.1.65
by Robert Collins
 Branch.remove has been moved to WorkingTree.  | 
2072  | 
|
| 
2806.2.2
by Vincent Ladeuil
 Fix #128076 and #131396 by reusing bound branch transport.  | 
2073  | 
def update(self, change_reporter=None, possible_transports=None):  | 
| 
1587.1.11
by Robert Collins
 Local commits appear to be working properly.  | 
2074  | 
"""Update a working tree along its branch.  | 
2075  | 
||
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
2076  | 
        This will update the branch if its bound too, which means we have
 | 
2077  | 
        multiple trees involved:
 | 
|
2078  | 
||
2079  | 
        - The new basis tree of the master.
 | 
|
2080  | 
        - The old basis tree of the branch.
 | 
|
2081  | 
        - The old basis tree of the working tree.
 | 
|
2082  | 
        - The current working tree state.
 | 
|
2083  | 
||
2084  | 
        Pathologically, all three may be different, and non-ancestors of each
 | 
|
2085  | 
        other.  Conceptually we want to:
 | 
|
2086  | 
||
2087  | 
        - Preserve the wt.basis->wt.state changes
 | 
|
2088  | 
        - Transform the wt.basis to the new master basis.
 | 
|
2089  | 
        - Apply a merge of the old branch basis to get any 'local' changes from
 | 
|
2090  | 
          it into the tree.
 | 
|
2091  | 
        - Restore the wt.basis->wt.state changes.
 | 
|
| 
1587.1.11
by Robert Collins
 Local commits appear to be working properly.  | 
2092  | 
|
2093  | 
        There isn't a single operation at the moment to do that, so we:
 | 
|
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
2094  | 
        - Merge current state -> basis tree of the master w.r.t. the old tree
 | 
2095  | 
          basis.
 | 
|
2096  | 
        - Do a 'normal' merge of the old branch basis if it is relevant.
 | 
|
| 
1587.1.11
by Robert Collins
 Local commits appear to be working properly.  | 
2097  | 
        """
 | 
| 
2806.2.2
by Vincent Ladeuil
 Fix #128076 and #131396 by reusing bound branch transport.  | 
2098  | 
if self.branch.get_master_branch(possible_transports) is not None:  | 
| 
2084.2.1
by Aaron Bentley
 Support updating lightweight checkouts of readonly branches  | 
2099  | 
self.lock_write()  | 
2100  | 
update_branch = True  | 
|
2101  | 
else:  | 
|
2102  | 
self.lock_tree_write()  | 
|
2103  | 
update_branch = False  | 
|
2104  | 
try:  | 
|
2105  | 
if update_branch:  | 
|
| 
2806.2.2
by Vincent Ladeuil
 Fix #128076 and #131396 by reusing bound branch transport.  | 
2106  | 
old_tip = self.branch.update(possible_transports)  | 
| 
2084.2.1
by Aaron Bentley
 Support updating lightweight checkouts of readonly branches  | 
2107  | 
else:  | 
2108  | 
old_tip = None  | 
|
| 
2504.2.1
by Daniel Watkins
 builtins.py now passes a delta._ChangeReporter down the line when update is called, causing the changes the update makes to be displayed.  | 
2109  | 
return self._update_tree(old_tip, change_reporter)  | 
| 
2084.2.1
by Aaron Bentley
 Support updating lightweight checkouts of readonly branches  | 
2110  | 
finally:  | 
2111  | 
self.unlock()  | 
|
2112  | 
||
2113  | 
    @needs_tree_write_lock
 | 
|
| 
2504.2.1
by Daniel Watkins
 builtins.py now passes a delta._ChangeReporter down the line when update is called, causing the changes the update makes to be displayed.  | 
2114  | 
def _update_tree(self, old_tip=None, change_reporter=None):  | 
| 
2084.2.1
by Aaron Bentley
 Support updating lightweight checkouts of readonly branches  | 
2115  | 
"""Update a tree to the master branch.  | 
2116  | 
||
2117  | 
        :param old_tip: if supplied, the previous tip revision the branch,
 | 
|
2118  | 
            before it was changed to the master branch's tip.
 | 
|
2119  | 
        """
 | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
2120  | 
        # here if old_tip is not None, it is the old tip of the branch before
 | 
2121  | 
        # it was updated from the master branch. This should become a pending
 | 
|
2122  | 
        # merge in the working tree to preserve the user existing work.  we
 | 
|
2123  | 
        # cant set that until we update the working trees last revision to be
 | 
|
2124  | 
        # one from the new branch, because it will just get absorbed by the
 | 
|
2125  | 
        # parent de-duplication logic.
 | 
|
2126  | 
        # 
 | 
|
2127  | 
        # We MUST save it even if an error occurs, because otherwise the users
 | 
|
2128  | 
        # local work is unreferenced and will appear to have been lost.
 | 
|
2129  | 
        # 
 | 
|
2130  | 
result = 0  | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
2131  | 
try:  | 
2132  | 
last_rev = self.get_parent_ids()[0]  | 
|
2133  | 
except IndexError:  | 
|
| 
2598.5.1
by Aaron Bentley
 Start eliminating the use of None to indicate null revision  | 
2134  | 
last_rev = _mod_revision.NULL_REVISION  | 
| 
2598.5.4
by Aaron Bentley
 Restore original Branch.last_revision behavior, fix bits that care  | 
2135  | 
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):  | 
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
2136  | 
            # merge tree state up to new branch tip.
 | 
2137  | 
basis = self.basis_tree()  | 
|
| 
2255.2.44
by Robert Collins
 Fix tree unlock on readonly Format4 trees with dirty hashcache.  | 
2138  | 
basis.lock_read()  | 
2139  | 
try:  | 
|
2140  | 
to_tree = self.branch.basis_tree()  | 
|
| 
2255.6.6
by Aaron Bentley
 Fix update to set unique roots, and work with dirstate  | 
2141  | 
if basis.inventory.root is None:  | 
| 
2255.2.44
by Robert Collins
 Fix tree unlock on readonly Format4 trees with dirty hashcache.  | 
2142  | 
self.set_root_id(to_tree.inventory.root.file_id)  | 
| 
2255.6.6
by Aaron Bentley
 Fix update to set unique roots, and work with dirstate  | 
2143  | 
self.flush()  | 
| 
2255.2.44
by Robert Collins
 Fix tree unlock on readonly Format4 trees with dirty hashcache.  | 
2144  | 
result += merge.merge_inner(  | 
2145  | 
self.branch,  | 
|
2146  | 
to_tree,  | 
|
2147  | 
basis,  | 
|
| 
2504.2.1
by Daniel Watkins
 builtins.py now passes a delta._ChangeReporter down the line when update is called, causing the changes the update makes to be displayed.  | 
2148  | 
this_tree=self,  | 
2149  | 
change_reporter=change_reporter)  | 
|
| 
2255.2.44
by Robert Collins
 Fix tree unlock on readonly Format4 trees with dirty hashcache.  | 
2150  | 
finally:  | 
2151  | 
basis.unlock()  | 
|
| 
1908.6.6
by Robert Collins
 Merge updated set_parents api.  | 
2152  | 
            # TODO - dedup parents list with things merged by pull ?
 | 
2153  | 
            # reuse the tree we've updated to to set the basis:
 | 
|
2154  | 
parent_trees = [(self.branch.last_revision(), to_tree)]  | 
|
2155  | 
merges = self.get_parent_ids()[1:]  | 
|
2156  | 
            # Ideally we ask the tree for the trees here, that way the working
 | 
|
2157  | 
            # tree can decide whether to give us teh entire tree or give us a
 | 
|
2158  | 
            # lazy initialised tree. dirstate for instance will have the trees
 | 
|
2159  | 
            # in ram already, whereas a last-revision + basis-inventory tree
 | 
|
2160  | 
            # will not, but also does not need them when setting parents.
 | 
|
2161  | 
for parent in merges:  | 
|
2162  | 
parent_trees.append(  | 
|
2163  | 
(parent, self.branch.repository.revision_tree(parent)))  | 
|
| 
2598.5.3
by Aaron Bentley
 Push NULL_REVISION deeper  | 
2164  | 
if (old_tip is not None and not _mod_revision.is_null(old_tip)):  | 
| 
1908.6.6
by Robert Collins
 Merge updated set_parents api.  | 
2165  | 
parent_trees.append(  | 
2166  | 
(old_tip, self.branch.repository.revision_tree(old_tip)))  | 
|
2167  | 
self.set_parent_trees(parent_trees)  | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
2168  | 
last_rev = parent_trees[0][0]  | 
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
2169  | 
else:  | 
2170  | 
            # the working tree had the same last-revision as the master
 | 
|
2171  | 
            # branch did. We may still have pivot local work from the local
 | 
|
2172  | 
            # branch into old_tip:
 | 
|
| 
2598.5.3
by Aaron Bentley
 Push NULL_REVISION deeper  | 
2173  | 
if (old_tip is not None and not _mod_revision.is_null(old_tip)):  | 
| 
1908.6.7
by Robert Collins
 Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.  | 
2174  | 
self.add_parent_tree_id(old_tip)  | 
| 
2598.5.3
by Aaron Bentley
 Push NULL_REVISION deeper  | 
2175  | 
if (old_tip is not None and not _mod_revision.is_null(old_tip)  | 
2176  | 
and old_tip != last_rev):  | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
2177  | 
            # our last revision was not the prior branch last revision
 | 
2178  | 
            # and we have converted that last revision to a pending merge.
 | 
|
2179  | 
            # base is somewhere between the branch tip now
 | 
|
2180  | 
            # and the now pending merge
 | 
|
| 
2255.2.55
by John Arbash Meinel
 add extra flush() call to make _update_tree work for dirstate.  | 
2181  | 
|
2182  | 
            # Since we just modified the working tree and inventory, flush out
 | 
|
2183  | 
            # the current state, before we modify it again.
 | 
|
2184  | 
            # TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
 | 
|
2185  | 
            #       requires it only because TreeTransform directly munges the
 | 
|
2186  | 
            #       inventory and calls tree._write_inventory(). Ultimately we
 | 
|
2187  | 
            #       should be able to remove this extra flush.
 | 
|
2188  | 
self.flush()  | 
|
| 
2490.2.21
by Aaron Bentley
 Rename graph to deprecated_graph  | 
2189  | 
graph = self.branch.repository.get_graph()  | 
2190  | 
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),  | 
|
2191  | 
old_tip)  | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
2192  | 
base_tree = self.branch.repository.revision_tree(base_rev_id)  | 
2193  | 
other_tree = self.branch.repository.revision_tree(old_tip)  | 
|
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2194  | 
result += merge.merge_inner(  | 
2195  | 
self.branch,  | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
2196  | 
other_tree,  | 
2197  | 
base_tree,  | 
|
| 
2504.2.1
by Daniel Watkins
 builtins.py now passes a delta._ChangeReporter down the line when update is called, causing the changes the update makes to be displayed.  | 
2198  | 
this_tree=self,  | 
2199  | 
change_reporter=change_reporter)  | 
|
| 
1927.2.3
by Robert Collins
 review comment application - paired with Martin.  | 
2200  | 
return result  | 
| 
1508.1.24
by Robert Collins
 Add update command for use with checkouts.  | 
2201  | 
|
| 
2201.1.1
by John Arbash Meinel
 Fix bug #76299 by ignoring write errors during readonly hashcache write.  | 
2202  | 
def _write_hashcache_if_dirty(self):  | 
2203  | 
"""Write out the hashcache if it is dirty."""  | 
|
2204  | 
if self._hashcache.needs_write:  | 
|
2205  | 
try:  | 
|
2206  | 
self._hashcache.write()  | 
|
2207  | 
except OSError, e:  | 
|
2208  | 
if e.errno not in (errno.EPERM, errno.EACCES):  | 
|
2209  | 
                    raise
 | 
|
2210  | 
                # TODO: jam 20061219 Should this be a warning? A single line
 | 
|
2211  | 
                #       warning might be sufficient to let the user know what
 | 
|
2212  | 
                #       is going on.
 | 
|
2213  | 
mutter('Could not write hashcache for %s\nError: %s',  | 
|
2214  | 
self._hashcache.cache_file_name(), e)  | 
|
2215  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
2216  | 
    @needs_tree_write_lock
 | 
| 
1457.1.11
by Robert Collins
 Move _write_inventory to WorkingTree.  | 
2217  | 
def _write_inventory(self, inv):  | 
2218  | 
"""Write inventory as the current inventory."""  | 
|
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
2219  | 
self._set_inventory(inv, dirty=True)  | 
2220  | 
self.flush()  | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
2221  | 
|
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
2222  | 
def set_conflicts(self, arg):  | 
| 
2206.1.7
by Marius Kruger
 * errors  | 
2223  | 
raise errors.UnsupportedOperation(self.set_conflicts, self)  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
2224  | 
|
| 
1551.7.11
by Aaron Bentley
 Add WorkingTree.add_conflicts  | 
2225  | 
def add_conflicts(self, arg):  | 
| 
2206.1.7
by Marius Kruger
 * errors  | 
2226  | 
raise errors.UnsupportedOperation(self.add_conflicts, self)  | 
| 
1551.7.11
by Aaron Bentley
 Add WorkingTree.add_conflicts  | 
2227  | 
|
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
2228  | 
    @needs_read_lock
 | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
2229  | 
def conflicts(self):  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2230  | 
conflicts = _mod_conflicts.ConflictList()  | 
| 
1534.10.9
by Aaron Bentley
 Switched display functions to conflict_lines  | 
2231  | 
for conflicted in self._iter_conflicts():  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
2232  | 
text = True  | 
2233  | 
try:  | 
|
2234  | 
if file_kind(self.abspath(conflicted)) != "file":  | 
|
2235  | 
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.  | 
2236  | 
except errors.NoSuchFile:  | 
2237  | 
text = False  | 
|
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
2238  | 
if text is True:  | 
2239  | 
for suffix in ('.THIS', '.OTHER'):  | 
|
2240  | 
try:  | 
|
2241  | 
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.  | 
2242  | 
if kind != "file":  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
2243  | 
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.  | 
2244  | 
except errors.NoSuchFile:  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
2245  | 
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.  | 
2246  | 
if text == False:  | 
| 
1534.10.8
by Aaron Bentley
 Implemented conflict_lines in terms of old system on WorkingTree  | 
2247  | 
                        break
 | 
2248  | 
ctype = {True: 'text conflict', False: 'contents conflict'}[text]  | 
|
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2249  | 
conflicts.append(_mod_conflicts.Conflict.factory(ctype,  | 
2250  | 
path=conflicted,  | 
|
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
2251  | 
file_id=self.path2id(conflicted)))  | 
2252  | 
return conflicts  | 
|
2253  | 
||
| 
1852.15.3
by Robert Collins
 Add a first-cut Tree.walkdirs method.  | 
2254  | 
def walkdirs(self, prefix=""):  | 
| 
2255.2.18
by Robert Collins
 Dirstate: all tree_implementation tests passing.  | 
2255  | 
"""Walk the directories of this tree.  | 
2256  | 
||
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
2257  | 
        returns a generator which yields items in the form:
 | 
| 
2292.1.30
by Marius Kruger
 * Minor text fixes.  | 
2258  | 
                ((curren_directory_path, fileid),
 | 
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
2259  | 
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
 | 
2260  | 
                   file1_kind), ... ])
 | 
|
2261  | 
||
| 
2255.2.18
by Robert Collins
 Dirstate: all tree_implementation tests passing.  | 
2262  | 
        This API returns a generator, which is only valid during the current
 | 
2263  | 
        tree transaction - within a single lock_read or lock_write duration.
 | 
|
2264  | 
||
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
2265  | 
        If the tree is not locked, it may cause an error to be raised,
 | 
2266  | 
        depending on the tree implementation.
 | 
|
| 
2255.2.18
by Robert Collins
 Dirstate: all tree_implementation tests passing.  | 
2267  | 
        """
 | 
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2268  | 
disk_top = self.abspath(prefix)  | 
2269  | 
if disk_top.endswith('/'):  | 
|
2270  | 
disk_top = disk_top[:-1]  | 
|
2271  | 
top_strip_len = len(disk_top) + 1  | 
|
| 
1852.15.11
by Robert Collins
 Tree.walkdirs handles missing contents in workingtrees.  | 
2272  | 
inventory_iterator = self._walkdirs(prefix)  | 
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2273  | 
disk_iterator = osutils.walkdirs(disk_top, prefix)  | 
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2274  | 
try:  | 
| 
1852.15.11
by Robert Collins
 Tree.walkdirs handles missing contents in workingtrees.  | 
2275  | 
current_disk = disk_iterator.next()  | 
2276  | 
disk_finished = False  | 
|
2277  | 
except OSError, e:  | 
|
| 
2423.2.1
by Alexander Belchenko
 Fix for walkdirs in missing dir with Py2.4 @ win32  | 
2278  | 
if not (e.errno == errno.ENOENT or  | 
2279  | 
(sys.platform == 'win32' and e.errno == ERROR_PATH_NOT_FOUND)):  | 
|
| 
1852.15.11
by Robert Collins
 Tree.walkdirs handles missing contents in workingtrees.  | 
2280  | 
                raise
 | 
2281  | 
current_disk = None  | 
|
2282  | 
disk_finished = True  | 
|
2283  | 
try:  | 
|
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2284  | 
current_inv = inventory_iterator.next()  | 
2285  | 
inv_finished = False  | 
|
2286  | 
except StopIteration:  | 
|
2287  | 
current_inv = None  | 
|
2288  | 
inv_finished = True  | 
|
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2289  | 
while not inv_finished or not disk_finished:  | 
2290  | 
if not disk_finished:  | 
|
2291  | 
                # strip out .bzr dirs
 | 
|
2292  | 
if current_disk[0][1][top_strip_len:] == '':  | 
|
2293  | 
                    # osutils.walkdirs can be made nicer - 
 | 
|
2294  | 
                    # yield the path-from-prefix rather than the pathjoined
 | 
|
2295  | 
                    # value.
 | 
|
2296  | 
bzrdir_loc = bisect_left(current_disk[1], ('.bzr', '.bzr'))  | 
|
2297  | 
if current_disk[1][bzrdir_loc][0] == '.bzr':  | 
|
2298  | 
                        # we dont yield the contents of, or, .bzr itself.
 | 
|
2299  | 
del current_disk[1][bzrdir_loc]  | 
|
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2300  | 
if inv_finished:  | 
2301  | 
                # everything is unknown
 | 
|
| 
1852.15.12
by Robert Collins
 WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.  | 
2302  | 
direction = 1  | 
| 
1852.15.11
by Robert Collins
 Tree.walkdirs handles missing contents in workingtrees.  | 
2303  | 
elif disk_finished:  | 
2304  | 
                # everything is missing
 | 
|
| 
1852.15.12
by Robert Collins
 WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.  | 
2305  | 
direction = -1  | 
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2306  | 
else:  | 
2307  | 
direction = cmp(current_inv[0][0], current_disk[0][0])  | 
|
| 
1852.15.12
by Robert Collins
 WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.  | 
2308  | 
if direction > 0:  | 
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2309  | 
                # disk is before inventory - unknown
 | 
| 
1852.15.11
by Robert Collins
 Tree.walkdirs handles missing contents in workingtrees.  | 
2310  | 
dirblock = [(relpath, basename, kind, stat, None, None) for  | 
2311  | 
relpath, basename, kind, stat, top_path in current_disk[1]]  | 
|
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2312  | 
yield (current_disk[0][0], None), dirblock  | 
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2313  | 
try:  | 
2314  | 
current_disk = disk_iterator.next()  | 
|
2315  | 
except StopIteration:  | 
|
2316  | 
disk_finished = True  | 
|
| 
1852.15.12
by Robert Collins
 WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.  | 
2317  | 
elif direction < 0:  | 
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2318  | 
                # inventory is before disk - missing.
 | 
| 
1852.15.11
by Robert Collins
 Tree.walkdirs handles missing contents in workingtrees.  | 
2319  | 
dirblock = [(relpath, basename, 'unknown', None, fileid, kind)  | 
2320  | 
for relpath, basename, dkind, stat, fileid, kind in  | 
|
2321  | 
current_inv[1]]  | 
|
2322  | 
yield (current_inv[0][0], current_inv[0][1]), dirblock  | 
|
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2323  | 
try:  | 
2324  | 
current_inv = inventory_iterator.next()  | 
|
2325  | 
except StopIteration:  | 
|
2326  | 
inv_finished = True  | 
|
2327  | 
else:  | 
|
2328  | 
                # versioned present directory
 | 
|
2329  | 
                # merge the inventory and disk data together
 | 
|
2330  | 
dirblock = []  | 
|
| 
1852.15.11
by Robert Collins
 Tree.walkdirs handles missing contents in workingtrees.  | 
2331  | 
for relpath, subiterator in itertools.groupby(sorted(  | 
| 
1852.15.12
by Robert Collins
 WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.  | 
2332  | 
current_inv[1] + current_disk[1], key=operator.itemgetter(0)), operator.itemgetter(1)):  | 
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2333  | 
path_elements = list(subiterator)  | 
2334  | 
if len(path_elements) == 2:  | 
|
| 
1852.15.12
by Robert Collins
 WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.  | 
2335  | 
inv_row, disk_row = path_elements  | 
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2336  | 
                        # versioned, present file
 | 
| 
1852.15.12
by Robert Collins
 WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.  | 
2337  | 
dirblock.append((inv_row[0],  | 
2338  | 
inv_row[1], disk_row[2],  | 
|
2339  | 
disk_row[3], inv_row[4],  | 
|
2340  | 
inv_row[5]))  | 
|
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2341  | 
elif len(path_elements[0]) == 5:  | 
2342  | 
                        # unknown disk file
 | 
|
| 
1852.15.11
by Robert Collins
 Tree.walkdirs handles missing contents in workingtrees.  | 
2343  | 
dirblock.append((path_elements[0][0],  | 
2344  | 
path_elements[0][1], path_elements[0][2],  | 
|
2345  | 
path_elements[0][3], None, None))  | 
|
2346  | 
elif len(path_elements[0]) == 6:  | 
|
2347  | 
                        # versioned, absent file.
 | 
|
2348  | 
dirblock.append((path_elements[0][0],  | 
|
2349  | 
path_elements[0][1], 'unknown', None,  | 
|
2350  | 
path_elements[0][4], path_elements[0][5]))  | 
|
2351  | 
else:  | 
|
2352  | 
raise NotImplementedError('unreachable code')  | 
|
| 
1852.15.7
by Robert Collins
 Start testing behaviour of unknowns in WorkingTree.walkdirs.  | 
2353  | 
yield current_inv[0], dirblock  | 
2354  | 
try:  | 
|
2355  | 
current_inv = inventory_iterator.next()  | 
|
2356  | 
except StopIteration:  | 
|
2357  | 
inv_finished = True  | 
|
2358  | 
try:  | 
|
2359  | 
current_disk = disk_iterator.next()  | 
|
2360  | 
except StopIteration:  | 
|
2361  | 
disk_finished = True  | 
|
2362  | 
||
2363  | 
def _walkdirs(self, prefix=""):  | 
|
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
2364  | 
"""Walk the directories of this tree.  | 
2365  | 
||
2366  | 
           :prefix: is used as the directrory to start with.
 | 
|
2367  | 
           returns a generator which yields items in the form:
 | 
|
| 
2292.1.30
by Marius Kruger
 * Minor text fixes.  | 
2368  | 
                ((curren_directory_path, fileid),
 | 
| 
2292.1.25
by Marius Kruger
 * Add utility method delta.get_changes_as_text to get the output of .show()  | 
2369  | 
                 [(file1_path, file1_name, file1_kind, None, file1_id,
 | 
2370  | 
                   file1_kind), ... ])
 | 
|
2371  | 
        """
 | 
|
| 
1852.15.3
by Robert Collins
 Add a first-cut Tree.walkdirs method.  | 
2372  | 
_directory = 'directory'  | 
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2373  | 
        # get the root in the inventory
 | 
| 
1852.15.3
by Robert Collins
 Add a first-cut Tree.walkdirs method.  | 
2374  | 
inv = self.inventory  | 
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2375  | 
top_id = inv.path2id(prefix)  | 
2376  | 
if top_id is None:  | 
|
2377  | 
pending = []  | 
|
2378  | 
else:  | 
|
2379  | 
pending = [(prefix, '', _directory, None, top_id, None)]  | 
|
| 
1852.15.3
by Robert Collins
 Add a first-cut Tree.walkdirs method.  | 
2380  | 
while pending:  | 
2381  | 
dirblock = []  | 
|
2382  | 
currentdir = pending.pop()  | 
|
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2383  | 
            # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-id, 5-kind
 | 
2384  | 
top_id = currentdir[4]  | 
|
| 
1852.15.3
by Robert Collins
 Add a first-cut Tree.walkdirs method.  | 
2385  | 
if currentdir[0]:  | 
2386  | 
relroot = currentdir[0] + '/'  | 
|
2387  | 
else:  | 
|
2388  | 
relroot = ""  | 
|
2389  | 
            # FIXME: stash the node in pending
 | 
|
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2390  | 
entry = inv[top_id]  | 
| 
1852.15.3
by Robert Collins
 Add a first-cut Tree.walkdirs method.  | 
2391  | 
for name, child in entry.sorted_children():  | 
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2392  | 
dirblock.append((relroot + name, name, child.kind, None,  | 
| 
1852.15.3
by Robert Collins
 Add a first-cut Tree.walkdirs method.  | 
2393  | 
child.file_id, child.kind  | 
2394  | 
                    ))
 | 
|
| 
1852.15.10
by Robert Collins
 Tweak the Tree.walkdirs interface more to be more useful.  | 
2395  | 
yield (currentdir[0], entry.file_id), dirblock  | 
| 
1852.15.3
by Robert Collins
 Add a first-cut Tree.walkdirs method.  | 
2396  | 
            # push the user specified dirs from dirblock
 | 
2397  | 
for dir in reversed(dirblock):  | 
|
2398  | 
if dir[2] == _directory:  | 
|
2399  | 
pending.append(dir)  | 
|
2400  | 
||
| 
2120.7.2
by Aaron Bentley
 Move autoresolve functionality to workingtree  | 
2401  | 
    @needs_tree_write_lock
 | 
2402  | 
def auto_resolve(self):  | 
|
2403  | 
"""Automatically resolve text conflicts according to contents.  | 
|
2404  | 
||
2405  | 
        Only text conflicts are auto_resolvable. Files with no conflict markers
 | 
|
2406  | 
        are considered 'resolved', because bzr always puts conflict markers
 | 
|
2407  | 
        into files that have text conflicts.  The corresponding .THIS .BASE and
 | 
|
2408  | 
        .OTHER files are deleted, as per 'resolve'.
 | 
|
2409  | 
        :return: a tuple of ConflictLists: (un_resolved, resolved).
 | 
|
2410  | 
        """
 | 
|
2411  | 
un_resolved = _mod_conflicts.ConflictList()  | 
|
2412  | 
resolved = _mod_conflicts.ConflictList()  | 
|
2413  | 
conflict_re = re.compile('^(<{7}|={7}|>{7})')  | 
|
2414  | 
for conflict in self.conflicts():  | 
|
| 
2120.7.3
by Aaron Bentley
 Update resolve command to automatically mark conflicts as resolved  | 
2415  | 
if (conflict.typestring != 'text conflict' or  | 
2416  | 
self.kind(conflict.file_id) != 'file'):  | 
|
| 
2120.7.2
by Aaron Bentley
 Move autoresolve functionality to workingtree  | 
2417  | 
un_resolved.append(conflict)  | 
2418  | 
                continue
 | 
|
2419  | 
my_file = open(self.id2abspath(conflict.file_id), 'rb')  | 
|
2420  | 
try:  | 
|
2421  | 
for line in my_file:  | 
|
2422  | 
if conflict_re.search(line):  | 
|
2423  | 
un_resolved.append(conflict)  | 
|
2424  | 
                        break
 | 
|
2425  | 
else:  | 
|
2426  | 
resolved.append(conflict)  | 
|
2427  | 
finally:  | 
|
2428  | 
my_file.close()  | 
|
2429  | 
resolved.remove_files(self)  | 
|
2430  | 
self.set_conflicts(un_resolved)  | 
|
2431  | 
return un_resolved, resolved  | 
|
2432  | 
||
| 
2371.2.1
by John Arbash Meinel
 Update DirState._validate() to detect rename errors.  | 
2433  | 
def _validate(self):  | 
2434  | 
"""Validate internal structures.  | 
|
2435  | 
||
2436  | 
        This is meant mostly for the test suite. To give it a chance to detect
 | 
|
2437  | 
        corruption after actions have occurred. The default implementation is a
 | 
|
2438  | 
        just a no-op.
 | 
|
2439  | 
||
2440  | 
        :return: None. An exception should be raised if there is an error.
 | 
|
2441  | 
        """
 | 
|
2442  | 
        return
 | 
|
2443  | 
||
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
2444  | 
|
| 
1852.4.2
by Robert Collins
 Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.  | 
2445  | 
class WorkingTree2(WorkingTree):  | 
2446  | 
"""This is the Format 2 working tree.  | 
|
2447  | 
||
2448  | 
    This was the first weave based working tree. 
 | 
|
2449  | 
     - uses os locks for locking.
 | 
|
2450  | 
     - uses the branch last-revision.
 | 
|
2451  | 
    """
 | 
|
2452  | 
||
| 
2334.1.4
by John Arbash Meinel
 WT2 needs to have an _inventory without a lock.  | 
2453  | 
def __init__(self, *args, **kwargs):  | 
2454  | 
super(WorkingTree2, self).__init__(*args, **kwargs)  | 
|
2455  | 
        # WorkingTree2 has more of a constraint that self._inventory must
 | 
|
2456  | 
        # exist. Because this is an older format, we don't mind the overhead
 | 
|
2457  | 
        # caused by the extra computation here.
 | 
|
2458  | 
||
2459  | 
        # Newer WorkingTree's should only have self._inventory set when they
 | 
|
2460  | 
        # have a read lock.
 | 
|
2461  | 
if self._inventory is None:  | 
|
2462  | 
self.read_working_inventory()  | 
|
2463  | 
||
| 
1997.1.1
by Robert Collins
 Add WorkingTree.lock_tree_write.  | 
2464  | 
def lock_tree_write(self):  | 
2465  | 
"""See WorkingTree.lock_tree_write().  | 
|
2466  | 
||
2467  | 
        In Format2 WorkingTrees we have a single lock for the branch and tree
 | 
|
2468  | 
        so lock_tree_write() degrades to lock_write().
 | 
|
2469  | 
        """
 | 
|
2470  | 
self.branch.lock_write()  | 
|
2471  | 
try:  | 
|
2472  | 
return self._control_files.lock_write()  | 
|
2473  | 
except:  | 
|
2474  | 
self.branch.unlock()  | 
|
2475  | 
            raise
 | 
|
2476  | 
||
| 
1852.4.2
by Robert Collins
 Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.  | 
2477  | 
def unlock(self):  | 
| 
2665.3.3
by Daniel Watkins
 Added _cleanup() to the unlock() method of all implementations of WorkingTree so that the cached ignore definitions are wiped when a lock is lost.  | 
2478  | 
        # do non-implementation specific cleanup
 | 
2479  | 
self._cleanup()  | 
|
2480  | 
||
| 
1852.4.2
by Robert Collins
 Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.  | 
2481  | 
        # we share control files:
 | 
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
2482  | 
if self._control_files._lock_count == 3:  | 
2483  | 
            # _inventory_is_modified is always False during a read lock.
 | 
|
2484  | 
if self._inventory_is_modified:  | 
|
2485  | 
self.flush()  | 
|
| 
2201.1.1
by John Arbash Meinel
 Fix bug #76299 by ignoring write errors during readonly hashcache write.  | 
2486  | 
self._write_hashcache_if_dirty()  | 
2487  | 
||
| 
1852.4.2
by Robert Collins
 Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.  | 
2488  | 
        # reverse order of locking.
 | 
2489  | 
try:  | 
|
2490  | 
return self._control_files.unlock()  | 
|
2491  | 
finally:  | 
|
2492  | 
self.branch.unlock()  | 
|
2493  | 
||
2494  | 
||
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
2495  | 
class WorkingTree3(WorkingTree):  | 
2496  | 
"""This is the Format 3 working tree.  | 
|
2497  | 
||
2498  | 
    This differs from the base WorkingTree by:
 | 
|
2499  | 
     - having its own file lock
 | 
|
2500  | 
     - having its own last-revision property.
 | 
|
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2501  | 
|
2502  | 
    This is new in bzr 0.8
 | 
|
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
2503  | 
    """
 | 
2504  | 
||
2505  | 
    @needs_read_lock
 | 
|
| 
1908.7.6
by Robert Collins
 Deprecate WorkingTree.last_revision.  | 
2506  | 
def _last_revision(self):  | 
| 
1986.1.6
by Robert Collins
 Add MemoryTree.last_revision.  | 
2507  | 
"""See Mutable.last_revision."""  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
2508  | 
try:  | 
| 
2858.2.1
by Martin Pool
 Remove most calls to safe_file_id and safe_revision_id.  | 
2509  | 
return self._control_files.get('last-revision').read()  | 
| 
2206.1.7
by Marius Kruger
 * errors  | 
2510  | 
except errors.NoSuchFile:  | 
| 
2598.5.10
by Aaron Bentley
 Return NULL_REVISION instead of None for the null revision  | 
2511  | 
return _mod_revision.NULL_REVISION  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
2512  | 
|
2513  | 
def _change_last_revision(self, revision_id):  | 
|
2514  | 
"""See WorkingTree._change_last_revision."""  | 
|
2515  | 
if revision_id is None or revision_id == NULL_REVISION:  | 
|
2516  | 
try:  | 
|
2517  | 
self._control_files._transport.delete('last-revision')  | 
|
2518  | 
except errors.NoSuchFile:  | 
|
2519  | 
                pass
 | 
|
2520  | 
return False  | 
|
2521  | 
else:  | 
|
| 
2294.1.1
by John Arbash Meinel
 Track down some non-ascii deficiencies in commit logic.  | 
2522  | 
self._control_files.put_bytes('last-revision', revision_id)  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
2523  | 
return True  | 
2524  | 
||
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
2525  | 
    @needs_tree_write_lock
 | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
2526  | 
def set_conflicts(self, conflicts):  | 
2527  | 
self._put_rio('conflicts', conflicts.to_stanzas(),  | 
|
| 
1534.10.21
by Aaron Bentley
 Moved and renamed conflict functions  | 
2528  | 
CONFLICT_HEADER_1)  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
2529  | 
|
| 
1997.1.3
by Robert Collins
 All WorkingTree methods which write to the tree, but not to the branch  | 
2530  | 
    @needs_tree_write_lock
 | 
| 
1551.7.11
by Aaron Bentley
 Add WorkingTree.add_conflicts  | 
2531  | 
def add_conflicts(self, new_conflicts):  | 
2532  | 
conflict_set = set(self.conflicts())  | 
|
2533  | 
conflict_set.update(set(list(new_conflicts)))  | 
|
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2534  | 
self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set,  | 
2535  | 
key=_mod_conflicts.Conflict.sort_key)))  | 
|
| 
1551.7.11
by Aaron Bentley
 Add WorkingTree.add_conflicts  | 
2536  | 
|
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
2537  | 
    @needs_read_lock
 | 
| 
1534.10.22
by Aaron Bentley
 Got ConflictList implemented  | 
2538  | 
def conflicts(self):  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
2539  | 
try:  | 
2540  | 
confile = self._control_files.get('conflicts')  | 
|
| 
2206.1.7
by Marius Kruger
 * errors  | 
2541  | 
except errors.NoSuchFile:  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2542  | 
return _mod_conflicts.ConflictList()  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
2543  | 
try:  | 
2544  | 
if confile.next() != CONFLICT_HEADER_1 + '\n':  | 
|
| 
2206.1.7
by Marius Kruger
 * errors  | 
2545  | 
raise errors.ConflictFormatError()  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
2546  | 
except StopIteration:  | 
| 
2206.1.7
by Marius Kruger
 * errors  | 
2547  | 
raise errors.ConflictFormatError()  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2548  | 
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))  | 
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
2549  | 
|
| 
1852.4.2
by Robert Collins
 Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.  | 
2550  | 
def unlock(self):  | 
| 
2665.3.3
by Daniel Watkins
 Added _cleanup() to the unlock() method of all implementations of WorkingTree so that the cached ignore definitions are wiped when a lock is lost.  | 
2551  | 
        # do non-implementation specific cleanup
 | 
2552  | 
self._cleanup()  | 
|
| 
1986.5.3
by Robert Collins
 New method ``WorkingTree.flush()`` which will write the current memory  | 
2553  | 
if self._control_files._lock_count == 1:  | 
2554  | 
            # _inventory_is_modified is always False during a read lock.
 | 
|
2555  | 
if self._inventory_is_modified:  | 
|
2556  | 
self.flush()  | 
|
| 
2201.1.1
by John Arbash Meinel
 Fix bug #76299 by ignoring write errors during readonly hashcache write.  | 
2557  | 
self._write_hashcache_if_dirty()  | 
| 
1852.4.2
by Robert Collins
 Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.  | 
2558  | 
        # reverse order of locking.
 | 
2559  | 
try:  | 
|
2560  | 
return self._control_files.unlock()  | 
|
2561  | 
finally:  | 
|
2562  | 
self.branch.unlock()  | 
|
2563  | 
||
| 
1534.10.6
by Aaron Bentley
 Conflict serialization working for WorkingTree3  | 
2564  | 
|
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
2565  | 
def get_conflicted_stem(path):  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2566  | 
for suffix in _mod_conflicts.CONFLICT_SUFFIXES:  | 
| 
1185.14.6
by Aaron Bentley
 Made iter_conflicts a WorkingTree method  | 
2567  | 
if path.endswith(suffix):  | 
2568  | 
return path[:-len(suffix)]  | 
|
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
2569  | 
|
| 
2255.2.3
by Robert Collins
 Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.  | 
2570  | 
|
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
2571  | 
@deprecated_function(zero_eight)  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
2572  | 
def is_control_file(filename):  | 
| 
1534.5.5
by Robert Collins
 Move is_control_file into WorkingTree.is_control_filename and test.  | 
2573  | 
"""See WorkingTree.is_control_filename(filename)."""  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
2574  | 
    ## FIXME: better check
 | 
2575  | 
filename = normpath(filename)  | 
|
2576  | 
while filename != '':  | 
|
2577  | 
head, tail = os.path.split(filename)  | 
|
2578  | 
        ## 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.  | 
2579  | 
if tail == '.bzr':  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
2580  | 
return True  | 
2581  | 
if filename == head:  | 
|
2582  | 
            break
 | 
|
2583  | 
filename = head  | 
|
2584  | 
return False  | 
|
2585  | 
||
2586  | 
||
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2587  | 
class WorkingTreeFormat(object):  | 
2588  | 
"""An encapsulation of the initialization and open routines for a format.  | 
|
2589  | 
||
2590  | 
    Formats provide three things:
 | 
|
2591  | 
     * An initialization routine,
 | 
|
2592  | 
     * a format string,
 | 
|
2593  | 
     * an open routine.
 | 
|
2594  | 
||
2595  | 
    Formats are placed in an dict by their format string for reference 
 | 
|
2596  | 
    during workingtree opening. Its not required that these be instances, they
 | 
|
2597  | 
    can be classes themselves with class methods - it simply depends on 
 | 
|
2598  | 
    whether state is needed for a given format or not.
 | 
|
2599  | 
||
2600  | 
    Once a format is deprecated, just deprecate the initialize and open
 | 
|
2601  | 
    methods on the format class. Do not deprecate the object, as the 
 | 
|
2602  | 
    object will be created every time regardless.
 | 
|
2603  | 
    """
 | 
|
2604  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2605  | 
_default_format = None  | 
2606  | 
"""The default format used for new trees."""  | 
|
2607  | 
||
2608  | 
_formats = {}  | 
|
2609  | 
"""The known formats."""  | 
|
2610  | 
||
| 
2100.3.14
by Aaron Bentley
 Test workingtree4 format, prevent use with old repos  | 
2611  | 
requires_rich_root = False  | 
2612  | 
||
| 
2323.6.4
by Martin Pool
 BzrDir._check_supported now also takes care of recommending upgrades, which  | 
2613  | 
upgrade_recommended = False  | 
2614  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2615  | 
    @classmethod
 | 
2616  | 
def find_format(klass, a_bzrdir):  | 
|
2617  | 
"""Return the format for the working tree object in a_bzrdir."""  | 
|
2618  | 
try:  | 
|
2619  | 
transport = a_bzrdir.get_workingtree_transport(None)  | 
|
2620  | 
format_string = transport.get("format").read()  | 
|
2621  | 
return klass._formats[format_string]  | 
|
| 
2206.1.7
by Marius Kruger
 * errors  | 
2622  | 
except errors.NoSuchFile:  | 
| 
1508.1.19
by Robert Collins
 Give format3 working trees their own last-revision marker.  | 
2623  | 
raise errors.NoWorkingTree(base=transport.base)  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2624  | 
except KeyError:  | 
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
2625  | 
raise errors.UnknownFormatError(format=format_string)  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2626  | 
|
| 
2100.3.35
by Aaron Bentley
 equality operations on bzrdir  | 
2627  | 
def __eq__(self, other):  | 
2628  | 
return self.__class__ is other.__class__  | 
|
2629  | 
||
2630  | 
def __ne__(self, other):  | 
|
2631  | 
return not (self == other)  | 
|
2632  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2633  | 
    @classmethod
 | 
2634  | 
def get_default_format(klass):  | 
|
2635  | 
"""Return the current default format."""  | 
|
2636  | 
return klass._default_format  | 
|
2637  | 
||
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2638  | 
def get_format_string(self):  | 
2639  | 
"""Return the ASCII format string that identifies this format."""  | 
|
2640  | 
raise NotImplementedError(self.get_format_string)  | 
|
2641  | 
||
| 
1624.3.19
by Olaf Conradi
 New call get_format_description to give a user-friendly description of a  | 
2642  | 
def get_format_description(self):  | 
2643  | 
"""Return the short description for this format."""  | 
|
2644  | 
raise NotImplementedError(self.get_format_description)  | 
|
2645  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2646  | 
def is_supported(self):  | 
2647  | 
"""Is this format supported?  | 
|
2648  | 
||
2649  | 
        Supported formats can be initialized and opened.
 | 
|
2650  | 
        Unsupported formats may not support initialization or committing or 
 | 
|
2651  | 
        some other features depending on the reason for not being supported.
 | 
|
2652  | 
        """
 | 
|
2653  | 
return True  | 
|
2654  | 
||
2655  | 
    @classmethod
 | 
|
2656  | 
def register_format(klass, format):  | 
|
2657  | 
klass._formats[format.get_format_string()] = format  | 
|
2658  | 
||
2659  | 
    @classmethod
 | 
|
2660  | 
def set_default_format(klass, format):  | 
|
2661  | 
klass._default_format = format  | 
|
2662  | 
||
2663  | 
    @classmethod
 | 
|
2664  | 
def unregister_format(klass, format):  | 
|
2665  | 
assert klass._formats[format.get_format_string()] is format  | 
|
2666  | 
del klass._formats[format.get_format_string()]  | 
|
2667  | 
||
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2668  | 
|
2669  | 
class WorkingTreeFormat2(WorkingTreeFormat):  | 
|
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
2670  | 
"""The second working tree format.  | 
2671  | 
||
2672  | 
    This format modified the hash cache from the format 1 hash cache.
 | 
|
2673  | 
    """
 | 
|
2674  | 
||
| 
2323.6.4
by Martin Pool
 BzrDir._check_supported now also takes care of recommending upgrades, which  | 
2675  | 
upgrade_recommended = True  | 
2676  | 
||
| 
1624.3.19
by Olaf Conradi
 New call get_format_description to give a user-friendly description of a  | 
2677  | 
def get_format_description(self):  | 
2678  | 
"""See WorkingTreeFormat.get_format_description()."""  | 
|
2679  | 
return "Working tree format 2"  | 
|
2680  | 
||
| 
1692.7.9
by Martin Pool
 Don't create broken standalone branches over sftp (Malone #43064)  | 
2681  | 
def stub_initialize_remote(self, control_files):  | 
2682  | 
"""As a special workaround create critical control files for a remote working tree  | 
|
2683  | 
        
 | 
|
2684  | 
        This ensures that it can later be updated and dealt with locally,
 | 
|
2685  | 
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with 
 | 
|
2686  | 
        no working tree.  (See bug #43064).
 | 
|
2687  | 
        """
 | 
|
2688  | 
sio = StringIO()  | 
|
2689  | 
inv = Inventory()  | 
|
| 
2817.2.1
by Robert Collins
 * Inventory serialisation no longer double-sha's the content.  | 
2690  | 
xml5.serializer_v5.write_inventory(inv, sio, working=True)  | 
| 
1692.7.9
by Martin Pool
 Don't create broken standalone branches over sftp (Malone #43064)  | 
2691  | 
sio.seek(0)  | 
2692  | 
control_files.put('inventory', sio)  | 
|
2693  | 
||
| 
2294.1.2
by John Arbash Meinel
 Track down and add tests that all tree.commit() can handle  | 
2694  | 
control_files.put_bytes('pending-merges', '')  | 
| 
1692.7.9
by Martin Pool
 Don't create broken standalone branches over sftp (Malone #43064)  | 
2695  | 
|
2696  | 
||
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
2697  | 
def initialize(self, a_bzrdir, revision_id=None):  | 
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
2698  | 
"""See WorkingTreeFormat.initialize()."""  | 
2699  | 
if not isinstance(a_bzrdir.transport, LocalTransport):  | 
|
2700  | 
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.  | 
2701  | 
branch = a_bzrdir.open_branch()  | 
| 
2598.5.4
by Aaron Bentley
 Restore original Branch.last_revision behavior, fix bits that care  | 
2702  | 
if revision_id is None:  | 
2703  | 
revision_id = _mod_revision.ensure_null(branch.last_revision())  | 
|
2704  | 
branch.lock_write()  | 
|
2705  | 
try:  | 
|
2706  | 
branch.generate_revision_history(revision_id)  | 
|
2707  | 
finally:  | 
|
2708  | 
branch.unlock()  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
2709  | 
inv = Inventory()  | 
| 
1852.4.2
by Robert Collins
 Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from.  | 
2710  | 
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),  | 
| 
1534.4.50
by Robert Collins
 Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.  | 
2711  | 
branch,  | 
2712  | 
inv,  | 
|
2713  | 
_internal=True,  | 
|
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
2714  | 
_format=self,  | 
2715  | 
_bzrdir=a_bzrdir)  | 
|
| 
2598.5.4
by Aaron Bentley
 Restore original Branch.last_revision behavior, fix bits that care  | 
2716  | 
basis_tree = branch.repository.revision_tree(revision_id)  | 
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
2717  | 
if basis_tree.inventory.root is not None:  | 
| 
1986.5.8
by Robert Collins
 Merge bzr.dev.  | 
2718  | 
wt.set_root_id(basis_tree.inventory.root.file_id)  | 
2719  | 
        # set the parent list and cache the basis tree.
 | 
|
| 
2598.5.4
by Aaron Bentley
 Restore original Branch.last_revision behavior, fix bits that care  | 
2720  | 
if _mod_revision.is_null(revision_id):  | 
| 
2598.5.2
by Aaron Bentley
 Got all tests passing with Branch returning 'null:' for null revision  | 
2721  | 
parent_trees = []  | 
2722  | 
else:  | 
|
| 
2598.5.4
by Aaron Bentley
 Restore original Branch.last_revision behavior, fix bits that care  | 
2723  | 
parent_trees = [(revision_id, basis_tree)]  | 
| 
2598.5.2
by Aaron Bentley
 Got all tests passing with Branch returning 'null:' for null revision  | 
2724  | 
wt.set_parent_trees(parent_trees)  | 
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2725  | 
transform.build_tree(basis_tree, wt)  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2726  | 
return wt  | 
2727  | 
||
2728  | 
def __init__(self):  | 
|
2729  | 
super(WorkingTreeFormat2, self).__init__()  | 
|
2730  | 
self._matchingbzrdir = bzrdir.BzrDirFormat6()  | 
|
| 
1534.4.42
by Robert Collins
 add working tree to the BzrDir facilities.  | 
2731  | 
|
2732  | 
def open(self, a_bzrdir, _found=False):  | 
|
2733  | 
"""Return the WorkingTree object for a_bzrdir  | 
|
2734  | 
||
2735  | 
        _found is a private parameter, do not use it. It is used to indicate
 | 
|
2736  | 
               if format probing has already been done.
 | 
|
2737  | 
        """
 | 
|
2738  | 
if not _found:  | 
|
2739  | 
            # we are being called directly and must probe.
 | 
|
2740  | 
raise NotImplementedError  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2741  | 
if not isinstance(a_bzrdir.transport, LocalTransport):  | 
2742  | 
raise errors.NotLocalUrl(a_bzrdir.transport.base)  | 
|
| 
2323.6.4
by Martin Pool
 BzrDir._check_supported now also takes care of recommending upgrades, which  | 
2743  | 
wt = WorkingTree2(a_bzrdir.root_transport.local_abspath('.'),  | 
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
2744  | 
_internal=True,  | 
2745  | 
_format=self,  | 
|
2746  | 
_bzrdir=a_bzrdir)  | 
|
| 
2323.6.4
by Martin Pool
 BzrDir._check_supported now also takes care of recommending upgrades, which  | 
2747  | 
return wt  | 
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2748  | 
|
2749  | 
class WorkingTreeFormat3(WorkingTreeFormat):  | 
|
2750  | 
"""The second working tree format updated to record a format marker.  | 
|
2751  | 
||
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2752  | 
    This format:
 | 
2753  | 
        - exists within a metadir controlling .bzr
 | 
|
2754  | 
        - includes an explicit version marker for the workingtree control
 | 
|
2755  | 
          files, separate from the BzrDir format
 | 
|
2756  | 
        - modifies the hash cache format
 | 
|
2757  | 
        - is new in bzr 0.8
 | 
|
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
2758  | 
        - uses a LockDir to guard access for writes.
 | 
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2759  | 
    """
 | 
| 
2323.6.4
by Martin Pool
 BzrDir._check_supported now also takes care of recommending upgrades, which  | 
2760  | 
|
2761  | 
upgrade_recommended = True  | 
|
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2762  | 
|
2763  | 
def get_format_string(self):  | 
|
2764  | 
"""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  | 
2765  | 
return "Bazaar-NG Working Tree format 3"  | 
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2766  | 
|
| 
1624.3.19
by Olaf Conradi
 New call get_format_description to give a user-friendly description of a  | 
2767  | 
def get_format_description(self):  | 
2768  | 
"""See WorkingTreeFormat.get_format_description()."""  | 
|
2769  | 
return "Working tree format 3"  | 
|
2770  | 
||
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2771  | 
_lock_file_name = 'lock'  | 
2772  | 
_lock_class = LockDir  | 
|
2773  | 
||
| 
2100.3.3
by Aaron Bentley
 Start of work on format 4 trees  | 
2774  | 
_tree_class = WorkingTree3  | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2775  | 
|
| 
2100.3.15
by Aaron Bentley
 get test suite passing  | 
2776  | 
def __get_matchingbzrdir(self):  | 
2777  | 
return bzrdir.BzrDirMetaFormat1()  | 
|
2778  | 
||
2779  | 
_matchingbzrdir = property(__get_matchingbzrdir)  | 
|
2780  | 
||
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2781  | 
def _open_control_files(self, a_bzrdir):  | 
2782  | 
transport = a_bzrdir.get_workingtree_transport(None)  | 
|
2783  | 
return LockableFiles(transport, self._lock_file_name,  | 
|
2784  | 
self._lock_class)  | 
|
2785  | 
||
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
2786  | 
def initialize(self, a_bzrdir, revision_id=None):  | 
2787  | 
"""See WorkingTreeFormat.initialize().  | 
|
2788  | 
        
 | 
|
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
2789  | 
        revision_id allows creating a working tree at a different
 | 
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
2790  | 
        revision than the branch is at.
 | 
2791  | 
        """
 | 
|
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2792  | 
if not isinstance(a_bzrdir.transport, LocalTransport):  | 
2793  | 
raise errors.NotLocalUrl(a_bzrdir.transport.base)  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2794  | 
transport = a_bzrdir.get_workingtree_transport(self)  | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2795  | 
control_files = self._open_control_files(a_bzrdir)  | 
2796  | 
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.  | 
2797  | 
control_files.lock_write()  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2798  | 
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.  | 
2799  | 
branch = a_bzrdir.open_branch()  | 
| 
1508.1.21
by Robert Collins
 Implement -r limit for checkout command.  | 
2800  | 
if revision_id is None:  | 
| 
2598.5.7
by Aaron Bentley
 Updates from review  | 
2801  | 
revision_id = _mod_revision.ensure_null(branch.last_revision())  | 
| 
2084.1.1
by John Arbash Meinel
 Don't create new working trees with unique roots, because it breaks older versions of bzr  | 
2802  | 
        # WorkingTree3 can handle an inventory which has a unique root id.
 | 
2803  | 
        # as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
 | 
|
2804  | 
        # those trees. And because there isn't a format bump inbetween, we
 | 
|
2805  | 
        # are maintaining compatibility with older clients.
 | 
|
2806  | 
        # inv = Inventory(root_id=gen_root_id())
 | 
|
| 
2100.3.12
by Aaron Bentley
 Stop generating unique roots for WorkingTree3  | 
2807  | 
inv = self._initial_inventory()  | 
| 
2100.3.8
by Aaron Bentley
 Add add_reference  | 
2808  | 
wt = self._tree_class(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.  | 
2809  | 
branch,  | 
2810  | 
inv,  | 
|
2811  | 
_internal=True,  | 
|
| 
1534.4.51
by Robert Collins
 Test the disk layout of format3 working trees.  | 
2812  | 
_format=self,  | 
| 
1553.5.74
by Martin Pool
 Convert WorkingTree format3 to use LockDirs  | 
2813  | 
_bzrdir=a_bzrdir,  | 
2814  | 
_control_files=control_files)  | 
|
| 
1997.1.4
by Robert Collins
 ``bzr checkout --lightweight`` now operates on readonly branches as well  | 
2815  | 
wt.lock_tree_write()  | 
| 
1607.1.14
by Robert Collins
 Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.  | 
2816  | 
try:  | 
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
2817  | 
basis_tree = branch.repository.revision_tree(revision_id)  | 
| 
1986.5.8
by Robert Collins
 Merge bzr.dev.  | 
2818  | 
            # only set an explicit root id if there is one to set.
 | 
2819  | 
if basis_tree.inventory.root is not None:  | 
|
2820  | 
wt.set_root_id(basis_tree.inventory.root.file_id)  | 
|
| 
2598.5.7
by Aaron Bentley
 Updates from review  | 
2821  | 
if revision_id == NULL_REVISION:  | 
| 
1551.8.20
by Aaron Bentley
 Fix BzrDir.create_workingtree for NULL_REVISION  | 
2822  | 
wt.set_parent_trees([])  | 
2823  | 
else:  | 
|
2824  | 
wt.set_parent_trees([(revision_id, basis_tree)])  | 
|
| 
1996.3.6
by John Arbash Meinel
 Find a few places that weren't importing their dependencies.  | 
2825  | 
transform.build_tree(basis_tree, wt)  | 
| 
1607.1.14
by Robert Collins
 Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.  | 
2826  | 
finally:  | 
| 
1986.5.7
by Robert Collins
 Merge reviews.  | 
2827  | 
            # Unlock in this order so that the unlock-triggers-flush in
 | 
| 
1986.5.4
by Robert Collins
 Update comments and unlock in a better order in tree initialization (Robert Collins, John Meinel)  | 
2828  | 
            # WorkingTree is given a chance to fire.
 | 
2829  | 
control_files.unlock()  | 
|
| 
1607.1.14
by Robert Collins
 Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks.  | 
2830  | 
wt.unlock()  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2831  | 
return wt  | 
2832  | 
||
| 
2100.3.12
by Aaron Bentley
 Stop generating unique roots for WorkingTree3  | 
2833  | 
def _initial_inventory(self):  | 
2834  | 
return Inventory()  | 
|
2835  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2836  | 
def __init__(self):  | 
2837  | 
super(WorkingTreeFormat3, self).__init__()  | 
|
| 
1534.4.45
by Robert Collins
 Start WorkingTree -> .bzr/checkout transition  | 
2838  | 
|
2839  | 
def open(self, a_bzrdir, _found=False):  | 
|
2840  | 
"""Return the WorkingTree object for a_bzrdir  | 
|
2841  | 
||
2842  | 
        _found is a private parameter, do not use it. It is used to indicate
 | 
|
2843  | 
               if format probing has already been done.
 | 
|
2844  | 
        """
 | 
|
2845  | 
if not _found:  | 
|
2846  | 
            # we are being called directly and must probe.
 | 
|
2847  | 
raise NotImplementedError  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2848  | 
if not isinstance(a_bzrdir.transport, LocalTransport):  | 
2849  | 
raise errors.NotLocalUrl(a_bzrdir.transport.base)  | 
|
| 
2323.6.4
by Martin Pool
 BzrDir._check_supported now also takes care of recommending upgrades, which  | 
2850  | 
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))  | 
2851  | 
return wt  | 
|
| 
1852.3.1
by Robert Collins
 Trivial cleanups to workingtree.py  | 
2852  | 
|
2853  | 
def _open(self, a_bzrdir, control_files):  | 
|
2854  | 
"""Open the tree itself.  | 
|
2855  | 
        
 | 
|
2856  | 
        :param a_bzrdir: the dir for the tree.
 | 
|
2857  | 
        :param control_files: the control files for the tree.
 | 
|
2858  | 
        """
 | 
|
| 
2100.3.3
by Aaron Bentley
 Start of work on format 4 trees  | 
2859  | 
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'),  | 
2860  | 
_internal=True,  | 
|
2861  | 
_format=self,  | 
|
2862  | 
_bzrdir=a_bzrdir,  | 
|
2863  | 
_control_files=control_files)  | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2864  | 
|
| 
1534.5.1
by Robert Collins
 Give info some reasonable output and tests.  | 
2865  | 
def __str__(self):  | 
2866  | 
return self.get_format_string()  | 
|
2867  | 
||
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2868  | 
|
| 
2255.2.173
by Martin Pool
 Set default wt to 4, as in dirstate branch  | 
2869  | 
__default_format = WorkingTreeFormat4()  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2870  | 
WorkingTreeFormat.register_format(__default_format)  | 
| 
2255.2.173
by Martin Pool
 Set default wt to 4, as in dirstate branch  | 
2871  | 
WorkingTreeFormat.register_format(WorkingTreeFormat3())  | 
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2872  | 
WorkingTreeFormat.set_default_format(__default_format)  | 
| 
1852.13.2
by Robert Collins
 Introduce a WorkingTree Format 4, which is the new dirstate format.  | 
2873  | 
# formats which have no format string are not discoverable
 | 
2874  | 
# and not independently creatable, so are not registered.
 | 
|
| 
1534.4.46
by Robert Collins
 Nearly complete .bzr/checkout splitout.  | 
2875  | 
_legacy_formats = [WorkingTreeFormat2(),  | 
2876  | 
                   ]
 |