5630.2.5
by John Arbash Meinel
(broken) Intermediate state to make reset_tree work even when things are broken. |
1 |
# Copyright (C) 2007-2011 Canonical Ltd
|
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. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
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. |
16 |
|
17 |
"""WorkingTree4 format and implementation.
|
|
18 |
||
19 |
WorkingTree4 provides the dirstate based working tree logic.
|
|
20 |
||
21 |
To get a WorkingTree, call bzrdir.open_workingtree() or
|
|
22 |
WorkingTree.open(dir).
|
|
23 |
"""
|
|
24 |
||
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
25 |
from cStringIO import StringIO |
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. |
26 |
import os |
2255.2.138
by John Arbash Meinel
implement several new WorkingTree.move() tests |
27 |
import sys |
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. |
28 |
|
29 |
from bzrlib.lazy_import import lazy_import |
|
30 |
lazy_import(globals(), """ |
|
31 |
import errno
|
|
32 |
import stat
|
|
33 |
||
34 |
from bzrlib import (
|
|
35 |
bzrdir,
|
|
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
36 |
cache_utf8,
|
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
37 |
config,
|
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
38 |
conflicts as _mod_conflicts,
|
2745.1.1
by Robert Collins
Add a number of -Devil checkpoints. |
39 |
debug,
|
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. |
40 |
dirstate,
|
41 |
errors,
|
|
5745.3.2
by Jelmer Vernooij
Add filters to import tariff blacklist. |
42 |
filters as _mod_filters,
|
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. |
43 |
generate_ids,
|
44 |
osutils,
|
|
2598.5.2
by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision |
45 |
revision as _mod_revision,
|
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
46 |
revisiontree,
|
5753.2.4
by Jelmer Vernooij
Review feedback from John. |
47 |
trace,
|
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. |
48 |
transform,
|
3586.2.13
by Ian Clatworthy
fix wt5 to use views, correcting an earlier merge |
49 |
views,
|
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. |
50 |
)
|
51 |
""") |
|
52 |
||
53 |
from bzrlib.decorators import needs_read_lock, needs_write_lock |
|
4496.3.16
by Andrew Bennetts
Remove lots of unused imports. |
54 |
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory |
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
55 |
from bzrlib.lock import LogicalLockResult |
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
56 |
from bzrlib.lockable_files import LockableFiles |
57 |
from bzrlib.lockdir import LockDir |
|
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. |
58 |
from bzrlib.mutabletree import needs_tree_write_lock |
59 |
from bzrlib.osutils import ( |
|
2255.2.202
by Martin Pool
WorkingTree_4.kind should report tree-references if they're |
60 |
file_kind, |
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. |
61 |
isdir, |
62 |
pathjoin, |
|
63 |
realpath, |
|
64 |
safe_unicode, |
|
65 |
)
|
|
66 |
from bzrlib.transport.local import LocalTransport |
|
5777.3.1
by Jelmer Vernooij
Split InventoryTree out of Tree. |
67 |
from bzrlib.tree import ( |
68 |
InterTree, |
|
69 |
InventoryTree, |
|
70 |
)
|
|
71 |
from bzrlib.workingtree import ( |
|
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
72 |
InventoryWorkingTree, |
5777.3.1
by Jelmer Vernooij
Split InventoryTree out of Tree. |
73 |
WorkingTree, |
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
74 |
WorkingTreeFormat, |
5777.3.1
by Jelmer Vernooij
Split InventoryTree out of Tree. |
75 |
)
|
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. |
76 |
|
77 |
||
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
78 |
class DirStateWorkingTree(InventoryWorkingTree): |
5777.3.1
by Jelmer Vernooij
Split InventoryTree out of Tree. |
79 |
|
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. |
80 |
def __init__(self, basedir, |
81 |
branch, |
|
82 |
_control_files=None, |
|
83 |
_format=None, |
|
84 |
_bzrdir=None): |
|
85 |
"""Construct a WorkingTree for basedir.
|
|
86 |
||
87 |
If the branch is not supplied, it is opened automatically.
|
|
88 |
If the branch is supplied, it must be the branch for this basedir.
|
|
89 |
(branch.base is not cross checked, because for remote branches that
|
|
90 |
would be meaningless).
|
|
91 |
"""
|
|
92 |
self._format = _format |
|
93 |
self.bzrdir = _bzrdir |
|
94 |
basedir = safe_unicode(basedir) |
|
5753.2.4
by Jelmer Vernooij
Review feedback from John. |
95 |
trace.mutter("opening working tree %r", basedir) |
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. |
96 |
self._branch = branch |
97 |
self.basedir = realpath(basedir) |
|
98 |
# if branch is at our basedir and is a format 6 or less
|
|
99 |
# assume all other formats have their own control files.
|
|
100 |
self._control_files = _control_files |
|
3407.2.1
by Martin Pool
Deprecate LockableFiles.get |
101 |
self._transport = self._control_files._transport |
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. |
102 |
self._dirty = None |
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
103 |
#-------------
|
104 |
# during a read or write lock these objects are set, and are
|
|
105 |
# None the rest of the time.
|
|
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. |
106 |
self._dirstate = None |
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
107 |
self._inventory = None |
108 |
#-------------
|
|
2974.2.2
by John Arbash Meinel
Only one test failed, because it was incorrectly succeeding. |
109 |
self._setup_directory_is_tree_reference() |
3034.4.3
by Aaron Bentley
Add case-sensitivity handling to WorkingTree |
110 |
self._detect_case_handling() |
3398.1.24
by Ian Clatworthy
make iter_search_rules a tree method |
111 |
self._rules_searcher = None |
3586.1.4
by Ian Clatworthy
first cut at tree-level view tests |
112 |
self.views = self._make_views() |
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
113 |
#--- allow tests to select the dirstate iter_changes implementation
|
114 |
self._iter_changes = dirstate._process_entry |
|
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. |
115 |
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
116 |
@needs_tree_write_lock
|
2255.2.12
by Robert Collins
Partial implementation of WorkingTree4._add. |
117 |
def _add(self, files, ids, kinds): |
118 |
"""See MutableTree._add."""
|
|
119 |
state = self.current_dirstate() |
|
120 |
for f, file_id, kind in zip(files, ids, kinds): |
|
2255.2.14
by Robert Collins
Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit. |
121 |
f = f.strip('/') |
2255.7.74
by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4. |
122 |
if self.path2id(f): |
123 |
# special case tree root handling.
|
|
124 |
if f == '' and self.path2id(f) == ROOT_ID: |
|
125 |
state.set_path_id('', generate_ids.gen_file_id(f)) |
|
126 |
continue
|
|
2255.2.12
by Robert Collins
Partial implementation of WorkingTree4._add. |
127 |
if file_id is None: |
2255.2.20
by Robert Collins
Bypass irrelevant basis_inventory tests for dirstate. |
128 |
file_id = generate_ids.gen_file_id(f) |
2255.2.43
by Robert Collins
WorkingTree4.add must not require a file to exist to add it when kind etc is given. |
129 |
# deliberately add the file with no cached stat or sha1
|
130 |
# - on the first access it will be gathered, and we can
|
|
131 |
# always change this once tests are all passing.
|
|
132 |
state.add(f, file_id, kind, None, '') |
|
2255.7.67
by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists. |
133 |
self._make_dirty(reset_inventory=True) |
134 |
||
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
135 |
def _get_check_refs(self): |
136 |
"""Return the references needed to perform a check of this tree."""
|
|
137 |
return [('trees', self.last_revision())] |
|
138 |
||
2255.7.67
by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists. |
139 |
def _make_dirty(self, reset_inventory): |
140 |
"""Make the tree state dirty.
|
|
141 |
||
142 |
:param reset_inventory: True if the cached inventory should be removed
|
|
143 |
(presuming there is one).
|
|
144 |
"""
|
|
2255.2.16
by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types. |
145 |
self._dirty = True |
2255.7.67
by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists. |
146 |
if reset_inventory and self._inventory is not None: |
147 |
self._inventory = None |
|
2255.2.12
by Robert Collins
Partial implementation of WorkingTree4._add. |
148 |
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
149 |
@needs_tree_write_lock
|
150 |
def add_reference(self, sub_tree): |
|
151 |
# use standard implementation, which calls back to self._add
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
152 |
#
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
153 |
# So we don't store the reference_revision in the working dirstate,
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
154 |
# it's just recorded at the moment of commit.
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
155 |
self._add_reference(sub_tree) |
156 |
||
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
157 |
def break_lock(self): |
158 |
"""Break a lock if one is present from another instance.
|
|
159 |
||
160 |
Uses the ui factory to ask for confirmation if the lock may be from
|
|
161 |
an active process.
|
|
162 |
||
163 |
This will probe the repository for its lock as well.
|
|
164 |
"""
|
|
165 |
# if the dirstate is locked by an active process, reject the break lock
|
|
166 |
# call.
|
|
167 |
try: |
|
168 |
if self._dirstate is None: |
|
169 |
clear = True |
|
170 |
else: |
|
171 |
clear = False |
|
172 |
state = self._current_dirstate() |
|
173 |
if state._lock_token is not None: |
|
174 |
# we already have it locked. sheese, cant break our own lock.
|
|
175 |
raise errors.LockActive(self.basedir) |
|
176 |
else: |
|
177 |
try: |
|
178 |
# try for a write lock - need permission to get one anyhow
|
|
179 |
# to break locks.
|
|
180 |
state.lock_write() |
|
181 |
except errors.LockContention: |
|
182 |
# oslocks fail when a process is still live: fail.
|
|
183 |
# TODO: get the locked lockdir info and give to the user to
|
|
184 |
# assist in debugging.
|
|
185 |
raise errors.LockActive(self.basedir) |
|
186 |
else: |
|
187 |
state.unlock() |
|
188 |
finally: |
|
189 |
if clear: |
|
190 |
self._dirstate = None |
|
191 |
self._control_files.break_lock() |
|
192 |
self.branch.break_lock() |
|
193 |
||
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
194 |
def _comparison_data(self, entry, path): |
195 |
kind, executable, stat_value = \ |
|
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
196 |
WorkingTree._comparison_data(self, entry, path) |
2255.2.205
by Martin Pool
factor out WorkingTree4._directory_is_tree_reference |
197 |
# it looks like a plain directory, but it's really a reference -- see
|
198 |
# also kind()
|
|
4100.2.4
by Aaron Bentley
More support for not autodetecting tree refs |
199 |
if (self._repo_supports_tree_reference and kind == 'directory' |
200 |
and entry is not None and entry.kind == 'tree-reference'): |
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
201 |
kind = 'tree-reference' |
202 |
return kind, executable, stat_value |
|
203 |
||
2255.7.74
by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4. |
204 |
@needs_write_lock
|
205 |
def commit(self, message=None, revprops=None, *args, **kwargs): |
|
206 |
# mark the tree as dirty post commit - commit
|
|
207 |
# can change the current versioned list by doing deletes.
|
|
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
208 |
result = WorkingTree.commit(self, message, revprops, *args, **kwargs) |
2255.7.74
by Robert Collins
Test adding of roots to trees, it was broken on WorkingTree4. |
209 |
self._make_dirty(reset_inventory=True) |
210 |
return result |
|
211 |
||
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. |
212 |
def current_dirstate(self): |
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
213 |
"""Return the current dirstate object.
|
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. |
214 |
|
215 |
This is not part of the tree interface and only exposed for ease of
|
|
216 |
testing.
|
|
217 |
||
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
218 |
:raises errors.NotWriteLocked: when not in a lock.
|
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. |
219 |
"""
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
220 |
self._must_be_locked() |
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
221 |
return self._current_dirstate() |
222 |
||
223 |
def _current_dirstate(self): |
|
224 |
"""Internal function that does not check lock status.
|
|
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
225 |
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
226 |
This is needed for break_lock which also needs the dirstate.
|
227 |
"""
|
|
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. |
228 |
if self._dirstate is not None: |
229 |
return self._dirstate |
|
230 |
local_path = self.bzrdir.get_workingtree_transport(None |
|
231 |
).local_abspath('dirstate') |
|
3368.2.4
by Ian Clatworthy
make content filter lookup a tree responsibility |
232 |
self._dirstate = dirstate.DirState.on_file(local_path, |
4379.5.5
by Ian Clatworthy
support a configurable limit of changes before dirstate saving |
233 |
self._sha1_provider(), self._worth_saving_limit()) |
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. |
234 |
return self._dirstate |
235 |
||
3368.2.52
by Ian Clatworthy
merge bzr.dev r4164 |
236 |
def _sha1_provider(self): |
237 |
"""A function that returns a SHA1Provider suitable for this tree.
|
|
238 |
||
239 |
:return: None if content filtering is not supported by this tree.
|
|
240 |
Otherwise, a SHA1Provider is returned that sha's the canonical
|
|
241 |
form of files, i.e. after read filters are applied.
|
|
242 |
"""
|
|
3368.2.53
by Ian Clatworthy
sha1 calculation done by workingtree layer now |
243 |
if self.supports_content_filtering(): |
244 |
return ContentFilterAwareSHA1Provider(self) |
|
245 |
else: |
|
246 |
return None |
|
3368.2.52
by Ian Clatworthy
merge bzr.dev r4164 |
247 |
|
4379.5.5
by Ian Clatworthy
support a configurable limit of changes before dirstate saving |
248 |
def _worth_saving_limit(self): |
4379.5.7
by Ian Clatworthy
apply review feedback |
249 |
"""How many hash changes are ok before we must save the dirstate.
|
4379.5.5
by Ian Clatworthy
support a configurable limit of changes before dirstate saving |
250 |
|
251 |
:return: an integer. -1 means never save.
|
|
252 |
"""
|
|
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
253 |
# FIXME: We want a WorkingTreeStack here -- vila 20110812
|
254 |
conf = config.BranchStack(self.branch) |
|
255 |
return conf.get('bzr.workingtree.worth_saving_limit') |
|
4379.5.5
by Ian Clatworthy
support a configurable limit of changes before dirstate saving |
256 |
|
2255.2.81
by Robert Collins
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection. |
257 |
def filter_unversioned_files(self, paths): |
2255.7.62
by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it. |
258 |
"""Filter out paths that are versioned.
|
2255.2.81
by Robert Collins
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection. |
259 |
|
260 |
:return: set of paths.
|
|
261 |
"""
|
|
262 |
# TODO: make a generic multi-bisect routine roughly that should list
|
|
263 |
# the paths, then process one half at a time recursively, and feed the
|
|
264 |
# results of each bisect in further still
|
|
265 |
paths = sorted(paths) |
|
266 |
result = set() |
|
2255.2.176
by Martin Pool
Merge dirstate and some small cleanups |
267 |
state = self.current_dirstate() |
2255.2.81
by Robert Collins
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection. |
268 |
# TODO we want a paths_to_dirblocks helper I think
|
269 |
for path in paths: |
|
270 |
dirname, basename = os.path.split(path.encode('utf8')) |
|
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
271 |
_, _, _, path_is_versioned = state._get_block_entry_index( |
272 |
dirname, basename, 0) |
|
2255.7.62
by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it. |
273 |
if not path_is_versioned: |
2255.2.81
by Robert Collins
WorkingTree4: Implement filter_unversioned_files to use dirstate bisection. |
274 |
result.add(path) |
275 |
return result |
|
276 |
||
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
277 |
def flush(self): |
278 |
"""Write all cached data to disk."""
|
|
2255.2.39
by Robert Collins
WorkingTree4: flush can only be used during write locks. |
279 |
if self._control_files._lock_mode != 'w': |
280 |
raise errors.NotWriteLocked(self) |
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
281 |
self.current_dirstate().save() |
282 |
self._inventory = None |
|
283 |
self._dirty = False |
|
284 |
||
2323.4.2
by Robert Collins
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately. |
285 |
@needs_tree_write_lock
|
286 |
def _gather_kinds(self, files, kinds): |
|
287 |
"""See MutableTree._gather_kinds."""
|
|
288 |
for pos, f in enumerate(files): |
|
289 |
if kinds[pos] is None: |
|
290 |
kinds[pos] = self._kind(f) |
|
291 |
||
2255.2.34
by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries. |
292 |
def _generate_inventory(self): |
293 |
"""Create and set self.inventory from the dirstate object.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
294 |
|
2255.2.34
by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries. |
295 |
This is relatively expensive: we have to walk the entire dirstate.
|
296 |
Ideally we would not, and can deprecate this function.
|
|
297 |
"""
|
|
2255.2.82
by Robert Collins
various notes about find_ids_across_trees |
298 |
#: uncomment to trap on inventory requests.
|
299 |
# import pdb;pdb.set_trace()
|
|
2255.2.75
by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents. |
300 |
state = self.current_dirstate() |
301 |
state._read_dirblocks_if_needed() |
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
302 |
root_key, current_entry = self._get_entry(path='') |
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
303 |
current_id = root_key[2] |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
304 |
if not (current_entry[0][0] == 'd'): # directory |
305 |
raise AssertionError(current_entry) |
|
2255.2.75
by Robert Collins
Correct generation of revisiontree inventories to handle out of order parents. |
306 |
inv = Inventory(root_id=current_id) |
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
307 |
# Turn some things into local variables
|
308 |
minikind_to_kind = dirstate.DirState._minikind_to_kind |
|
309 |
factory = entry_factory |
|
310 |
utf8_decode = cache_utf8._utf8_decode |
|
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
311 |
inv_byid = inv._byid |
2255.2.73
by Robert Collins
50% speedup in the dirstate->inventory conversion logic by caching the parent ids as we walk the tree. Some further work would be to maintain a stack of parents as we know we visit depth first. |
312 |
# we could do this straight out of the dirstate; it might be fast
|
313 |
# and should be profiled - RBC 20070216
|
|
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
314 |
parent_ies = {'' : inv.root} |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
315 |
for block in state._dirblocks[1:]: # skip the root |
2255.2.77
by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows. |
316 |
dirname = block[0] |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
317 |
try: |
2255.8.4
by John Arbash Meinel
Rather than using split hunks, implement a bisect_dirblocks |
318 |
parent_ie = parent_ies[dirname] |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
319 |
except KeyError: |
320 |
# all the paths in this block are not versioned in this tree
|
|
321 |
continue
|
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
322 |
for key, entry in block[1]: |
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
323 |
minikind, link_or_sha1, size, executable, stat = entry[0] |
324 |
if minikind in ('a', 'r'): # absent, relocated |
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
325 |
# a parent tree only entry
|
326 |
continue
|
|
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
327 |
name = key[1] |
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
328 |
name_unicode = utf8_decode(name)[0] |
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
329 |
file_id = key[2] |
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
330 |
kind = minikind_to_kind[minikind] |
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
331 |
inv_entry = factory[kind](file_id, name_unicode, |
332 |
parent_ie.file_id) |
|
2255.2.77
by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows. |
333 |
if kind == 'file': |
2325.3.4
by John Arbash Meinel
Rather than setting the executable bit for every file, properly create the working inventory to include it. |
334 |
# This is only needed on win32, where this is the only way
|
335 |
# we know the executable bit.
|
|
336 |
inv_entry.executable = executable |
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
337 |
# not strictly needed: working tree
|
2325.3.4
by John Arbash Meinel
Rather than setting the executable bit for every file, properly create the working inventory to include it. |
338 |
#inv_entry.text_size = size
|
339 |
#inv_entry.text_sha1 = sha1
|
|
2255.2.77
by Robert Collins
Tune working inventory generation more: walk the blocks, skipping deleted rows. |
340 |
elif kind == 'directory': |
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
341 |
# add this entry to the parent map.
|
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
342 |
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry |
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
343 |
elif kind == 'tree-reference': |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
344 |
if not self._repo_supports_tree_reference: |
4183.5.2
by Robert Collins
Support tree-reference in record_iter_changes. |
345 |
raise errors.UnsupportedOperation( |
346 |
self._generate_inventory, |
|
347 |
self.branch.repository) |
|
2255.2.218
by Robert Collins
Make the nested tree commit smoke test be more rigourous. |
348 |
inv_entry.reference_revision = link_or_sha1 or None |
2338.4.5
by Marien Zwart
Make an assert actually assert something. |
349 |
elif kind != 'symlink': |
2348.1.1
by Martin Pool
(marienz) fixes for error committing merge with symlinks in dirstate |
350 |
raise AssertionError("unknown kind %r" % kind) |
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
351 |
# These checks cost us around 40ms on a 55k entry tree
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
352 |
if file_id in inv_byid: |
353 |
raise AssertionError('file_id %s already in' |
|
354 |
' inventory as %s' % (file_id, inv_byid[file_id])) |
|
355 |
if name_unicode in parent_ie.children: |
|
356 |
raise AssertionError('name %r already in parent' |
|
357 |
% (name_unicode,)) |
|
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
358 |
inv_byid[file_id] = inv_entry |
359 |
parent_ie.children[name_unicode] = inv_entry |
|
2255.2.34
by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries. |
360 |
self._inventory = inv |
361 |
||
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
362 |
def _get_entry(self, file_id=None, path=None): |
363 |
"""Get the dirstate row for file_id or path.
|
|
364 |
||
365 |
If either file_id or path is supplied, it is used as the key to lookup.
|
|
366 |
If both are supplied, the fastest lookup is used, and an error is
|
|
367 |
raised if they do not both point at the same row.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
368 |
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
369 |
:param file_id: An optional unicode file_id to be looked up.
|
370 |
:param path: An optional unicode path to be looked up.
|
|
371 |
:return: The dirstate row tuple for path/file_id, or (None, None)
|
|
372 |
"""
|
|
373 |
if file_id is None and path is None: |
|
374 |
raise errors.BzrError('must supply file_id or path') |
|
375 |
state = self.current_dirstate() |
|
376 |
if path is not None: |
|
377 |
path = path.encode('utf8') |
|
378 |
return state._get_entry(0, fileid_utf8=file_id, path_utf8=path) |
|
379 |
||
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
380 |
def get_file_sha1(self, file_id, path=None, stat_value=None): |
2255.2.88
by Robert Collins
Significant steps back to operation. |
381 |
# check file id is valid unconditionally.
|
2255.10.1
by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache, |
382 |
entry = self._get_entry(file_id=file_id, path=path) |
1551.15.56
by Aaron Bentley
Raise NoSuchId when get_file_sha1 is invoked with a baed file id |
383 |
if entry[0] is None: |
384 |
raise errors.NoSuchId(self, file_id) |
|
2255.2.73
by Robert Collins
50% speedup in the dirstate->inventory conversion logic by caching the parent ids as we walk the tree. Some further work would be to maintain a stack of parents as we know we visit depth first. |
385 |
if path is None: |
2255.10.1
by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache, |
386 |
path = pathjoin(entry[0][0], entry[0][1]).decode('utf8') |
387 |
||
388 |
file_abspath = self.abspath(path) |
|
389 |
state = self.current_dirstate() |
|
2485.3.3
by John Arbash Meinel
Avoid extra work in inner 'DirState.update_entry' code. |
390 |
if stat_value is None: |
2499.3.1
by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files |
391 |
try: |
5609.29.5
by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache. |
392 |
stat_value = osutils.lstat(file_abspath) |
2499.3.1
by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files |
393 |
except OSError, e: |
394 |
if e.errno == errno.ENOENT: |
|
395 |
return None |
|
396 |
else: |
|
397 |
raise
|
|
3696.4.1
by Robert Collins
Refactor to allow a pluggable dirstate update_entry with interface tests. |
398 |
link_or_sha1 = dirstate.update_entry(state, entry, file_abspath, |
399 |
stat_value=stat_value) |
|
2255.10.3
by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry |
400 |
if entry[1][0][0] == 'f': |
3709.4.1
by Robert Collins
Sha files for the stat cache more lazily rather than on first-examination, allowing less overall sha calculations to occur. |
401 |
if link_or_sha1 is None: |
402 |
file_obj, statvalue = self.get_file_with_stat(file_id, path) |
|
403 |
try: |
|
404 |
sha1 = osutils.sha_file(file_obj) |
|
405 |
finally: |
|
406 |
file_obj.close() |
|
407 |
self._observed_sha1(file_id, path, (sha1, statvalue)) |
|
408 |
return sha1 |
|
409 |
else: |
|
410 |
return link_or_sha1 |
|
2255.10.3
by John Arbash Meinel
(broken) Change get_sha1_for_entry into update_entry |
411 |
return None |
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
412 |
|
2255.2.17
by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate. |
413 |
def _get_inventory(self): |
414 |
"""Get the inventory for the tree. This is only valid within a lock."""
|
|
2745.1.1
by Robert Collins
Add a number of -Devil checkpoints. |
415 |
if 'evil' in debug.debug_flags: |
5753.2.4
by Jelmer Vernooij
Review feedback from John. |
416 |
trace.mutter_callsite(2, |
2745.1.1
by Robert Collins
Add a number of -Devil checkpoints. |
417 |
"accessing .inventory forces a size of tree translation.") |
2255.2.17
by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate. |
418 |
if self._inventory is not None: |
419 |
return self._inventory |
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
420 |
self._must_be_locked() |
2255.2.17
by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate. |
421 |
self._generate_inventory() |
422 |
return self._inventory |
|
423 |
||
424 |
inventory = property(_get_inventory, |
|
425 |
doc="Inventory of this Tree") |
|
426 |
||
427 |
@needs_read_lock
|
|
2255.2.34
by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries. |
428 |
def get_parent_ids(self): |
429 |
"""See Tree.get_parent_ids.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
430 |
|
2255.2.34
by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries. |
431 |
This implementation requests the ids list from the dirstate file.
|
432 |
"""
|
|
433 |
return self.current_dirstate().get_parent_ids() |
|
434 |
||
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
435 |
def get_reference_revision(self, file_id, path=None): |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
436 |
# referenced tree's revision is whatever's currently there
|
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
437 |
return self.get_nested_tree(file_id, path).last_revision() |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
438 |
|
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
439 |
def get_nested_tree(self, file_id, path=None): |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
440 |
if path is None: |
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
441 |
path = self.id2path(file_id) |
442 |
# else: check file_id is at path?
|
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
443 |
return WorkingTree.open(self.abspath(path)) |
444 |
||
2255.2.34
by Robert Collins
Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries. |
445 |
@needs_read_lock
|
2255.2.17
by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate. |
446 |
def get_root_id(self): |
447 |
"""Return the id of this trees root"""
|
|
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
448 |
return self._get_entry(path='')[0][2] |
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
449 |
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
450 |
def has_id(self, file_id): |
451 |
state = self.current_dirstate() |
|
2255.2.92
by James Westby
Make the WorkingTree4 has_id use the new _get_entry rather than _get_row. |
452 |
row, parents = self._get_entry(file_id=file_id) |
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
453 |
if row is None: |
454 |
return False |
|
455 |
return osutils.lexists(pathjoin( |
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
456 |
self.basedir, row[0].decode('utf8'), row[1].decode('utf8'))) |
457 |
||
4544.2.1
by Robert Collins
Add interface enforcement for the behaviour of iter_changes with missing subtrees with explicit paths - the whole subtree is returned. |
458 |
def has_or_had_id(self, file_id): |
459 |
state = self.current_dirstate() |
|
460 |
row, parents = self._get_entry(file_id=file_id) |
|
461 |
return row is not None |
|
462 |
||
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
463 |
@needs_read_lock
|
2255.2.144
by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a |
464 |
def id2path(self, file_id): |
2511.1.3
by Ian Clatworthy
remove implicit read locks for kind() and is_executable() in wt4 |
465 |
"Convert a file-id to a path."
|
2255.2.144
by John Arbash Meinel
Simplify update_minimal a bit more, by making id_index a |
466 |
state = self.current_dirstate() |
2255.2.147
by John Arbash Meinel
Move fast id => path lookups down into DirState |
467 |
entry = self._get_entry(file_id=file_id) |
468 |
if entry == (None, None): |
|
2255.11.5
by Martin Pool
Tree.id2path should raise NoSuchId, not return None. |
469 |
raise errors.NoSuchId(tree=self, file_id=file_id) |
2255.2.147
by John Arbash Meinel
Move fast id => path lookups down into DirState |
470 |
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1]) |
471 |
return path_utf8.decode('utf8') |
|
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
472 |
|
2911.5.4
by John Arbash Meinel
Switch around to properly look up the executable bit in the basis. |
473 |
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result): |
474 |
entry = self._get_entry(path=path) |
|
475 |
if entry == (None, None): |
|
476 |
return False # Missing entries are not executable |
|
477 |
return entry[1][0][3] # Executable? |
|
478 |
||
2325.3.2
by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32 |
479 |
if not osutils.supports_executable(): |
480 |
def is_executable(self, file_id, path=None): |
|
2511.1.3
by Ian Clatworthy
remove implicit read locks for kind() and is_executable() in wt4 |
481 |
"""Test if a file is executable or not.
|
482 |
||
483 |
Note: The caller is expected to take a read-lock before calling this.
|
|
484 |
"""
|
|
2325.3.2
by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32 |
485 |
entry = self._get_entry(file_id=file_id, path=path) |
486 |
if entry == (None, None): |
|
487 |
return False |
|
488 |
return entry[1][0][3] |
|
2911.5.4
by John Arbash Meinel
Switch around to properly look up the executable bit in the basis. |
489 |
|
490 |
_is_executable_from_path_and_stat = \ |
|
491 |
_is_executable_from_path_and_stat_from_basis
|
|
2325.3.2
by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32 |
492 |
else: |
493 |
def is_executable(self, file_id, path=None): |
|
2511.1.3
by Ian Clatworthy
remove implicit read locks for kind() and is_executable() in wt4 |
494 |
"""Test if a file is executable or not.
|
495 |
||
496 |
Note: The caller is expected to take a read-lock before calling this.
|
|
497 |
"""
|
|
3146.4.5
by Aaron Bentley
Require a read lock in POSIX is_exectuable implementations, matching win32 |
498 |
self._must_be_locked() |
2325.3.2
by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32 |
499 |
if not path: |
500 |
path = self.id2path(file_id) |
|
5609.29.5
by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache. |
501 |
mode = osutils.lstat(self.abspath(path)).st_mode |
2325.3.2
by John Arbash Meinel
Implement is_executable for WorkingTree4 and win32 |
502 |
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode) |
503 |
||
3146.8.16
by Aaron Bentley
Updates from review |
504 |
def all_file_ids(self): |
3146.8.2
by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case |
505 |
"""See Tree.iter_all_file_ids"""
|
506 |
self._must_be_locked() |
|
3146.8.16
by Aaron Bentley
Updates from review |
507 |
result = set() |
3146.8.2
by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case |
508 |
for key, tree_details in self.current_dirstate()._iter_entries(): |
509 |
if tree_details[0][0] in ('a', 'r'): # relocated |
|
510 |
continue
|
|
3146.8.16
by Aaron Bentley
Updates from review |
511 |
result.add(key[2]) |
512 |
return result |
|
3146.8.2
by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case |
513 |
|
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
514 |
@needs_read_lock
|
515 |
def __iter__(self): |
|
516 |
"""Iterate through file_ids for this tree.
|
|
517 |
||
518 |
file_ids are in a WorkingTree if they are in the working inventory
|
|
519 |
and the working file exists.
|
|
520 |
"""
|
|
521 |
result = [] |
|
2255.2.88
by Robert Collins
Significant steps back to operation. |
522 |
for key, tree_details in self.current_dirstate()._iter_entries(): |
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
523 |
if tree_details[0][0] in ('a', 'r'): # absent, relocated |
2255.2.88
by Robert Collins
Significant steps back to operation. |
524 |
# not relevant to the working tree
|
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
525 |
continue
|
2255.2.88
by Robert Collins
Significant steps back to operation. |
526 |
path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8')) |
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
527 |
if osutils.lexists(path): |
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
528 |
result.append(key[2]) |
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
529 |
return iter(result) |
530 |
||
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
531 |
def iter_references(self): |
3504.2.1
by John Arbash Meinel
Shortcut iter_references when we know references aren't supported. |
532 |
if not self._repo_supports_tree_reference: |
533 |
# When the repo doesn't support references, we will have nothing to
|
|
534 |
# return
|
|
535 |
return
|
|
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
536 |
for key, tree_details in self.current_dirstate()._iter_entries(): |
537 |
if tree_details[0][0] in ('a', 'r'): # absent, relocated |
|
538 |
# not relevant to the working tree
|
|
539 |
continue
|
|
540 |
if not key[1]: |
|
541 |
# the root is not a reference.
|
|
542 |
continue
|
|
3504.2.1
by John Arbash Meinel
Shortcut iter_references when we know references aren't supported. |
543 |
relpath = pathjoin(key[0].decode('utf8'), key[1].decode('utf8')) |
2255.2.229
by Robert Collins
Fix remaining test failures. |
544 |
try: |
3504.2.1
by John Arbash Meinel
Shortcut iter_references when we know references aren't supported. |
545 |
if self._kind(relpath) == 'tree-reference': |
546 |
yield relpath, key[2] |
|
2255.2.229
by Robert Collins
Fix remaining test failures. |
547 |
except errors.NoSuchFile: |
548 |
# path is missing on disk.
|
|
549 |
continue
|
|
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
550 |
|
3709.3.2
by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat. |
551 |
def _observed_sha1(self, file_id, path, (sha1, statvalue)): |
3709.3.1
by Robert Collins
First cut - make it work - at updating the tree stat cache during commit. |
552 |
"""See MutableTree._observed_sha1."""
|
553 |
state = self.current_dirstate() |
|
554 |
entry = self._get_entry(file_id=file_id, path=path) |
|
555 |
state._observed_sha1(entry, sha1, statvalue) |
|
556 |
||
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
557 |
def kind(self, file_id): |
2255.2.202
by Martin Pool
WorkingTree_4.kind should report tree-references if they're |
558 |
"""Return the kind of a file.
|
559 |
||
560 |
This is always the actual kind that's on disk, regardless of what it
|
|
561 |
was added as.
|
|
2511.1.3
by Ian Clatworthy
remove implicit read locks for kind() and is_executable() in wt4 |
562 |
|
563 |
Note: The caller is expected to take a read-lock before calling this.
|
|
2255.2.202
by Martin Pool
WorkingTree_4.kind should report tree-references if they're |
564 |
"""
|
565 |
relpath = self.id2path(file_id) |
|
3376.2.11
by Martin Pool
Compare to None using is/is not not == |
566 |
if relpath is None: |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
567 |
raise AssertionError( |
568 |
"path for id {%s} is None!" % file_id) |
|
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
569 |
return self._kind(relpath) |
570 |
||
571 |
def _kind(self, relpath): |
|
2255.2.202
by Martin Pool
WorkingTree_4.kind should report tree-references if they're |
572 |
abspath = self.abspath(relpath) |
573 |
kind = file_kind(abspath) |
|
4100.2.1
by Aaron Bentley
Disable autodetection of tree references |
574 |
if (self._repo_supports_tree_reference and kind == 'directory'): |
575 |
entry = self._get_entry(path=relpath) |
|
576 |
if entry[1] is not None: |
|
4100.2.4
by Aaron Bentley
More support for not autodetecting tree refs |
577 |
if entry[1][0][0] == 't': |
4100.2.1
by Aaron Bentley
Disable autodetection of tree references |
578 |
kind = 'tree-reference' |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
579 |
return kind |
580 |
||
2255.2.21
by Robert Collins
Add WorkingTree4._last_revision, making workingtree_implementations.test_changes_from pass. |
581 |
@needs_read_lock
|
582 |
def _last_revision(self): |
|
583 |
"""See Mutable.last_revision."""
|
|
584 |
parent_ids = self.current_dirstate().get_parent_ids() |
|
585 |
if parent_ids: |
|
2255.2.84
by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids. |
586 |
return parent_ids[0] |
2255.2.21
by Robert Collins
Add WorkingTree4._last_revision, making workingtree_implementations.test_changes_from pass. |
587 |
else: |
2598.5.10
by Aaron Bentley
Return NULL_REVISION instead of None for the null revision |
588 |
return _mod_revision.NULL_REVISION |
2255.2.21
by Robert Collins
Add WorkingTree4._last_revision, making workingtree_implementations.test_changes_from pass. |
589 |
|
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
590 |
def lock_read(self): |
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
591 |
"""See Branch.lock_read, and WorkingTree.unlock.
|
592 |
||
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
593 |
:return: A bzrlib.lock.LogicalLockResult.
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
594 |
"""
|
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
595 |
self.branch.lock_read() |
596 |
try: |
|
597 |
self._control_files.lock_read() |
|
598 |
try: |
|
599 |
state = self.current_dirstate() |
|
600 |
if not state._lock_token: |
|
601 |
state.lock_read() |
|
2255.2.232
by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities. |
602 |
# set our support for tree references from the repository in
|
603 |
# use.
|
|
604 |
self._repo_supports_tree_reference = getattr( |
|
2323.5.16
by Martin Pool
rename support_tree_reference to supports_ |
605 |
self.branch.repository._format, "supports_tree_reference", |
2255.2.232
by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities. |
606 |
False) |
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
607 |
except: |
608 |
self._control_files.unlock() |
|
609 |
raise
|
|
610 |
except: |
|
611 |
self.branch.unlock() |
|
612 |
raise
|
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
613 |
return LogicalLockResult(self.unlock) |
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
614 |
|
615 |
def _lock_self_write(self): |
|
616 |
"""This should be called after the branch is locked."""
|
|
617 |
try: |
|
618 |
self._control_files.lock_write() |
|
619 |
try: |
|
620 |
state = self.current_dirstate() |
|
621 |
if not state._lock_token: |
|
622 |
state.lock_write() |
|
2255.2.232
by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities. |
623 |
# set our support for tree references from the repository in
|
624 |
# use.
|
|
625 |
self._repo_supports_tree_reference = getattr( |
|
2323.5.16
by Martin Pool
rename support_tree_reference to supports_ |
626 |
self.branch.repository._format, "supports_tree_reference", |
2255.2.232
by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities. |
627 |
False) |
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
628 |
except: |
629 |
self._control_files.unlock() |
|
630 |
raise
|
|
631 |
except: |
|
632 |
self.branch.unlock() |
|
633 |
raise
|
|
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
634 |
return LogicalLockResult(self.unlock) |
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
635 |
|
636 |
def lock_tree_write(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
637 |
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
|
638 |
||
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
639 |
:return: A bzrlib.lock.LogicalLockResult.
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
640 |
"""
|
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
641 |
self.branch.lock_read() |
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
642 |
return self._lock_self_write() |
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
643 |
|
644 |
def lock_write(self): |
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
645 |
"""See MutableTree.lock_write, and WorkingTree.unlock.
|
646 |
||
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
647 |
:return: A bzrlib.lock.LogicalLockResult.
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
648 |
"""
|
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
649 |
self.branch.lock_write() |
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
650 |
return self._lock_self_write() |
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
651 |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
652 |
@needs_tree_write_lock
|
2255.2.137
by John Arbash Meinel
Move the WorkingTree.move() tests into their own module |
653 |
def move(self, from_paths, to_dir, after=False): |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
654 |
"""See WorkingTree.move()."""
|
2255.7.46
by Robert Collins
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them. |
655 |
result = [] |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
656 |
if not from_paths: |
2255.7.46
by Robert Collins
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them. |
657 |
return result |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
658 |
state = self.current_dirstate() |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
659 |
if isinstance(from_paths, basestring): |
660 |
raise ValueError() |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
661 |
to_dir_utf8 = to_dir.encode('utf8') |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
662 |
to_entry_dirname, to_basename = os.path.split(to_dir_utf8) |
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
663 |
id_index = state._get_id_index() |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
664 |
# check destination directory
|
665 |
# get the details for it
|
|
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
666 |
to_entry_block_index, to_entry_entry_index, dir_present, entry_present = \ |
667 |
state._get_block_entry_index(to_entry_dirname, to_basename, 0) |
|
668 |
if not entry_present: |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
669 |
raise errors.BzrMoveFailedError('', to_dir, |
2255.7.71
by Robert Collins
Fix blackbox test_mv usage of inventory, and the errors raised by workingtree4.move - though that should be made into a workingtree conformance test. |
670 |
errors.NotVersionedError(to_dir)) |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
671 |
to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index] |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
672 |
# get a handle on the block itself.
|
673 |
to_block_index = state._ensure_block( |
|
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
674 |
to_entry_block_index, to_entry_entry_index, to_dir_utf8) |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
675 |
to_block = state._dirblocks[to_block_index] |
676 |
to_abs = self.abspath(to_dir) |
|
677 |
if not isdir(to_abs): |
|
678 |
raise errors.BzrMoveFailedError('',to_dir, |
|
679 |
errors.NotADirectory(to_abs)) |
|
680 |
||
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
681 |
if to_entry[1][0][0] != 'd': |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
682 |
raise errors.BzrMoveFailedError('',to_dir, |
683 |
errors.NotADirectory(to_abs)) |
|
684 |
||
685 |
if self._inventory is not None: |
|
686 |
update_inventory = True |
|
687 |
inv = self.inventory |
|
3201.2.1
by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files |
688 |
to_dir_id = to_entry[0][2] |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
689 |
to_dir_ie = inv[to_dir_id] |
690 |
else: |
|
691 |
update_inventory = False |
|
692 |
||
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
693 |
rollbacks = [] |
694 |
def move_one(old_entry, from_path_utf8, minikind, executable, |
|
695 |
fingerprint, packed_stat, size, |
|
696 |
to_block, to_key, to_path_utf8): |
|
697 |
state._make_absent(old_entry) |
|
698 |
from_key = old_entry[0] |
|
699 |
rollbacks.append( |
|
700 |
lambda:state.update_minimal(from_key, |
|
701 |
minikind, |
|
702 |
executable=executable, |
|
703 |
fingerprint=fingerprint, |
|
704 |
packed_stat=packed_stat, |
|
705 |
size=size, |
|
706 |
path_utf8=from_path_utf8)) |
|
707 |
state.update_minimal(to_key, |
|
708 |
minikind, |
|
709 |
executable=executable, |
|
710 |
fingerprint=fingerprint, |
|
711 |
packed_stat=packed_stat, |
|
712 |
size=size, |
|
713 |
path_utf8=to_path_utf8) |
|
714 |
added_entry_index, _ = state._find_entry_index(to_key, to_block[1]) |
|
715 |
new_entry = to_block[1][added_entry_index] |
|
716 |
rollbacks.append(lambda:state._make_absent(new_entry)) |
|
717 |
||
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
718 |
for from_rel in from_paths: |
719 |
# from_rel is 'pathinroot/foo/bar'
|
|
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
720 |
from_rel_utf8 = from_rel.encode('utf8') |
721 |
from_dirname, from_tail = osutils.split(from_rel) |
|
722 |
from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8) |
|
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
723 |
from_entry = self._get_entry(path=from_rel) |
724 |
if from_entry == (None, None): |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
725 |
raise errors.BzrMoveFailedError(from_rel,to_dir, |
4498.4.2
by Vincent Ladeuil
Turn test_non_ascii.py test_mv errors into failures. |
726 |
errors.NotVersionedError(path=from_rel)) |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
727 |
|
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
728 |
from_id = from_entry[0][2] |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
729 |
to_rel = pathjoin(to_dir, from_tail) |
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
730 |
to_rel_utf8 = pathjoin(to_dir_utf8, from_tail_utf8) |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
731 |
item_to_entry = self._get_entry(path=to_rel) |
732 |
if item_to_entry != (None, None): |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
733 |
raise errors.BzrMoveFailedError(from_rel, to_rel, |
734 |
"Target is already versioned.") |
|
735 |
||
736 |
if from_rel == to_rel: |
|
737 |
raise errors.BzrMoveFailedError(from_rel, to_rel, |
|
738 |
"Source and target are identical.") |
|
739 |
||
740 |
from_missing = not self.has_filename(from_rel) |
|
741 |
to_missing = not self.has_filename(to_rel) |
|
742 |
if after: |
|
743 |
move_file = False |
|
744 |
else: |
|
745 |
move_file = True |
|
746 |
if to_missing: |
|
747 |
if not move_file: |
|
748 |
raise errors.BzrMoveFailedError(from_rel, to_rel, |
|
749 |
errors.NoSuchFile(path=to_rel, |
|
750 |
extra="New file has not been created yet")) |
|
751 |
elif from_missing: |
|
752 |
# neither path exists
|
|
753 |
raise errors.BzrRenameFailedError(from_rel, to_rel, |
|
754 |
errors.PathsDoNotExist(paths=(from_rel, to_rel))) |
|
755 |
else: |
|
756 |
if from_missing: # implicitly just update our path mapping |
|
757 |
move_file = False |
|
2255.2.139
by John Arbash Meinel
test cases for moving after a file has already been moved. |
758 |
elif not after: |
2967.3.6
by Daniel Watkins
Extracted the string from every use of RenameFailedFilesExist to RenameFailedFilesExist itself. |
759 |
raise errors.RenameFailedFilesExist(from_rel, to_rel) |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
760 |
|
761 |
rollbacks = [] |
|
762 |
def rollback_rename(): |
|
763 |
"""A single rename has failed, roll it back."""
|
|
2255.2.236
by Martin Pool
Review cleanups: mostly updating or removing todo comments. |
764 |
# roll back everything, even if we encounter trouble doing one
|
765 |
# of them.
|
|
766 |
#
|
|
767 |
# TODO: at least log the other exceptions rather than just
|
|
768 |
# losing them mbp 20070307
|
|
2255.2.138
by John Arbash Meinel
implement several new WorkingTree.move() tests |
769 |
exc_info = None |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
770 |
for rollback in reversed(rollbacks): |
771 |
try: |
|
772 |
rollback() |
|
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
773 |
except Exception, e: |
2255.2.138
by John Arbash Meinel
implement several new WorkingTree.move() tests |
774 |
exc_info = sys.exc_info() |
775 |
if exc_info: |
|
776 |
raise exc_info[0], exc_info[1], exc_info[2] |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
777 |
|
778 |
# perform the disk move first - its the most likely failure point.
|
|
2255.2.139
by John Arbash Meinel
test cases for moving after a file has already been moved. |
779 |
if move_file: |
780 |
from_rel_abs = self.abspath(from_rel) |
|
781 |
to_rel_abs = self.abspath(to_rel) |
|
782 |
try: |
|
783 |
osutils.rename(from_rel_abs, to_rel_abs) |
|
784 |
except OSError, e: |
|
785 |
raise errors.BzrMoveFailedError(from_rel, to_rel, e[1]) |
|
2255.2.140
by John Arbash Meinel
Update tests to ensure basis tree is not modified |
786 |
rollbacks.append(lambda: osutils.rename(to_rel_abs, from_rel_abs)) |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
787 |
try: |
788 |
# perform the rename in the inventory next if needed: its easy
|
|
789 |
# to rollback
|
|
790 |
if update_inventory: |
|
791 |
# rename the entry
|
|
792 |
from_entry = inv[from_id] |
|
793 |
current_parent = from_entry.parent_id |
|
794 |
inv.rename(from_id, to_dir_id, from_tail) |
|
795 |
rollbacks.append( |
|
796 |
lambda: inv.rename(from_id, current_parent, from_tail)) |
|
797 |
# finally do the rename in the dirstate, which is a little
|
|
798 |
# tricky to rollback, but least likely to need it.
|
|
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
799 |
old_block_index, old_entry_index, dir_present, file_present = \ |
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
800 |
state._get_block_entry_index(from_dirname, from_tail_utf8, 0) |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
801 |
old_block = state._dirblocks[old_block_index][1] |
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
802 |
old_entry = old_block[old_entry_index] |
803 |
from_key, old_entry_details = old_entry |
|
804 |
cur_details = old_entry_details[0] |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
805 |
# remove the old row
|
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
806 |
to_key = ((to_block[0],) + from_key[1:3]) |
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
807 |
minikind = cur_details[0] |
808 |
move_one(old_entry, from_path_utf8=from_rel_utf8, |
|
809 |
minikind=minikind, |
|
810 |
executable=cur_details[3], |
|
811 |
fingerprint=cur_details[1], |
|
812 |
packed_stat=cur_details[4], |
|
813 |
size=cur_details[2], |
|
814 |
to_block=to_block, |
|
815 |
to_key=to_key, |
|
816 |
to_path_utf8=to_rel_utf8) |
|
817 |
||
818 |
if minikind == 'd': |
|
819 |
def update_dirblock(from_dir, to_key, to_dir_utf8): |
|
2438.1.5
by John Arbash Meinel
Fix the bug by not iterating over the same list we are modifying. |
820 |
"""Recursively update all entries in this dirblock."""
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
821 |
if from_dir == '': |
822 |
raise AssertionError("renaming root not supported") |
|
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
823 |
from_key = (from_dir, '') |
824 |
from_block_idx, present = \ |
|
825 |
state._find_block_index_from_key(from_key) |
|
826 |
if not present: |
|
827 |
# This is the old record, if it isn't present, then
|
|
828 |
# there is theoretically nothing to update.
|
|
829 |
# (Unless it isn't present because of lazy loading,
|
|
830 |
# but we don't do that yet)
|
|
831 |
return
|
|
832 |
from_block = state._dirblocks[from_block_idx] |
|
833 |
to_block_index, to_entry_index, _, _ = \ |
|
834 |
state._get_block_entry_index(to_key[0], to_key[1], 0) |
|
835 |
to_block_index = state._ensure_block( |
|
836 |
to_block_index, to_entry_index, to_dir_utf8) |
|
837 |
to_block = state._dirblocks[to_block_index] |
|
2438.1.5
by John Arbash Meinel
Fix the bug by not iterating over the same list we are modifying. |
838 |
|
839 |
# Grab a copy since move_one may update the list.
|
|
840 |
for entry in from_block[1][:]: |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
841 |
if not (entry[0][0] == from_dir): |
842 |
raise AssertionError() |
|
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
843 |
cur_details = entry[1][0] |
844 |
to_key = (to_dir_utf8, entry[0][1], entry[0][2]) |
|
845 |
from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1]) |
|
846 |
to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1]) |
|
847 |
minikind = cur_details[0] |
|
2438.1.10
by John Arbash Meinel
Make WT4.move() properly handle moving a directory with a renamed child. |
848 |
if minikind in 'ar': |
2438.1.8
by John Arbash Meinel
Fix the case when renaming a directory with deleted children. |
849 |
# Deleted children of a renamed directory
|
850 |
# Do not need to be updated.
|
|
2438.1.10
by John Arbash Meinel
Make WT4.move() properly handle moving a directory with a renamed child. |
851 |
# Children that have been renamed out of this
|
852 |
# directory should also not be updated
|
|
2438.1.8
by John Arbash Meinel
Fix the case when renaming a directory with deleted children. |
853 |
continue
|
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
854 |
move_one(entry, from_path_utf8=from_path_utf8, |
855 |
minikind=minikind, |
|
856 |
executable=cur_details[3], |
|
857 |
fingerprint=cur_details[1], |
|
858 |
packed_stat=cur_details[4], |
|
859 |
size=cur_details[2], |
|
860 |
to_block=to_block, |
|
861 |
to_key=to_key, |
|
2371.2.1
by John Arbash Meinel
Update DirState._validate() to detect rename errors. |
862 |
to_path_utf8=to_path_utf8) |
2255.2.146
by John Arbash Meinel
Implement move_directory by factoring out move_one |
863 |
if minikind == 'd': |
864 |
# We need to move all the children of this
|
|
865 |
# entry
|
|
866 |
update_dirblock(from_path_utf8, to_key, |
|
867 |
to_path_utf8) |
|
868 |
update_dirblock(from_rel_utf8, to_key, to_rel_utf8) |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
869 |
except: |
870 |
rollback_rename() |
|
871 |
raise
|
|
2255.7.46
by Robert Collins
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them. |
872 |
result.append((from_rel, to_rel)) |
4379.5.5
by Ian Clatworthy
support a configurable limit of changes before dirstate saving |
873 |
state._mark_modified() |
2255.7.67
by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists. |
874 |
self._make_dirty(reset_inventory=False) |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
875 |
|
2255.7.46
by Robert Collins
Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them. |
876 |
return result |
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
877 |
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
878 |
def _must_be_locked(self): |
879 |
if not self._control_files._lock_count: |
|
880 |
raise errors.ObjectNotLocked(self) |
|
881 |
||
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. |
882 |
def _new_tree(self): |
883 |
"""Initialize the state in this tree to be a new tree."""
|
|
884 |
self._dirty = True |
|
885 |
||
886 |
@needs_read_lock
|
|
2255.2.17
by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate. |
887 |
def path2id(self, path): |
888 |
"""Return the id for path in this tree."""
|
|
2255.7.56
by Robert Collins
Document behaviour of tree.path2id("path/"). |
889 |
path = path.strip('/') |
2255.2.88
by Robert Collins
Significant steps back to operation. |
890 |
entry = self._get_entry(path=path) |
891 |
if entry == (None, None): |
|
2255.2.59
by Robert Collins
All WorkingTree4 and dirstate tests passing. |
892 |
return None |
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
893 |
return entry[0][2] |
2255.2.17
by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate. |
894 |
|
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
895 |
def paths2ids(self, paths, trees=[], require_versioned=True): |
896 |
"""See Tree.paths2ids().
|
|
2255.7.24
by John Arbash Meinel
Rework cmd_inventory so that it uses paths2ids and locks the trees for read. |
897 |
|
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
898 |
This specialisation fast-paths the case where all the trees are in the
|
899 |
dirstate.
|
|
900 |
"""
|
|
901 |
if paths is None: |
|
902 |
return None |
|
903 |
parents = self.get_parent_ids() |
|
904 |
for tree in trees: |
|
905 |
if not (isinstance(tree, DirStateRevisionTree) and tree._revision_id in |
|
906 |
parents): |
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
907 |
return super(DirStateWorkingTree, self).paths2ids(paths, |
908 |
trees, require_versioned) |
|
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
909 |
search_indexes = [0] + [1 + parents.index(tree._revision_id) for tree in trees] |
910 |
# -- make all paths utf8 --
|
|
911 |
paths_utf8 = set() |
|
912 |
for path in paths: |
|
913 |
paths_utf8.add(path.encode('utf8')) |
|
914 |
paths = paths_utf8 |
|
915 |
# -- paths is now a utf8 path set --
|
|
916 |
# -- get the state object and prepare it.
|
|
917 |
state = self.current_dirstate() |
|
2255.2.133
by John Arbash Meinel
Implement _paths2ids using bisect recursive rather than loading |
918 |
if False and (state._dirblock_state == dirstate.DirState.NOT_IN_MEMORY |
919 |
and '' not in paths): |
|
920 |
paths2ids = self._paths2ids_using_bisect |
|
921 |
else: |
|
922 |
paths2ids = self._paths2ids_in_memory |
|
923 |
return paths2ids(paths, search_indexes, |
|
924 |
require_versioned=require_versioned) |
|
925 |
||
926 |
def _paths2ids_in_memory(self, paths, search_indexes, |
|
927 |
require_versioned=True): |
|
928 |
state = self.current_dirstate() |
|
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
929 |
state._read_dirblocks_if_needed() |
930 |
def _entries_for_path(path): |
|
931 |
"""Return a list with all the entries that match path for all ids.
|
|
932 |
"""
|
|
933 |
dirname, basename = os.path.split(path) |
|
934 |
key = (dirname, basename, '') |
|
935 |
block_index, present = state._find_block_index_from_key(key) |
|
936 |
if not present: |
|
937 |
# the block which should contain path is absent.
|
|
938 |
return [] |
|
939 |
result = [] |
|
940 |
block = state._dirblocks[block_index][1] |
|
941 |
entry_index, _ = state._find_entry_index(key, block) |
|
942 |
# we may need to look at multiple entries at this path: walk while the paths match.
|
|
943 |
while (entry_index < len(block) and |
|
944 |
block[entry_index][0][0:2] == key[0:2]): |
|
945 |
result.append(block[entry_index]) |
|
946 |
entry_index += 1 |
|
947 |
return result |
|
948 |
if require_versioned: |
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
949 |
# -- check all supplied paths are versioned in a search tree. --
|
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
950 |
all_versioned = True |
951 |
for path in paths: |
|
952 |
path_entries = _entries_for_path(path) |
|
953 |
if not path_entries: |
|
954 |
# this specified path is not present at all: error
|
|
955 |
all_versioned = False |
|
956 |
break
|
|
957 |
found_versioned = False |
|
958 |
# for each id at this path
|
|
959 |
for entry in path_entries: |
|
960 |
# for each tree.
|
|
961 |
for index in search_indexes: |
|
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
962 |
if entry[1][index][0] != 'a': # absent |
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
963 |
found_versioned = True |
964 |
# all good: found a versioned cell
|
|
965 |
break
|
|
966 |
if not found_versioned: |
|
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
967 |
# none of the indexes was not 'absent' at all ids for this
|
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
968 |
# path.
|
969 |
all_versioned = False |
|
970 |
break
|
|
971 |
if not all_versioned: |
|
972 |
raise errors.PathsNotVersionedError(paths) |
|
973 |
# -- remove redundancy in supplied paths to prevent over-scanning --
|
|
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
974 |
search_paths = osutils.minimum_path_selection(paths) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
975 |
# sketch:
|
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
976 |
# for all search_indexs in each path at or under each element of
|
977 |
# search_paths, if the detail is relocated: add the id, and add the
|
|
978 |
# relocated path as one to search if its not searched already. If the
|
|
979 |
# detail is not relocated, add the id.
|
|
980 |
searched_paths = set() |
|
981 |
found_ids = set() |
|
982 |
def _process_entry(entry): |
|
983 |
"""Look at search_indexes within entry.
|
|
984 |
||
985 |
If a specific tree's details are relocated, add the relocation
|
|
986 |
target to search_paths if not searched already. If it is absent, do
|
|
987 |
nothing. Otherwise add the id to found_ids.
|
|
988 |
"""
|
|
989 |
for index in search_indexes: |
|
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
990 |
if entry[1][index][0] == 'r': # relocated |
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
991 |
if not osutils.is_inside_any(searched_paths, entry[1][index][1]): |
992 |
search_paths.add(entry[1][index][1]) |
|
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
993 |
elif entry[1][index][0] != 'a': # absent |
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
994 |
found_ids.add(entry[0][2]) |
995 |
while search_paths: |
|
996 |
current_root = search_paths.pop() |
|
997 |
searched_paths.add(current_root) |
|
998 |
# process the entries for this containing directory: the rest will be
|
|
999 |
# found by their parents recursively.
|
|
1000 |
root_entries = _entries_for_path(current_root) |
|
1001 |
if not root_entries: |
|
1002 |
# this specified path is not present at all, skip it.
|
|
1003 |
continue
|
|
1004 |
for entry in root_entries: |
|
1005 |
_process_entry(entry) |
|
1006 |
initial_key = (current_root, '', '') |
|
1007 |
block_index, _ = state._find_block_index_from_key(initial_key) |
|
1008 |
while (block_index < len(state._dirblocks) and |
|
1009 |
osutils.is_inside(current_root, state._dirblocks[block_index][0])): |
|
1010 |
for entry in state._dirblocks[block_index][1]: |
|
1011 |
_process_entry(entry) |
|
1012 |
block_index += 1 |
|
1013 |
return found_ids |
|
1014 |
||
2255.2.133
by John Arbash Meinel
Implement _paths2ids using bisect recursive rather than loading |
1015 |
def _paths2ids_using_bisect(self, paths, search_indexes, |
1016 |
require_versioned=True): |
|
1017 |
state = self.current_dirstate() |
|
1018 |
found_ids = set() |
|
1019 |
||
1020 |
split_paths = sorted(osutils.split(p) for p in paths) |
|
1021 |
found = state._bisect_recursive(split_paths) |
|
1022 |
||
1023 |
if require_versioned: |
|
1024 |
found_dir_names = set(dir_name_id[:2] for dir_name_id in found) |
|
1025 |
for dir_name in split_paths: |
|
1026 |
if dir_name not in found_dir_names: |
|
1027 |
raise errors.PathsNotVersionedError(paths) |
|
1028 |
||
1029 |
for dir_name_id, trees_info in found.iteritems(): |
|
1030 |
for index in search_indexes: |
|
1031 |
if trees_info[index][0] not in ('r', 'a'): |
|
1032 |
found_ids.add(dir_name_id[2]) |
|
1033 |
return found_ids |
|
1034 |
||
2255.2.45
by Robert Collins
Dirstate - fix revision_tree() behaviour to match the interface contract. |
1035 |
def read_working_inventory(self): |
1036 |
"""Read the working inventory.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1037 |
|
2255.2.45
by Robert Collins
Dirstate - fix revision_tree() behaviour to match the interface contract. |
1038 |
This is a meaningless operation for dirstate, but we obey it anyhow.
|
1039 |
"""
|
|
1040 |
return self.inventory |
|
1041 |
||
2255.2.17
by Robert Collins
tweaks - finishes off all the test_test_trees tests for dirstate. |
1042 |
@needs_read_lock
|
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. |
1043 |
def revision_tree(self, revision_id): |
1044 |
"""See Tree.revision_tree.
|
|
1045 |
||
1046 |
WorkingTree4 supplies revision_trees for any basis tree.
|
|
1047 |
"""
|
|
1048 |
dirstate = self.current_dirstate() |
|
1049 |
parent_ids = dirstate.get_parent_ids() |
|
1050 |
if revision_id not in parent_ids: |
|
1051 |
raise errors.NoSuchRevisionInTree(self, revision_id) |
|
2255.2.45
by Robert Collins
Dirstate - fix revision_tree() behaviour to match the interface contract. |
1052 |
if revision_id in dirstate.get_ghosts(): |
1053 |
raise errors.NoSuchRevisionInTree(self, revision_id) |
|
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. |
1054 |
return DirStateRevisionTree(dirstate, revision_id, |
1055 |
self.branch.repository) |
|
1056 |
||
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1057 |
@needs_tree_write_lock
|
2255.2.37
by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4. |
1058 |
def set_last_revision(self, new_revision): |
1059 |
"""Change the last revision in the working tree."""
|
|
1060 |
parents = self.get_parent_ids() |
|
4496.3.16
by Andrew Bennetts
Remove lots of unused imports. |
1061 |
if new_revision in (_mod_revision.NULL_REVISION, None): |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1062 |
if len(parents) >= 2: |
1063 |
raise AssertionError( |
|
1064 |
"setting the last parent to none with a pending merge is "
|
|
1065 |
"unsupported.") |
|
2255.2.37
by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4. |
1066 |
self.set_parent_ids([]) |
1067 |
else: |
|
2255.2.56
by Robert Collins
Dirstate: bring set_last_revision into line with the tested API. |
1068 |
self.set_parent_ids([new_revision] + parents[1:], |
1069 |
allow_leftmost_as_ghost=True) |
|
2255.2.37
by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4. |
1070 |
|
1071 |
@needs_tree_write_lock
|
|
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. |
1072 |
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False): |
1073 |
"""Set the parent ids to revision_ids.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1074 |
|
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. |
1075 |
See also set_parent_trees. This api will try to retrieve the tree data
|
1076 |
for each element of revision_ids from the trees repository. If you have
|
|
1077 |
tree data already available, it is more efficient to use
|
|
1078 |
set_parent_trees rather than set_parent_ids. set_parent_ids is however
|
|
1079 |
an easier API to use.
|
|
1080 |
||
1081 |
:param revision_ids: The revision_ids to set as the parent ids of this
|
|
1082 |
working tree. Any of these may be ghosts.
|
|
1083 |
"""
|
|
1084 |
trees = [] |
|
1085 |
for revision_id in revision_ids: |
|
1086 |
try: |
|
1087 |
revtree = self.branch.repository.revision_tree(revision_id) |
|
2255.2.24
by John Arbash Meinel
When adding ghosts revision_tree() raises RevisionNotPresent because of Knit, not NoSuchRevision |
1088 |
# TODO: jam 20070213 KnitVersionedFile raises
|
1089 |
# RevisionNotPresent rather than NoSuchRevision if a
|
|
1090 |
# given revision_id is not present. Should Repository be
|
|
1091 |
# catching it and re-raising NoSuchRevision?
|
|
1092 |
except (errors.NoSuchRevision, errors.RevisionNotPresent): |
|
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. |
1093 |
revtree = None |
1094 |
trees.append((revision_id, revtree)) |
|
1095 |
self.set_parent_trees(trees, |
|
1096 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
|
1097 |
||
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1098 |
@needs_tree_write_lock
|
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. |
1099 |
def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False): |
1100 |
"""Set the parents of the working tree.
|
|
1101 |
||
2255.2.84
by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids. |
1102 |
:param parents_list: A list of (revision_id, tree) tuples.
|
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. |
1103 |
If tree is None, then that element is treated as an unreachable
|
1104 |
parent tree - i.e. a ghost.
|
|
1105 |
"""
|
|
1106 |
dirstate = self.current_dirstate() |
|
1107 |
if len(parents_list) > 0: |
|
1108 |
if not allow_leftmost_as_ghost and parents_list[0][1] is None: |
|
2255.2.42
by Robert Collins
Fix WorkingTree4.set_parent_trees. |
1109 |
raise errors.GhostRevisionUnusableHere(parents_list[0][0]) |
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. |
1110 |
real_trees = [] |
1111 |
ghosts = [] |
|
3462.1.2
by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors. |
1112 |
|
1113 |
parent_ids = [rev_id for rev_id, tree in parents_list] |
|
1114 |
graph = self.branch.repository.get_graph() |
|
1115 |
heads = graph.heads(parent_ids) |
|
1116 |
accepted_revisions = set() |
|
1117 |
||
2255.2.84
by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids. |
1118 |
# convert absent trees to the null tree, which we convert back to
|
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. |
1119 |
# missing on access.
|
1120 |
for rev_id, tree in parents_list: |
|
3462.1.2
by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors. |
1121 |
if len(accepted_revisions) > 0: |
1122 |
# we always accept the first tree
|
|
1123 |
if rev_id in accepted_revisions or rev_id not in heads: |
|
1124 |
# We have already included either this tree, or its
|
|
1125 |
# descendent, so we skip it.
|
|
1126 |
continue
|
|
2598.5.2
by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision |
1127 |
_mod_revision.check_not_reserved_id(rev_id) |
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. |
1128 |
if tree is not None: |
1129 |
real_trees.append((rev_id, tree)) |
|
1130 |
else: |
|
1131 |
real_trees.append((rev_id, |
|
3668.5.1
by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree(). |
1132 |
self.branch.repository.revision_tree( |
1133 |
_mod_revision.NULL_REVISION))) |
|
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. |
1134 |
ghosts.append(rev_id) |
3462.1.2
by John Arbash Meinel
Change WT.set_parent_(ids/trees) to filter out ancestors. |
1135 |
accepted_revisions.add(rev_id) |
5847.4.8
by John Arbash Meinel
Fix some 'switch' tests. |
1136 |
updated = False |
5847.4.1
by John Arbash Meinel
When WT4.set_parent_trees() is called, sometimes we can use |
1137 |
if (len(real_trees) == 1 |
1138 |
and not ghosts |
|
1139 |
and self.branch.repository._format.fast_deltas |
|
5847.5.1
by Jelmer Vernooij
Trivial fixes. |
1140 |
and isinstance(real_trees[0][1], |
1141 |
revisiontree.InventoryRevisionTree) |
|
5847.4.1
by John Arbash Meinel
When WT4.set_parent_trees() is called, sometimes we can use |
1142 |
and self.get_parent_ids()): |
1143 |
rev_id, rev_tree = real_trees[0] |
|
1144 |
basis_id = self.get_parent_ids()[0] |
|
5847.4.8
by John Arbash Meinel
Fix some 'switch' tests. |
1145 |
# There are times when basis_tree won't be in
|
1146 |
# self.branch.repository, (switch, for example)
|
|
1147 |
try: |
|
1148 |
basis_tree = self.branch.repository.revision_tree(basis_id) |
|
1149 |
except errors.NoSuchRevision: |
|
5847.4.10
by John Arbash Meinel
A few more bug fixes. |
1150 |
# Fall back to the set_parent_trees(), since we can't use
|
1151 |
# _make_delta if we can't get the RevisionTree
|
|
1152 |
pass
|
|
5847.4.8
by John Arbash Meinel
Fix some 'switch' tests. |
1153 |
else: |
1154 |
delta = rev_tree.inventory._make_delta(basis_tree.inventory) |
|
1155 |
dirstate.update_basis_by_delta(delta, rev_id) |
|
5847.4.9
by John Arbash Meinel
Have to set update=True if you don't want to do the work |
1156 |
updated = True |
5847.4.8
by John Arbash Meinel
Fix some 'switch' tests. |
1157 |
if not updated: |
5847.4.1
by John Arbash Meinel
When WT4.set_parent_trees() is called, sometimes we can use |
1158 |
dirstate.set_parent_trees(real_trees, ghosts=ghosts) |
2255.7.67
by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists. |
1159 |
self._make_dirty(reset_inventory=False) |
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. |
1160 |
|
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
1161 |
def _set_root_id(self, file_id): |
1162 |
"""See WorkingTree.set_root_id."""
|
|
2255.2.37
by Robert Collins
Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4. |
1163 |
state = self.current_dirstate() |
1164 |
state.set_path_id('', file_id) |
|
2255.7.67
by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists. |
1165 |
if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED: |
1166 |
self._make_dirty(reset_inventory=True) |
|
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
1167 |
|
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. |
1168 |
def _sha_from_stat(self, path, stat_result): |
1169 |
"""Get a sha digest from the tree's stat cache.
|
|
1170 |
||
1171 |
The default implementation assumes no stat cache is present.
|
|
1172 |
||
1173 |
:param path: The path.
|
|
1174 |
:param stat_result: The stat result being looked up.
|
|
1175 |
"""
|
|
2929.1.1
by Robert Collins
Use a dict to access stat cache information from dirstate. |
1176 |
return self.current_dirstate().sha1_from_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. |
1177 |
|
2255.2.232
by Robert Collins
Make WorkingTree4 report support for references based on the repositories capabilities. |
1178 |
@needs_read_lock
|
1179 |
def supports_tree_reference(self): |
|
1180 |
return self._repo_supports_tree_reference |
|
1181 |
||
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. |
1182 |
def unlock(self): |
1183 |
"""Unlock in format 4 trees needs to write the entire dirstate."""
|
|
1184 |
if self._control_files._lock_count == 1: |
|
5900.1.1
by Jelmer Vernooij
Make sure only the last unlock resets the cached ignore glob. |
1185 |
# do non-implementation specific cleanup
|
1186 |
self._cleanup() |
|
1187 |
||
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. |
1188 |
# eventually we should do signature checking during read locks for
|
1189 |
# dirstate updates.
|
|
1190 |
if self._control_files._lock_mode == 'w': |
|
1191 |
if self._dirty: |
|
1192 |
self.flush() |
|
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
1193 |
if self._dirstate is not None: |
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
1194 |
# This is a no-op if there are no modifications.
|
1195 |
self._dirstate.save() |
|
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
1196 |
self._dirstate.unlock() |
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
1197 |
# TODO: jam 20070301 We shouldn't have to wipe the dirstate at this
|
1198 |
# point. Instead, it could check if the header has been
|
|
1199 |
# modified when it is locked, and if not, it can hang on to
|
|
1200 |
# the data it has in memory.
|
|
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. |
1201 |
self._dirstate = None |
2255.2.15
by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing. |
1202 |
self._inventory = None |
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. |
1203 |
# reverse order of locking.
|
1204 |
try: |
|
1205 |
return self._control_files.unlock() |
|
1206 |
finally: |
|
1207 |
self.branch.unlock() |
|
1208 |
||
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1209 |
@needs_tree_write_lock
|
1210 |
def unversion(self, file_ids): |
|
1211 |
"""Remove the file ids in file_ids from the current versioned set.
|
|
1212 |
||
1213 |
When a file_id is unversioned, all of its children are automatically
|
|
1214 |
unversioned.
|
|
1215 |
||
1216 |
:param file_ids: The file ids to stop versioning.
|
|
1217 |
:raises: NoSuchId if any fileid is not currently versioned.
|
|
1218 |
"""
|
|
1219 |
if not file_ids: |
|
1220 |
return
|
|
1221 |
state = self.current_dirstate() |
|
1222 |
state._read_dirblocks_if_needed() |
|
2858.2.1
by Martin Pool
Remove most calls to safe_file_id and safe_revision_id. |
1223 |
ids_to_unversion = set(file_ids) |
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1224 |
paths_to_unversion = set() |
1225 |
# sketch:
|
|
1226 |
# check if the root is to be unversioned, if so, assert for now.
|
|
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1227 |
# walk the state marking unversioned things as absent.
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1228 |
# if there are any un-unversioned ids at the end, raise
|
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
1229 |
for key, details in state._dirblocks[0][1]: |
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
1230 |
if (details[0][0] not in ('a', 'r') and # absent or relocated |
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1231 |
key[2] in ids_to_unversion): |
1232 |
# I haven't written the code to unversion / yet - it should be
|
|
1233 |
# supported.
|
|
1234 |
raise errors.BzrError('Unversioning the / is not currently supported') |
|
1235 |
block_index = 0 |
|
1236 |
while block_index < len(state._dirblocks): |
|
1237 |
# process one directory at a time.
|
|
1238 |
block = state._dirblocks[block_index] |
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1239 |
# first check: is the path one to remove - it or its children
|
1240 |
delete_block = False |
|
1241 |
for path in paths_to_unversion: |
|
1242 |
if (block[0].startswith(path) and |
|
1243 |
(len(block[0]) == len(path) or |
|
1244 |
block[0][len(path)] == '/')): |
|
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1245 |
# this entire block should be deleted - its the block for a
|
1246 |
# path to unversion; or the child of one
|
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1247 |
delete_block = True |
1248 |
break
|
|
1249 |
# TODO: trim paths_to_unversion as we pass by paths
|
|
1250 |
if delete_block: |
|
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1251 |
# this block is to be deleted: process it.
|
1252 |
# TODO: we can special case the no-parents case and
|
|
1253 |
# just forget the whole block.
|
|
1254 |
entry_index = 0 |
|
1255 |
while entry_index < len(block[1]): |
|
2363.2.3
by John Arbash Meinel
Just check if the entry is absent before calling _make_absent. |
1256 |
entry = block[1][entry_index] |
4536.2.1
by Robert Collins
Fix WorkingTree4.unversion when unversioning the parents of files that were renamed from a basis tree. (Robert Collins, bug 187207) |
1257 |
if entry[1][0][0] in 'ar': |
1258 |
# don't remove absent or renamed entries
|
|
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1259 |
entry_index += 1 |
4536.2.1
by Robert Collins
Fix WorkingTree4.unversion when unversioning the parents of files that were renamed from a basis tree. (Robert Collins, bug 187207) |
1260 |
else: |
1261 |
# Mark this file id as having been removed
|
|
1262 |
ids_to_unversion.discard(entry[0][2]) |
|
1263 |
if not state._make_absent(entry): |
|
1264 |
# The block has not shrunk.
|
|
1265 |
entry_index += 1 |
|
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1266 |
# go to the next block. (At the moment we dont delete empty
|
1267 |
# dirblocks)
|
|
1268 |
block_index += 1 |
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1269 |
continue
|
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1270 |
entry_index = 0 |
1271 |
while entry_index < len(block[1]): |
|
1272 |
entry = block[1][entry_index] |
|
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
1273 |
if (entry[1][0][0] in ('a', 'r') or # absent, relocated |
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1274 |
# ^ some parent row.
|
1275 |
entry[0][2] not in ids_to_unversion): |
|
1276 |
# ^ not an id to unversion
|
|
1277 |
entry_index += 1 |
|
1278 |
continue
|
|
2255.2.113
by John Arbash Meinel
545ms, 600ms: Switch memory model from storing kind to using minikind |
1279 |
if entry[1][0][0] == 'd': |
2255.7.41
by John Arbash Meinel
WorkingTree.unversion() should not raise if unversioning a child and a parent. |
1280 |
paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1])) |
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1281 |
if not state._make_absent(entry): |
1282 |
entry_index += 1 |
|
1283 |
# we have unversioned this id
|
|
1284 |
ids_to_unversion.remove(entry[0][2]) |
|
1285 |
block_index += 1 |
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1286 |
if ids_to_unversion: |
1287 |
raise errors.NoSuchId(self, iter(ids_to_unversion).next()) |
|
2255.7.67
by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists. |
1288 |
self._make_dirty(reset_inventory=False) |
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1289 |
# have to change the legacy inventory too.
|
1290 |
if self._inventory is not None: |
|
1291 |
for file_id in file_ids: |
|
4634.156.1
by Vincent Ladeuil
Don't traceback when unversioning a directory. |
1292 |
if self._inventory.has_id(file_id): |
1293 |
self._inventory.remove_recursive_id(file_id) |
|
2255.2.22
by Robert Collins
Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass. |
1294 |
|
3146.8.5
by Aaron Bentley
Get apply_inventory_delta kinda working, but not children |
1295 |
@needs_tree_write_lock
|
3146.8.12
by Aaron Bentley
Add a flush to rename_one |
1296 |
def rename_one(self, from_rel, to_rel, after=False): |
1297 |
"""See WorkingTree.rename_one"""
|
|
1298 |
self.flush() |
|
5777.3.1
by Jelmer Vernooij
Split InventoryTree out of Tree. |
1299 |
super(DirStateWorkingTree, self).rename_one(from_rel, to_rel, after) |
3146.8.12
by Aaron Bentley
Add a flush to rename_one |
1300 |
|
1301 |
@needs_tree_write_lock
|
|
3146.8.5
by Aaron Bentley
Get apply_inventory_delta kinda working, but not children |
1302 |
def apply_inventory_delta(self, changes): |
1303 |
"""See MutableTree.apply_inventory_delta"""
|
|
3146.8.11
by Aaron Bentley
Fix dirstate/inventory dance, mark dirstate modified and in memory |
1304 |
state = self.current_dirstate() |
3146.8.15
by Aaron Bentley
Cleanup and docs |
1305 |
state.update_by_delta(changes) |
3146.8.11
by Aaron Bentley
Fix dirstate/inventory dance, mark dirstate modified and in memory |
1306 |
self._make_dirty(reset_inventory=True) |
3146.8.5
by Aaron Bentley
Get apply_inventory_delta kinda working, but not children |
1307 |
|
2929.2.1
by Robert Collins
* Commit updates the state of the working tree via a delta rather than |
1308 |
def update_basis_by_delta(self, new_revid, delta): |
1309 |
"""See MutableTree.update_basis_by_delta."""
|
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1310 |
if self.last_revision() == new_revid: |
1311 |
raise AssertionError() |
|
2929.2.1
by Robert Collins
* Commit updates the state of the working tree via a delta rather than |
1312 |
self.current_dirstate().update_basis_by_delta(delta, new_revid) |
1313 |
||
2371.2.1
by John Arbash Meinel
Update DirState._validate() to detect rename errors. |
1314 |
@needs_read_lock
|
1315 |
def _validate(self): |
|
1316 |
self._dirstate._validate() |
|
1317 |
||
2255.2.16
by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types. |
1318 |
@needs_tree_write_lock
|
1319 |
def _write_inventory(self, inv): |
|
1320 |
"""Write inventory as the current inventory."""
|
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1321 |
if self._dirty: |
1322 |
raise AssertionError("attempting to write an inventory when the " |
|
1323 |
"dirstate is dirty will lose pending changes") |
|
4634.59.1
by Robert Collins
Change WT4._write_inventory to use apply_inventory_delta, avoiding the O(tree) set_state_from_inventory API. In bzr.dev we should remove that API altogether, but this patch is aimed at 2.0.1 |
1324 |
had_inventory = self._inventory is not None |
4634.59.2
by Robert Collins
Review feedback. |
1325 |
# Setting self._inventory = None forces the dirstate to regenerate the
|
1326 |
# working inventory. We do this because self.inventory may be inv, or
|
|
1327 |
# may have been modified, and either case would prevent a clean delta
|
|
1328 |
# being created.
|
|
4634.59.1
by Robert Collins
Change WT4._write_inventory to use apply_inventory_delta, avoiding the O(tree) set_state_from_inventory API. In bzr.dev we should remove that API altogether, but this patch is aimed at 2.0.1 |
1329 |
self._inventory = None |
1330 |
# generate a delta,
|
|
1331 |
delta = inv._make_delta(self.inventory) |
|
1332 |
# and apply it.
|
|
1333 |
self.apply_inventory_delta(delta) |
|
1334 |
if had_inventory: |
|
2255.7.67
by Robert Collins
Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists. |
1335 |
self._inventory = inv |
2255.2.16
by Robert Collins
Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types. |
1336 |
self.flush() |
1337 |
||
5630.2.5
by John Arbash Meinel
(broken) Intermediate state to make reset_tree work even when things are broken. |
1338 |
@needs_tree_write_lock
|
1339 |
def reset_state(self, revision_ids=None): |
|
1340 |
"""Reset the state of the working tree.
|
|
1341 |
||
1342 |
This does a hard-reset to a last-known-good state. This is a way to
|
|
1343 |
fix if something got corrupted (like the .bzr/checkout/dirstate file)
|
|
1344 |
"""
|
|
1345 |
if revision_ids is None: |
|
1346 |
revision_ids = self.get_parent_ids() |
|
1347 |
if not revision_ids: |
|
1348 |
base_tree = self.branch.repository.revision_tree( |
|
1349 |
_mod_revision.NULL_REVISION) |
|
1350 |
trees = [] |
|
1351 |
else: |
|
5630.2.6
by John Arbash Meinel
Implement a reset-to-known-state ability for DirState. |
1352 |
trees = zip(revision_ids, |
1353 |
self.branch.repository.revision_trees(revision_ids)) |
|
5630.2.7
by John Arbash Meinel
Handle --force flags and propmting the user for what they might really want. |
1354 |
base_tree = trees[0][1] |
5630.2.5
by John Arbash Meinel
(broken) Intermediate state to make reset_tree work even when things are broken. |
1355 |
state = self.current_dirstate() |
5630.2.6
by John Arbash Meinel
Implement a reset-to-known-state ability for DirState. |
1356 |
# We don't support ghosts yet
|
1357 |
state.set_state_from_scratch(base_tree.inventory, trees, []) |
|
5630.2.5
by John Arbash Meinel
(broken) Intermediate state to make reset_tree work even when things are broken. |
1358 |
|
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. |
1359 |
|
3368.2.53
by Ian Clatworthy
sha1 calculation done by workingtree layer now |
1360 |
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider): |
1361 |
||
1362 |
def __init__(self, tree): |
|
1363 |
self.tree = tree |
|
1364 |
||
1365 |
def sha1(self, abspath): |
|
4241.14.2
by Vincent Ladeuil
Fixed as per John's review feedback. |
1366 |
"""See dirstate.SHA1Provider.sha1()."""
|
4241.14.1
by Vincent Ladeuil
Fix bug #355454 by casting to unicode. |
1367 |
filters = self.tree._content_filter_stack( |
1368 |
self.tree.relpath(osutils.safe_unicode(abspath))) |
|
5745.3.2
by Jelmer Vernooij
Add filters to import tariff blacklist. |
1369 |
return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1] |
3368.2.53
by Ian Clatworthy
sha1 calculation done by workingtree layer now |
1370 |
|
1371 |
def stat_and_sha1(self, abspath): |
|
4241.14.2
by Vincent Ladeuil
Fixed as per John's review feedback. |
1372 |
"""See dirstate.SHA1Provider.stat_and_sha1()."""
|
4241.14.1
by Vincent Ladeuil
Fix bug #355454 by casting to unicode. |
1373 |
filters = self.tree._content_filter_stack( |
1374 |
self.tree.relpath(osutils.safe_unicode(abspath))) |
|
3368.2.53
by Ian Clatworthy
sha1 calculation done by workingtree layer now |
1375 |
file_obj = file(abspath, 'rb', 65000) |
1376 |
try: |
|
1377 |
statvalue = os.fstat(file_obj.fileno()) |
|
1378 |
if filters: |
|
5745.3.2
by Jelmer Vernooij
Add filters to import tariff blacklist. |
1379 |
file_obj = _mod_filters.filtered_input_file(file_obj, filters) |
3368.2.53
by Ian Clatworthy
sha1 calculation done by workingtree layer now |
1380 |
sha1 = osutils.size_sha_file(file_obj)[1] |
1381 |
finally: |
|
1382 |
file_obj.close() |
|
1383 |
return statvalue, sha1 |
|
1384 |
||
1385 |
||
4595.11.10
by Martin Pool
Split out ContentFilteringDirStateWorkingTree |
1386 |
class ContentFilteringDirStateWorkingTree(DirStateWorkingTree): |
1387 |
"""Dirstate working tree that supports content filtering.
|
|
1388 |
||
1389 |
The dirstate holds the hash and size of the canonical form of the file,
|
|
1390 |
and most methods must return that.
|
|
1391 |
"""
|
|
1392 |
||
4595.11.11
by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size |
1393 |
def _file_content_summary(self, path, stat_result): |
1394 |
# This is to support the somewhat obsolete path_content_summary method
|
|
1395 |
# with content filtering: see
|
|
5243.1.2
by Martin
Point launchpad links in comments at production server rather than edge |
1396 |
# <https://bugs.launchpad.net/bzr/+bug/415508>.
|
4595.11.11
by Martin Pool
Split out _file_content_summary from path_content_summary and let it return None for size |
1397 |
#
|
1398 |
# If the dirstate cache is up to date and knows the hash and size,
|
|
1399 |
# return that.
|
|
1400 |
# Otherwise if there are no content filters, return the on-disk size
|
|
1401 |
# and leave the hash blank.
|
|
1402 |
# Otherwise, read and filter the on-disk file and use its size and
|
|
1403 |
# hash.
|
|
1404 |
#
|
|
1405 |
# The dirstate doesn't store the size of the canonical form so we
|
|
1406 |
# can't trust it for content-filtered trees. We just return None.
|
|
1407 |
dirstate_sha1 = self._dirstate.sha1_from_stat(path, stat_result) |
|
1408 |
executable = self._is_executable_from_path_and_stat(path, stat_result) |
|
1409 |
return ('file', None, executable, dirstate_sha1) |
|
1410 |
||
4595.11.10
by Martin Pool
Split out ContentFilteringDirStateWorkingTree |
1411 |
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1412 |
class WorkingTree4(DirStateWorkingTree): |
1413 |
"""This is the Format 4 working tree.
|
|
1414 |
||
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
1415 |
This differs from WorkingTree by:
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1416 |
- Having a consolidated internal dirstate, stored in a
|
1417 |
randomly-accessible sorted file on disk.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1418 |
- Not having a regular inventory attribute. One can be synthesized
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1419 |
on demand but this is expensive and should be avoided.
|
1420 |
||
1421 |
This is new in bzr 0.15.
|
|
1422 |
"""
|
|
1423 |
||
1424 |
||
4595.11.10
by Martin Pool
Split out ContentFilteringDirStateWorkingTree |
1425 |
class WorkingTree5(ContentFilteringDirStateWorkingTree): |
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1426 |
"""This is the Format 5 working tree.
|
1427 |
||
1428 |
This differs from WorkingTree4 by:
|
|
1429 |
- Supporting content filtering.
|
|
4210.4.2
by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6 |
1430 |
|
1431 |
This is new in bzr 1.11.
|
|
1432 |
"""
|
|
1433 |
||
1434 |
||
4595.11.10
by Martin Pool
Split out ContentFilteringDirStateWorkingTree |
1435 |
class WorkingTree6(ContentFilteringDirStateWorkingTree): |
4210.4.2
by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6 |
1436 |
"""This is the Format 6 working tree.
|
1437 |
||
1438 |
This differs from WorkingTree5 by:
|
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1439 |
- Supporting a current view that may mask the set of files in a tree
|
1440 |
impacted by most user operations.
|
|
1441 |
||
4210.4.2
by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6 |
1442 |
This is new in bzr 1.14.
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1443 |
"""
|
1444 |
||
3586.2.13
by Ian Clatworthy
fix wt5 to use views, correcting an earlier merge |
1445 |
def _make_views(self): |
1446 |
return views.PathBasedViews(self) |
|
1447 |
||
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1448 |
|
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
1449 |
class DirStateWorkingTreeFormat(WorkingTreeFormat): |
5080.3.3
by Vincent Ladeuil
DirStateRevisionTree.kind() should respect parent_index |
1450 |
|
5661.1.1
by Jelmer Vernooij
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests. |
1451 |
missing_parent_conflicts = True |
1452 |
||
5993.3.1
by Jelmer Vernooij
Add WorkingTreeFormat.supports_versioned_directories attribute. |
1453 |
supports_versioned_directories = True |
1454 |
||
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
1455 |
_lock_class = LockDir |
1456 |
_lock_file_name = 'lock' |
|
1457 |
||
1458 |
def _open_control_files(self, a_bzrdir): |
|
1459 |
transport = a_bzrdir.get_workingtree_transport(None) |
|
1460 |
return LockableFiles(transport, self._lock_file_name, |
|
1461 |
self._lock_class) |
|
1462 |
||
3123.5.2
by Aaron Bentley
Allow checkout --files_from |
1463 |
def initialize(self, a_bzrdir, revision_id=None, from_branch=None, |
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
1464 |
accelerator_tree=None, hardlink=False): |
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. |
1465 |
"""See WorkingTreeFormat.initialize().
|
2255.2.84
by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids. |
1466 |
|
2255.2.166
by Martin Pool
(broken) Add Tree.get_root_id() & test |
1467 |
:param revision_id: allows creating a working tree at a different
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
1468 |
revision than the branch is at.
|
3123.5.17
by Aaron Bentley
Update docs |
1469 |
:param accelerator_tree: A tree which can be used for retrieving file
|
1470 |
contents more quickly than the revision tree, i.e. a workingtree.
|
|
1471 |
The revision tree will be used for cases where accelerator_tree's
|
|
1472 |
content is different.
|
|
3136.1.3
by Aaron Bentley
Implement hard-link support for branch and checkout |
1473 |
:param hardlink: If true, hard-link files from accelerator_tree,
|
1474 |
where possible.
|
|
2255.2.166
by Martin Pool
(broken) Add Tree.get_root_id() & test |
1475 |
|
1551.15.6
by Aaron Bentley
Use ROOT_ID when the repository supports old clients (Bug #107168) |
1476 |
These trees get an initial random root id, if their repository supports
|
1477 |
rich root data, TREE_ROOT otherwise.
|
|
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. |
1478 |
"""
|
1479 |
if not isinstance(a_bzrdir.transport, LocalTransport): |
|
1480 |
raise errors.NotLocalUrl(a_bzrdir.transport.base) |
|
1481 |
transport = a_bzrdir.get_workingtree_transport(self) |
|
1482 |
control_files = self._open_control_files(a_bzrdir) |
|
1483 |
control_files.create_lock() |
|
1484 |
control_files.lock_write() |
|
3407.2.5
by Martin Pool
Deprecate LockableFiles.put_utf8 |
1485 |
transport.put_bytes('format', self.get_format_string(), |
3407.2.18
by Martin Pool
BzrDir takes responsibility for default file/dir modes |
1486 |
mode=a_bzrdir._get_file_mode()) |
2955.5.3
by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout. |
1487 |
if from_branch is not None: |
1488 |
branch = from_branch |
|
1489 |
else: |
|
1490 |
branch = a_bzrdir.open_branch() |
|
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. |
1491 |
if revision_id is None: |
1492 |
revision_id = branch.last_revision() |
|
1493 |
local_path = transport.local_abspath('dirstate') |
|
2255.2.166
by Martin Pool
(broken) Add Tree.get_root_id() & test |
1494 |
# write out new dirstate (must exist when we create the tree)
|
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
1495 |
state = dirstate.DirState.initialize(local_path) |
1496 |
state.unlock() |
|
2371.2.1
by John Arbash Meinel
Update DirState._validate() to detect rename errors. |
1497 |
del state |
3588.2.1
by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4 |
1498 |
wt = self._tree_class(a_bzrdir.root_transport.local_abspath('.'), |
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. |
1499 |
branch, |
1500 |
_format=self, |
|
1501 |
_bzrdir=a_bzrdir, |
|
1502 |
_control_files=control_files) |
|
1503 |
wt._new_tree() |
|
2255.7.42
by Robert Collins
WorkingTree4 only needs a tree write lock during initialize, not a deep write lock. |
1504 |
wt.lock_tree_write() |
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. |
1505 |
try: |
3588.2.1
by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4 |
1506 |
self._init_custom_control_files(wt) |
4496.3.16
by Andrew Bennetts
Remove lots of unused imports. |
1507 |
if revision_id in (None, _mod_revision.NULL_REVISION): |
1551.15.6
by Aaron Bentley
Use ROOT_ID when the repository supports old clients (Bug #107168) |
1508 |
if branch.repository.supports_rich_root(): |
1509 |
wt._set_root_id(generate_ids.gen_root_id()) |
|
1510 |
else: |
|
1511 |
wt._set_root_id(ROOT_ID) |
|
2255.2.166
by Martin Pool
(broken) Add Tree.get_root_id() & test |
1512 |
wt.flush() |
3123.5.14
by Aaron Bentley
Avoid Repository.revision_tree in common-case branching |
1513 |
basis = None |
1514 |
# frequently, we will get here due to branching. The accelerator
|
|
1515 |
# tree will be the tree from the branch, so the desired basis
|
|
1516 |
# tree will often be a parent of the accelerator tree.
|
|
1517 |
if accelerator_tree is not None: |
|
1518 |
try: |
|
1519 |
basis = accelerator_tree.revision_tree(revision_id) |
|
1520 |
except errors.NoSuchRevision: |
|
1521 |
pass
|
|
1522 |
if basis is None: |
|
1523 |
basis = branch.repository.revision_tree(revision_id) |
|
4496.3.16
by Andrew Bennetts
Remove lots of unused imports. |
1524 |
if revision_id == _mod_revision.NULL_REVISION: |
3123.5.14
by Aaron Bentley
Avoid Repository.revision_tree in common-case branching |
1525 |
parents_list = [] |
1526 |
else: |
|
1527 |
parents_list = [(revision_id, basis)] |
|
1528 |
basis.lock_read() |
|
3136.1.10
by Aaron Bentley
Clean error if filesystem does not support hard-links |
1529 |
try: |
1530 |
wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True) |
|
2255.2.177
by Martin Pool
merge dirstate sorting fix, add more validation tests |
1531 |
wt.flush() |
3136.1.10
by Aaron Bentley
Clean error if filesystem does not support hard-links |
1532 |
# if the basis has a root id we have to use that; otherwise we
|
1533 |
# use a new random one
|
|
1534 |
basis_root_id = basis.get_root_id() |
|
1535 |
if basis_root_id is not None: |
|
1536 |
wt._set_root_id(basis_root_id) |
|
1537 |
wt.flush() |
|
4377.1.1
by Ian Clatworthy
speed up branch-in-a-shared-repo for development6-rich-root format |
1538 |
if wt.supports_content_filtering(): |
4826.1.2
by Andrew Bennetts
Remove code that prevents trying hardlinking from content-filtered trees. |
1539 |
# The original tree may not have the same content filters
|
1540 |
# applied so we can't safely build the inventory delta from
|
|
1541 |
# the source tree.
|
|
4393.3.1
by Ian Clatworthy
fix status & commit issue reported by Frits Jalvingh |
1542 |
delta_from_tree = False |
1543 |
else: |
|
1544 |
delta_from_tree = True |
|
3453.2.6
by Aaron Bentley
Rename mutate_tree to delta_from_tree, add comment |
1545 |
# delta_from_tree is safe even for DirStateRevisionTrees,
|
1546 |
# because wt4.apply_inventory_delta does not mutate the input
|
|
1547 |
# inventory entries.
|
|
3136.1.10
by Aaron Bentley
Clean error if filesystem does not support hard-links |
1548 |
transform.build_tree(basis, wt, accelerator_tree, |
4393.3.1
by Ian Clatworthy
fix status & commit issue reported by Frits Jalvingh |
1549 |
hardlink=hardlink, |
1550 |
delta_from_tree=delta_from_tree) |
|
3136.1.10
by Aaron Bentley
Clean error if filesystem does not support hard-links |
1551 |
finally: |
1552 |
basis.unlock() |
|
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. |
1553 |
finally: |
1554 |
control_files.unlock() |
|
1555 |
wt.unlock() |
|
1556 |
return wt |
|
1557 |
||
3588.2.1
by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4 |
1558 |
def _init_custom_control_files(self, wt): |
1559 |
"""Subclasses with custom control files should override this method.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1560 |
|
3588.2.1
by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4 |
1561 |
The working tree and control files are locked for writing when this
|
1562 |
method is called.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1563 |
|
3588.2.1
by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4 |
1564 |
:param wt: the WorkingTree object
|
1565 |
"""
|
|
1566 |
||
5816.5.1
by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3. |
1567 |
def open(self, a_bzrdir, _found=False): |
1568 |
"""Return the WorkingTree object for a_bzrdir
|
|
1569 |
||
1570 |
_found is a private parameter, do not use it. It is used to indicate
|
|
1571 |
if format probing has already been done.
|
|
1572 |
"""
|
|
1573 |
if not _found: |
|
1574 |
# we are being called directly and must probe.
|
|
1575 |
raise NotImplementedError |
|
1576 |
if not isinstance(a_bzrdir.transport, LocalTransport): |
|
1577 |
raise errors.NotLocalUrl(a_bzrdir.transport.base) |
|
1578 |
wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir)) |
|
1579 |
return wt |
|
1580 |
||
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. |
1581 |
def _open(self, a_bzrdir, control_files): |
1582 |
"""Open the tree itself.
|
|
2255.2.84
by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids. |
1583 |
|
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. |
1584 |
:param a_bzrdir: the dir for the tree.
|
1585 |
:param control_files: the control files for the tree.
|
|
1586 |
"""
|
|
3588.2.1
by Ian Clatworthy
make it easier to subclass WorkingTreeFormat4 |
1587 |
return self._tree_class(a_bzrdir.root_transport.local_abspath('.'), |
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. |
1588 |
branch=a_bzrdir.open_branch(), |
1589 |
_format=self, |
|
1590 |
_bzrdir=a_bzrdir, |
|
1591 |
_control_files=control_files) |
|
1592 |
||
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1593 |
def __get_matchingbzrdir(self): |
4241.1.1
by Ian Clatworthy
tree code cleanups from brisbane-core |
1594 |
return self._get_matchingbzrdir() |
1595 |
||
1596 |
def _get_matchingbzrdir(self): |
|
1597 |
"""Overrideable method to get a bzrdir for testing."""
|
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1598 |
# please test against something that will let us do tree references
|
1599 |
return bzrdir.format_registry.make_bzrdir( |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
1600 |
'dirstate-with-subtree') |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1601 |
|
1602 |
_matchingbzrdir = property(__get_matchingbzrdir) |
|
1603 |
||
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. |
1604 |
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1605 |
class WorkingTreeFormat4(DirStateWorkingTreeFormat): |
1606 |
"""The first consolidated dirstate working tree format.
|
|
1607 |
||
1608 |
This format:
|
|
1609 |
- exists within a metadir controlling .bzr
|
|
1610 |
- includes an explicit version marker for the workingtree control
|
|
6207.3.3
by jelmer at samba
Fix tests and the like. |
1611 |
files, separate from the ControlDir format
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1612 |
- modifies the hash cache format
|
1613 |
- is new in bzr 0.15
|
|
1614 |
- uses a LockDir to guard access to it.
|
|
1615 |
"""
|
|
1616 |
||
1617 |
upgrade_recommended = False |
|
1618 |
||
1619 |
_tree_class = WorkingTree4 |
|
1620 |
||
1621 |
def get_format_string(self): |
|
1622 |
"""See WorkingTreeFormat.get_format_string()."""
|
|
1623 |
return "Bazaar Working Tree Format 4 (bzr 0.15)\n" |
|
1624 |
||
1625 |
def get_format_description(self): |
|
1626 |
"""See WorkingTreeFormat.get_format_description()."""
|
|
1627 |
return "Working tree format 4" |
|
1628 |
||
1629 |
||
1630 |
class WorkingTreeFormat5(DirStateWorkingTreeFormat): |
|
4210.4.2
by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6 |
1631 |
"""WorkingTree format supporting content filtering.
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1632 |
"""
|
1633 |
||
1634 |
upgrade_recommended = False |
|
1635 |
||
1636 |
_tree_class = WorkingTree5 |
|
1637 |
||
1638 |
def get_format_string(self): |
|
1639 |
"""See WorkingTreeFormat.get_format_string()."""
|
|
1640 |
return "Bazaar Working Tree Format 5 (bzr 1.11)\n" |
|
1641 |
||
1642 |
def get_format_description(self): |
|
1643 |
"""See WorkingTreeFormat.get_format_description()."""
|
|
1644 |
return "Working tree format 5" |
|
1645 |
||
4210.4.2
by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6 |
1646 |
def supports_content_filtering(self): |
1647 |
return True |
|
1648 |
||
1649 |
||
1650 |
class WorkingTreeFormat6(DirStateWorkingTreeFormat): |
|
1651 |
"""WorkingTree format supporting views.
|
|
1652 |
"""
|
|
1653 |
||
1654 |
upgrade_recommended = False |
|
1655 |
||
1656 |
_tree_class = WorkingTree6 |
|
1657 |
||
1658 |
def get_format_string(self): |
|
1659 |
"""See WorkingTreeFormat.get_format_string()."""
|
|
1660 |
return "Bazaar Working Tree Format 6 (bzr 1.14)\n" |
|
1661 |
||
1662 |
def get_format_description(self): |
|
1663 |
"""See WorkingTreeFormat.get_format_description()."""
|
|
1664 |
return "Working tree format 6" |
|
1665 |
||
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
1666 |
def _init_custom_control_files(self, wt): |
1667 |
"""Subclasses with custom control files should override this method."""
|
|
1668 |
wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode()) |
|
1669 |
||
1670 |
def supports_content_filtering(self): |
|
1671 |
return True |
|
1672 |
||
1673 |
def supports_views(self): |
|
1674 |
return True |
|
1675 |
||
1676 |
||
5777.3.1
by Jelmer Vernooij
Split InventoryTree out of Tree. |
1677 |
class DirStateRevisionTree(InventoryTree): |
4595.11.1
by Martin Pool
doc |
1678 |
"""A revision tree pulling the inventory from a dirstate.
|
1679 |
|
|
1680 |
Note that this is one of the historical (ie revision) trees cached in the
|
|
1681 |
dirstate for easy access, not the workingtree.
|
|
1682 |
"""
|
|
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. |
1683 |
|
1684 |
def __init__(self, dirstate, revision_id, repository): |
|
1685 |
self._dirstate = dirstate |
|
2858.2.1
by Martin Pool
Remove most calls to safe_file_id and safe_revision_id. |
1686 |
self._revision_id = revision_id |
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. |
1687 |
self._repository = repository |
1688 |
self._inventory = None |
|
2255.2.38
by Robert Collins
Fix WorkingTree4.pull to work. |
1689 |
self._locked = 0 |
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
1690 |
self._dirstate_locked = False |
3504.2.1
by John Arbash Meinel
Shortcut iter_references when we know references aren't supported. |
1691 |
self._repo_supports_tree_reference = getattr( |
1692 |
repository._format, "supports_tree_reference", |
|
1693 |
False) |
|
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. |
1694 |
|
2255.2.184
by Martin Pool
Fixes for some comparison tests; repr of DirStateRevisionTree |
1695 |
def __repr__(self): |
1696 |
return "<%s of %s in %s>" % \ |
|
1697 |
(self.__class__.__name__, self._revision_id, self._dirstate) |
|
1698 |
||
1551.15.46
by Aaron Bentley
Move plan merge to tree |
1699 |
def annotate_iter(self, file_id, |
1700 |
default_revision=_mod_revision.CURRENT_REVISION): |
|
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
1701 |
"""See Tree.annotate_iter"""
|
5793.2.3
by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method. |
1702 |
text_key = (file_id, self.get_file_revision(file_id)) |
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1703 |
annotations = self._repository.texts.annotate(text_key) |
3350.6.10
by Martin Pool
VersionedFiles review cleanups |
1704 |
return [(key[-1], line) for (key, line) in annotations] |
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
1705 |
|
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. |
1706 |
def _comparison_data(self, entry, path): |
2255.2.182
by Martin Pool
merge dirstate and trunk |
1707 |
"""See Tree._comparison_data."""
|
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. |
1708 |
if entry is None: |
1709 |
return None, False, None |
|
1710 |
# trust the entry as RevisionTree does, but this may not be
|
|
1711 |
# sensible: the entry might not have come from us?
|
|
1712 |
return entry.kind, entry.executable, None |
|
1713 |
||
2255.2.10
by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees. |
1714 |
def _file_size(self, entry, stat_value): |
1715 |
return entry.text_size |
|
1716 |
||
2255.2.78
by Robert Collins
Really finish the prior commit. |
1717 |
def filter_unversioned_files(self, paths): |
1718 |
"""Filter out paths that are not versioned.
|
|
1719 |
||
1720 |
:return: set of paths.
|
|
1721 |
"""
|
|
1722 |
pred = self.has_filename |
|
1723 |
return set((p for p in paths if not pred(p))) |
|
1724 |
||
2255.2.166
by Martin Pool
(broken) Add Tree.get_root_id() & test |
1725 |
def get_root_id(self): |
1726 |
return self.path2id('') |
|
1727 |
||
3016.1.1
by Aaron Bentley
Update DirStateRevisionTree to avoid using inventory |
1728 |
def id2path(self, file_id): |
1729 |
"Convert a file-id to a path."
|
|
1730 |
entry = self._get_entry(file_id=file_id) |
|
1731 |
if entry == (None, None): |
|
1732 |
raise errors.NoSuchId(tree=self, file_id=file_id) |
|
1733 |
path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1]) |
|
1734 |
return path_utf8.decode('utf8') |
|
1735 |
||
3504.2.1
by John Arbash Meinel
Shortcut iter_references when we know references aren't supported. |
1736 |
def iter_references(self): |
1737 |
if not self._repo_supports_tree_reference: |
|
1738 |
# When the repo doesn't support references, we will have nothing to
|
|
1739 |
# return
|
|
1740 |
return iter([]) |
|
1741 |
# Otherwise, fall back to the default implementation
|
|
1742 |
return super(DirStateRevisionTree, self).iter_references() |
|
1743 |
||
2255.2.134
by John Arbash Meinel
Add a tree-test for get_symlink_target |
1744 |
def _get_parent_index(self): |
1745 |
"""Return the index in the dirstate referenced by this tree."""
|
|
1746 |
return self._dirstate.get_parent_ids().index(self._revision_id) + 1 |
|
1747 |
||
2255.2.98
by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory. |
1748 |
def _get_entry(self, file_id=None, path=None): |
1749 |
"""Get the dirstate row for file_id or path.
|
|
1750 |
||
1751 |
If either file_id or path is supplied, it is used as the key to lookup.
|
|
1752 |
If both are supplied, the fastest lookup is used, and an error is
|
|
1753 |
raised if they do not both point at the same row.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1754 |
|
2255.2.98
by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory. |
1755 |
:param file_id: An optional unicode file_id to be looked up.
|
1756 |
:param path: An optional unicode path to be looked up.
|
|
1757 |
:return: The dirstate row tuple for path/file_id, or (None, None)
|
|
1758 |
"""
|
|
1759 |
if file_id is None and path is None: |
|
1760 |
raise errors.BzrError('must supply file_id or path') |
|
1761 |
if path is not None: |
|
1762 |
path = path.encode('utf8') |
|
4377.3.4
by Ian Clatworthy
back out tree-level cache of dirstate entries as agreed during review |
1763 |
parent_index = self._get_parent_index() |
1764 |
return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path) |
|
2255.2.98
by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory. |
1765 |
|
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. |
1766 |
def _generate_inventory(self): |
1767 |
"""Create and set self.inventory from the dirstate object.
|
|
2255.2.84
by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids. |
1768 |
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1769 |
(So this is only called the first time the inventory is requested for
|
2255.2.182
by Martin Pool
merge dirstate and trunk |
1770 |
this tree; it then remains in memory until it's out of date.)
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1771 |
|
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. |
1772 |
This is relatively expensive: we have to walk the entire dirstate.
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1773 |
"""
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1774 |
if not self._locked: |
1775 |
raise AssertionError( |
|
1776 |
'cannot generate inventory of an unlocked '
|
|
1777 |
'dirstate revision tree') |
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1778 |
# separate call for profiling - makes it clear where the costs are.
|
1779 |
self._dirstate._read_dirblocks_if_needed() |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1780 |
if self._revision_id not in self._dirstate.get_parent_ids(): |
1781 |
raise AssertionError( |
|
1782 |
'parent %s has disappeared from %s' % ( |
|
1783 |
self._revision_id, self._dirstate.get_parent_ids())) |
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1784 |
parent_index = self._dirstate.get_parent_ids().index(self._revision_id) + 1 |
1785 |
# This is identical now to the WorkingTree _generate_inventory except
|
|
1786 |
# for the tree index use.
|
|
1787 |
root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='') |
|
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
1788 |
current_id = root_key[2] |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1789 |
if current_entry[parent_index][0] != 'd': |
1790 |
raise AssertionError() |
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1791 |
inv = Inventory(root_id=current_id, revision_id=self._revision_id) |
1792 |
inv.root.revision = current_entry[parent_index][4] |
|
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
1793 |
# Turn some things into local variables
|
1794 |
minikind_to_kind = dirstate.DirState._minikind_to_kind |
|
1795 |
factory = entry_factory |
|
1796 |
utf8_decode = cache_utf8._utf8_decode |
|
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
1797 |
inv_byid = inv._byid |
2255.2.73
by Robert Collins
50% speedup in the dirstate->inventory conversion logic by caching the parent ids as we walk the tree. Some further work would be to maintain a stack of parents as we know we visit depth first. |
1798 |
# we could do this straight out of the dirstate; it might be fast
|
1799 |
# and should be profiled - RBC 20070216
|
|
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
1800 |
parent_ies = {'' : inv.root} |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
1801 |
for block in self._dirstate._dirblocks[1:]: #skip root |
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1802 |
dirname = block[0] |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
1803 |
try: |
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
1804 |
parent_ie = parent_ies[dirname] |
2255.2.96
by Robert Collins
Restore dirstate to all tests passing condition. |
1805 |
except KeyError: |
1806 |
# all the paths in this block are not versioned in this tree
|
|
1807 |
continue
|
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1808 |
for key, entry in block[1]: |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1809 |
minikind, fingerprint, size, executable, revid = entry[parent_index] |
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
1810 |
if minikind in ('a', 'r'): # absent, relocated |
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1811 |
# not this tree
|
1812 |
continue
|
|
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
1813 |
name = key[1] |
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
1814 |
name_unicode = utf8_decode(name)[0] |
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
1815 |
file_id = key[2] |
2255.2.114
by John Arbash Meinel
_get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops |
1816 |
kind = minikind_to_kind[minikind] |
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
1817 |
inv_entry = factory[kind](file_id, name_unicode, |
1818 |
parent_ie.file_id) |
|
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1819 |
inv_entry.revision = revid |
1820 |
if kind == 'file': |
|
1821 |
inv_entry.executable = executable |
|
1822 |
inv_entry.text_size = size |
|
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1823 |
inv_entry.text_sha1 = fingerprint |
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1824 |
elif kind == 'directory': |
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
1825 |
parent_ies[(dirname + '/' + name).strip('/')] = inv_entry |
2255.2.93
by Robert Collins
Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked. |
1826 |
elif kind == 'symlink': |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1827 |
inv_entry.symlink_target = utf8_decode(fingerprint)[0] |
1828 |
elif kind == 'tree-reference': |
|
2255.2.218
by Robert Collins
Make the nested tree commit smoke test be more rigourous. |
1829 |
inv_entry.reference_revision = fingerprint or None |
2255.2.87
by Robert Collins
core dirstate tests passing with new structure. |
1830 |
else: |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
1831 |
raise AssertionError("cannot convert entry %r into an InventoryEntry" |
1832 |
% entry) |
|
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
1833 |
# These checks cost us around 40ms on a 55k entry tree
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1834 |
if file_id in inv_byid: |
1835 |
raise AssertionError('file_id %s already in' |
|
1836 |
' inventory as %s' % (file_id, inv_byid[file_id])) |
|
1837 |
if name_unicode in parent_ie.children: |
|
1838 |
raise AssertionError('name %r already in parent' |
|
1839 |
% (name_unicode,)) |
|
2255.2.115
by John Arbash Meinel
_get_inventory 1.75s: Directly update the inventory state rather than using inv.add() |
1840 |
inv_byid[file_id] = inv_entry |
1841 |
parent_ie.children[name_unicode] = inv_entry |
|
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. |
1842 |
self._inventory = inv |
1843 |
||
2255.7.36
by John Arbash Meinel
All trees should implement get_file_mtime() |
1844 |
def get_file_mtime(self, file_id, path=None): |
1845 |
"""Return the modification time for this record.
|
|
1846 |
||
1847 |
We return the timestamp of the last-changed revision.
|
|
1848 |
"""
|
|
1849 |
# Make sure the file exists
|
|
1850 |
entry = self._get_entry(file_id, path=path) |
|
1851 |
if entry == (None, None): # do we raise? |
|
6153.1.4
by Jelmer Vernooij
Fix wt4. |
1852 |
raise errors.NoSuchId(self, file_id) |
2255.7.36
by John Arbash Meinel
All trees should implement get_file_mtime() |
1853 |
parent_index = self._get_parent_index() |
1854 |
last_changed_revision = entry[1][parent_index][4] |
|
4976.1.2
by Jelmer Vernooij
Raise FileStampUnavailable if there is no filestamp known. |
1855 |
try: |
1856 |
rev = self._repository.get_revision(last_changed_revision) |
|
1857 |
except errors.NoSuchRevision: |
|
1858 |
raise errors.FileTimestampUnavailable(self.id2path(file_id)) |
|
1859 |
return rev.timestamp |
|
2255.7.36
by John Arbash Meinel
All trees should implement get_file_mtime() |
1860 |
|
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1861 |
def get_file_sha1(self, file_id, path=None, stat_value=None): |
2255.10.1
by John Arbash Meinel
Update WorkingTree4 so that it doesn't use a HashCache, |
1862 |
entry = self._get_entry(file_id=file_id, path=path) |
1863 |
parent_index = self._get_parent_index() |
|
1864 |
parent_details = entry[1][parent_index] |
|
1865 |
if parent_details[0] == 'f': |
|
1866 |
return parent_details[1] |
|
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1867 |
return None |
1868 |
||
5793.2.3
by Jelmer Vernooij
Add a RevisionTree.get_file_revision() method. |
1869 |
@needs_read_lock
|
1870 |
def get_file_revision(self, file_id): |
|
1871 |
return self.inventory[file_id].revision |
|
1872 |
||
2743.3.3
by Ian Clatworthy
Skip path lookup for tree.get_file() when we already know the path |
1873 |
def get_file(self, file_id, path=None): |
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1874 |
return StringIO(self.get_file_text(file_id)) |
1875 |
||
1876 |
def get_file_size(self, file_id): |
|
3363.3.4
by Aaron Bentley
Add get_file_size to Tree interface |
1877 |
"""See Tree.get_file_size"""
|
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1878 |
return self.inventory[file_id].text_size |
1879 |
||
3774.1.1
by Aaron Bentley
Test Tree.get_file_text() and supply default implementation. |
1880 |
def get_file_text(self, file_id, path=None): |
4202.1.1
by John Arbash Meinel
Update Repository.iter_files_bytes() to return an iterable of bytestrings. |
1881 |
_, content = list(self.iter_files_bytes([(file_id, None)]))[0] |
1882 |
return ''.join(content) |
|
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1883 |
|
2255.2.226
by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet. |
1884 |
def get_reference_revision(self, file_id, path=None): |
1885 |
return self.inventory[file_id].reference_revision |
|
2255.2.218
by Robert Collins
Make the nested tree commit smoke test be more rigourous. |
1886 |
|
2708.1.7
by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes |
1887 |
def iter_files_bytes(self, desired_files): |
1888 |
"""See Tree.iter_files_bytes.
|
|
2708.1.4
by Aaron Bentley
RevisionTree and DirStateRevisionTree use Repository.extract_files_bytes |
1889 |
|
2708.1.7
by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes |
1890 |
This version is implemented on top of Repository.iter_files_bytes"""
|
2708.1.6
by Aaron Bentley
Turn extract_files_bytes into an iterator |
1891 |
parent_index = self._get_parent_index() |
2708.1.11
by Aaron Bentley
Test and tweak error handling |
1892 |
repo_desired_files = [] |
1893 |
for file_id, identifier in desired_files: |
|
1894 |
entry = self._get_entry(file_id) |
|
1895 |
if entry == (None, None): |
|
1896 |
raise errors.NoSuchId(self, file_id) |
|
1897 |
repo_desired_files.append((file_id, entry[1][parent_index][4], |
|
1898 |
identifier)) |
|
2708.1.7
by Aaron Bentley
Rename extract_files_bytes to iter_files_bytes |
1899 |
return self._repository.iter_files_bytes(repo_desired_files) |
2708.1.4
by Aaron Bentley
RevisionTree and DirStateRevisionTree use Repository.extract_files_bytes |
1900 |
|
5858.1.1
by Jelmer Vernooij
Support optional path argument to Tree.get_symlink_target. |
1901 |
def get_symlink_target(self, file_id, path=None): |
2255.2.134
by John Arbash Meinel
Add a tree-test for get_symlink_target |
1902 |
entry = self._get_entry(file_id=file_id) |
1903 |
parent_index = self._get_parent_index() |
|
1904 |
if entry[1][parent_index][0] != 'l': |
|
1905 |
return None |
|
1906 |
else: |
|
4216.3.1
by Robert Collins
Fix Tree.get_symlink_target to decode from the disk encoding to get a unicode encoded string. |
1907 |
target = entry[1][parent_index][1] |
1908 |
target = target.decode('utf8') |
|
1909 |
return target |
|
2255.2.134
by John Arbash Meinel
Add a tree-test for get_symlink_target |
1910 |
|
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
1911 |
def get_revision_id(self): |
1912 |
"""Return the revision id for this tree."""
|
|
1913 |
return self._revision_id |
|
1914 |
||
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1915 |
def _get_inventory(self): |
1916 |
if self._inventory is not None: |
|
1917 |
return self._inventory |
|
2255.2.182
by Martin Pool
merge dirstate and trunk |
1918 |
self._must_be_locked() |
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1919 |
self._generate_inventory() |
1920 |
return self._inventory |
|
1921 |
||
1922 |
inventory = property(_get_inventory, |
|
1923 |
doc="Inventory of this Tree") |
|
1924 |
||
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. |
1925 |
def get_parent_ids(self): |
1926 |
"""The parents of a tree in the dirstate are not cached."""
|
|
1927 |
return self._repository.get_revision(self._revision_id).parent_ids |
|
1928 |
||
2255.2.30
by Robert Collins
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests. |
1929 |
def has_filename(self, filename): |
2255.2.104
by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate. |
1930 |
return bool(self.path2id(filename)) |
2255.2.30
by Robert Collins
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests. |
1931 |
|
2255.2.182
by Martin Pool
merge dirstate and trunk |
1932 |
def kind(self, file_id): |
3016.1.1
by Aaron Bentley
Update DirStateRevisionTree to avoid using inventory |
1933 |
entry = self._get_entry(file_id=file_id)[1] |
3376.2.11
by Martin Pool
Compare to None using is/is not not == |
1934 |
if entry is None: |
3016.1.1
by Aaron Bentley
Update DirStateRevisionTree to avoid using inventory |
1935 |
raise errors.NoSuchId(tree=self, file_id=file_id) |
5080.3.3
by Vincent Ladeuil
DirStateRevisionTree.kind() should respect parent_index |
1936 |
parent_index = self._get_parent_index() |
1937 |
return dirstate.DirState._minikind_to_kind[entry[parent_index][0]] |
|
2255.2.182
by Martin Pool
merge dirstate and trunk |
1938 |
|
3146.8.4
by Aaron Bentley
Eliminate direct use of inventory from transform application |
1939 |
def stored_kind(self, file_id): |
1940 |
"""See Tree.stored_kind"""
|
|
1941 |
return self.kind(file_id) |
|
1942 |
||
2776.1.7
by Robert Collins
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a |
1943 |
def path_content_summary(self, path): |
1944 |
"""See Tree.path_content_summary."""
|
|
1945 |
id = self.inventory.path2id(path) |
|
1946 |
if id is None: |
|
1947 |
return ('missing', None, None, None) |
|
1948 |
entry = self._inventory[id] |
|
1949 |
kind = entry.kind |
|
1950 |
if kind == 'file': |
|
1951 |
return (kind, entry.text_size, entry.executable, entry.text_sha1) |
|
1952 |
elif kind == 'symlink': |
|
1953 |
return (kind, None, None, entry.symlink_target) |
|
1954 |
else: |
|
1955 |
return (kind, None, None, None) |
|
1956 |
||
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1957 |
def is_executable(self, file_id, path=None): |
1958 |
ie = self.inventory[file_id] |
|
1959 |
if ie.kind != "file": |
|
5050.57.1
by Aaron Bentley
Make is_executable treat symlinks and directories the same across tree types. |
1960 |
return False |
2255.2.31
by Robert Collins
Work in progress to make merge_inner work with dirstate trees. |
1961 |
return ie.executable |
1962 |
||
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1963 |
def is_locked(self): |
1964 |
return self._locked |
|
1965 |
||
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
1966 |
def list_files(self, include_root=False, from_dir=None, recursive=True): |
2255.2.71
by John Arbash Meinel
Add a test for list_files, and implement it for DirStateRevisionTree |
1967 |
# We use a standard implementation, because DirStateRevisionTree is
|
1968 |
# dealing with one of the parents of the current state
|
|
1969 |
inv = self._get_inventory() |
|
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
1970 |
if from_dir is None: |
1971 |
from_dir_id = None |
|
1972 |
else: |
|
1973 |
from_dir_id = inv.path2id(from_dir) |
|
4370.5.3
by Ian Clatworthy
handle unversioned directories |
1974 |
if from_dir_id is None: |
1975 |
# Directory not versioned
|
|
1976 |
return
|
|
4370.5.2
by Ian Clatworthy
extend list_files() with from_dir and recursive parameters |
1977 |
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive) |
1978 |
if inv.root is not None and not include_root and from_dir is None: |
|
2255.2.71
by John Arbash Meinel
Add a test for list_files, and implement it for DirStateRevisionTree |
1979 |
entries.next() |
1980 |
for path, entry in entries: |
|
1981 |
yield path, 'V', entry.kind, entry.file_id, entry |
|
2255.2.84
by John Arbash Meinel
Remove now-unecessary encode/decode calls for revision ids. |
1982 |
|
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. |
1983 |
def lock_read(self): |
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1984 |
"""Lock the tree for a set of operations.
|
1985 |
||
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
1986 |
:return: A bzrlib.lock.LogicalLockResult.
|
5200.3.3
by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now |
1987 |
"""
|
2255.2.79
by Robert Collins
Take out repository locks from Dirstate revision trees, to improve file text access performance. |
1988 |
if not self._locked: |
1989 |
self._repository.lock_read() |
|
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
1990 |
if self._dirstate._lock_token is None: |
1991 |
self._dirstate.lock_read() |
|
1992 |
self._dirstate_locked = True |
|
2255.2.38
by Robert Collins
Fix WorkingTree4.pull to work. |
1993 |
self._locked += 1 |
5200.3.6
by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review. |
1994 |
return LogicalLockResult(self.unlock) |
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. |
1995 |
|
2255.2.183
by Martin Pool
add missing _must_be_locked and a better message |
1996 |
def _must_be_locked(self): |
1997 |
if not self._locked: |
|
1998 |
raise errors.ObjectNotLocked(self) |
|
1999 |
||
2255.2.98
by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory. |
2000 |
@needs_read_lock
|
2255.2.65
by John Arbash Meinel
override path2id because it should be optimized anyway |
2001 |
def path2id(self, path): |
2002 |
"""Return the id for path in this tree."""
|
|
2255.2.98
by Robert Collins
Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory. |
2003 |
# lookup by path: faster than splitting and walking the ivnentory.
|
2004 |
entry = self._get_entry(path=path) |
|
2005 |
if entry == (None, None): |
|
2006 |
return None |
|
2255.2.107
by John Arbash Meinel
(working), fix dirstate to use utf8 file ids. |
2007 |
return entry[0][2] |
2255.2.65
by John Arbash Meinel
override path2id because it should be optimized anyway |
2008 |
|
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. |
2009 |
def unlock(self): |
2010 |
"""Unlock, freeing any cache memory used during the lock."""
|
|
2011 |
# outside of a lock, the inventory is suspect: release it.
|
|
2255.2.38
by Robert Collins
Fix WorkingTree4.pull to work. |
2012 |
self._locked -=1 |
2013 |
if not self._locked: |
|
2014 |
self._inventory = None |
|
2255.5.2
by John Arbash Meinel
(broken) lock and unlock the DirState object when locking and unlocking the Tree itself |
2015 |
self._locked = 0 |
2016 |
if self._dirstate_locked: |
|
2017 |
self._dirstate.unlock() |
|
2018 |
self._dirstate_locked = False |
|
2255.2.79
by Robert Collins
Take out repository locks from Dirstate revision trees, to improve file text access performance. |
2019 |
self._repository.unlock() |
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
2020 |
|
3504.2.1
by John Arbash Meinel
Shortcut iter_references when we know references aren't supported. |
2021 |
@needs_read_lock
|
2022 |
def supports_tree_reference(self): |
|
2023 |
return self._repo_supports_tree_reference |
|
2024 |
||
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
2025 |
def walkdirs(self, prefix=""): |
2255.2.236
by Martin Pool
Review cleanups: mostly updating or removing todo comments. |
2026 |
# TODO: jam 20070215 This is the lazy way by using the RevisionTree
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2027 |
# implementation based on an inventory.
|
2255.2.236
by Martin Pool
Review cleanups: mostly updating or removing todo comments. |
2028 |
# This should be cleaned up to use the much faster Dirstate code
|
2029 |
# So for now, we just build up the parent inventory, and extract
|
|
2030 |
# it the same way RevisionTree does.
|
|
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
2031 |
_directory = 'directory' |
2255.2.70
by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs() |
2032 |
inv = self._get_inventory() |
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
2033 |
top_id = inv.path2id(prefix) |
2034 |
if top_id is None: |
|
2035 |
pending = [] |
|
2036 |
else: |
|
2255.2.70
by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs() |
2037 |
pending = [(prefix, top_id)] |
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
2038 |
while pending: |
2039 |
dirblock = [] |
|
2255.2.70
by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs() |
2040 |
relpath, file_id = pending.pop() |
2041 |
# 0 - relpath, 1- file-id
|
|
2042 |
if relpath: |
|
2043 |
relroot = relpath + '/' |
|
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
2044 |
else: |
2045 |
relroot = "" |
|
2046 |
# FIXME: stash the node in pending
|
|
2255.2.70
by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs() |
2047 |
entry = inv[file_id] |
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
2048 |
for name, child in entry.sorted_children(): |
2049 |
toppath = relroot + name |
|
2050 |
dirblock.append((toppath, name, child.kind, None, |
|
2051 |
child.file_id, child.kind |
|
2052 |
))
|
|
2255.2.70
by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs() |
2053 |
yield (relpath, entry.file_id), dirblock |
2255.2.69
by John Arbash Meinel
Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass |
2054 |
# push the user specified dirs from dirblock
|
2055 |
for dir in reversed(dirblock): |
|
2056 |
if dir[2] == _directory: |
|
2255.2.70
by John Arbash Meinel
Minor improvements to DirStateRevisionTree.walkdirs() |
2057 |
pending.append((dir[0], dir[4])) |
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2058 |
|
2059 |
||
2060 |
class InterDirStateTree(InterTree): |
|
2255.13.3
by Martin Pool
Comments and better assertions in InterDirStateTree |
2061 |
"""Fast path optimiser for changes_from with dirstate trees.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2062 |
|
2063 |
This is used only when both trees are in the dirstate working file, and
|
|
2064 |
the source is any parent within the dirstate, and the destination is
|
|
2255.13.3
by Martin Pool
Comments and better assertions in InterDirStateTree |
2065 |
the current working tree of the same dirstate.
|
2066 |
"""
|
|
2067 |
# this could be generalized to allow comparisons between any trees in the
|
|
2068 |
# dirstate, and possibly between trees stored in different dirstates.
|
|
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2069 |
|
2255.2.122
by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised. |
2070 |
def __init__(self, source, target): |
2071 |
super(InterDirStateTree, self).__init__(source, target) |
|
2072 |
if not InterDirStateTree.is_compatible(source, target): |
|
2073 |
raise Exception, "invalid source %r and target %r" % (source, target) |
|
2074 |
||
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2075 |
@staticmethod
|
2255.2.122
by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised. |
2076 |
def make_source_parent_tree(source, target): |
2077 |
"""Change the source tree into a parent of the target."""
|
|
2078 |
revid = source.commit('record tree') |
|
5741.1.4
by Jelmer Vernooij
Change Branch.fetch to take fetch_tags argument rather than fetch_spec. |
2079 |
target.branch.fetch(source.branch, revid) |
2255.2.122
by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised. |
2080 |
target.set_parent_ids([revid]) |
2081 |
return target.basis_tree(), target |
|
2255.7.25
by John Arbash Meinel
Shave off 200+ ms of 'time bzr status' in lp tree |
2082 |
|
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2083 |
@classmethod
|
3696.4.15
by Robert Collins
Merge bzr.dev. |
2084 |
def make_source_parent_tree_python_dirstate(klass, test_case, source, target): |
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2085 |
result = klass.make_source_parent_tree(source, target) |
2086 |
result[1]._iter_changes = dirstate.ProcessEntryPython |
|
2087 |
return result |
|
2088 |
||
2089 |
@classmethod
|
|
4913.2.4
by John Arbash Meinel
Switch CompiledDirstateHelpersFeature. |
2090 |
def make_source_parent_tree_compiled_dirstate(klass, test_case, source, |
2091 |
target): |
|
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2092 |
from bzrlib.tests.test__dirstate_helpers import \ |
4913.2.25
by John Arbash Meinel
Some helpers were accessing a feature that got renamed. |
2093 |
compiled_dirstate_helpers_feature
|
2094 |
test_case.requireFeature(compiled_dirstate_helpers_feature) |
|
4459.2.1
by Vincent Ladeuil
Use a consistent scheme for naming pyrex source files. |
2095 |
from bzrlib._dirstate_helpers_pyx import ProcessEntryC |
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2096 |
result = klass.make_source_parent_tree(source, target) |
2097 |
result[1]._iter_changes = ProcessEntryC |
|
2098 |
return result |
|
2099 |
||
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2100 |
_matching_from_tree_format = WorkingTreeFormat4() |
2101 |
_matching_to_tree_format = WorkingTreeFormat4() |
|
3363.14.11
by Aaron Bentley
Fix intertree tests with dirstate |
2102 |
|
2103 |
@classmethod
|
|
2104 |
def _test_mutable_trees_to_test_trees(klass, test_case, source, target): |
|
3696.4.15
by Robert Collins
Merge bzr.dev. |
2105 |
# This method shouldn't be called, because we have python and C
|
2106 |
# specific flavours.
|
|
2107 |
raise NotImplementedError |
|
2255.2.122
by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised. |
2108 |
|
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
2109 |
def iter_changes(self, include_unchanged=False, |
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2110 |
specific_files=None, pb=None, extra_trees=[], |
2255.7.85
by Robert Collins
Teach _iter_changes to gather unversioned path details upon request. |
2111 |
require_versioned=True, want_unversioned=False): |
2255.2.122
by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised. |
2112 |
"""Return the changes from source to target.
|
2113 |
||
3254.1.1
by Aaron Bentley
Make Tree.iter_changes a public method |
2114 |
:return: An iterator that yields tuples. See InterTree.iter_changes
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2115 |
for details.
|
2255.2.122
by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised. |
2116 |
:param specific_files: An optional list of file paths to restrict the
|
2117 |
comparison to. When mapping filenames to ids, all matches in all
|
|
2118 |
trees (including optional extra_trees) are used, and all children of
|
|
2119 |
matched directories are included.
|
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2120 |
:param include_unchanged: An optional boolean requesting the inclusion of
|
2255.2.122
by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised. |
2121 |
unchanged entries in the result.
|
2122 |
:param extra_trees: An optional list of additional trees to use when
|
|
2123 |
mapping the contents of specific_files (paths) to file_ids.
|
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2124 |
:param require_versioned: If True, all files in specific_files must be
|
2125 |
versioned in one of source, target, extra_trees or
|
|
2126 |
PathsNotVersionedError is raised.
|
|
2255.7.85
by Robert Collins
Teach _iter_changes to gather unversioned path details upon request. |
2127 |
:param want_unversioned: Should unversioned files be returned in the
|
2128 |
output. An unversioned file is defined as one with (False, False)
|
|
2129 |
for the versioned pair.
|
|
2255.2.122
by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised. |
2130 |
"""
|
2255.2.155
by Martin Pool
Better assertion message from InterDirStateTree._iter_changes |
2131 |
# TODO: handle extra trees in the dirstate.
|
2974.2.1
by John Arbash Meinel
Re-enable the fast path for the no-parent commit case. |
2132 |
if (extra_trees or specific_files == []): |
2255.2.155
by Martin Pool
Better assertion message from InterDirStateTree._iter_changes |
2133 |
# we can't fast-path these cases (yet)
|
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2134 |
return super(InterDirStateTree, self).iter_changes( |
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2135 |
include_unchanged, specific_files, pb, extra_trees, |
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2136 |
require_versioned, want_unversioned=want_unversioned) |
2255.7.1
by John Arbash Meinel
_iter_changes should return Unicode paths. |
2137 |
parent_ids = self.target.get_parent_ids() |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
2138 |
if not (self.source._revision_id in parent_ids |
4496.3.16
by Andrew Bennetts
Remove lots of unused imports. |
2139 |
or self.source._revision_id == _mod_revision.NULL_REVISION): |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
2140 |
raise AssertionError( |
2141 |
"revision {%s} is not stored in {%s}, but %s " |
|
2142 |
"can only be used for trees stored in the dirstate"
|
|
2143 |
% (self.source._revision_id, self.target, self.iter_changes)) |
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2144 |
target_index = 0 |
4496.3.16
by Andrew Bennetts
Remove lots of unused imports. |
2145 |
if self.source._revision_id == _mod_revision.NULL_REVISION: |
2255.7.1
by John Arbash Meinel
_iter_changes should return Unicode paths. |
2146 |
source_index = None |
2147 |
indices = (target_index,) |
|
2148 |
else: |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
2149 |
if not (self.source._revision_id in parent_ids): |
2150 |
raise AssertionError( |
|
2151 |
"Failure: source._revision_id: %s not in target.parent_ids(%s)" % ( |
|
2152 |
self.source._revision_id, parent_ids)) |
|
2255.7.1
by John Arbash Meinel
_iter_changes should return Unicode paths. |
2153 |
source_index = 1 + parent_ids.index(self.source._revision_id) |
2974.2.1
by John Arbash Meinel
Re-enable the fast path for the no-parent commit case. |
2154 |
indices = (source_index, target_index) |
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2155 |
# -- make all specific_files utf8 --
|
2156 |
if specific_files: |
|
2157 |
specific_files_utf8 = set() |
|
2158 |
for path in specific_files: |
|
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2159 |
# Note, if there are many specific files, using cache_utf8
|
2160 |
# would be good here.
|
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2161 |
specific_files_utf8.add(path.encode('utf8')) |
2162 |
specific_files = specific_files_utf8 |
|
2163 |
else: |
|
2164 |
specific_files = set(['']) |
|
2165 |
# -- specific_files is now a utf8 path set --
|
|
4325.3.1
by Johan Walles
Don't reinvent osutils.minimum_path_selection(). |
2166 |
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2167 |
# -- get the state object and prepare it.
|
2168 |
state = self.target.current_dirstate() |
|
2169 |
state._read_dirblocks_if_needed() |
|
2170 |
if require_versioned: |
|
2171 |
# -- check all supplied paths are versioned in a search tree. --
|
|
4475.1.1
by Benoît Pierre
Improve "Path(s) are not versioned" error reporting for some commands. |
2172 |
not_versioned = [] |
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2173 |
for path in specific_files: |
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2174 |
path_entries = state._entries_for_path(path) |
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2175 |
if not path_entries: |
2176 |
# this specified path is not present at all: error
|
|
4475.1.1
by Benoît Pierre
Improve "Path(s) are not versioned" error reporting for some commands. |
2177 |
not_versioned.append(path) |
2178 |
continue
|
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2179 |
found_versioned = False |
2180 |
# for each id at this path
|
|
2181 |
for entry in path_entries: |
|
2182 |
# for each tree.
|
|
2255.7.1
by John Arbash Meinel
_iter_changes should return Unicode paths. |
2183 |
for index in indices: |
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2184 |
if entry[1][index][0] != 'a': # absent |
2185 |
found_versioned = True |
|
2186 |
# all good: found a versioned cell
|
|
2187 |
break
|
|
2188 |
if not found_versioned: |
|
2189 |
# none of the indexes was not 'absent' at all ids for this
|
|
2190 |
# path.
|
|
4475.1.1
by Benoît Pierre
Improve "Path(s) are not versioned" error reporting for some commands. |
2191 |
not_versioned.append(path) |
2192 |
if len(not_versioned) > 0: |
|
2193 |
raise errors.PathsNotVersionedError(not_versioned) |
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2194 |
# -- remove redundancy in supplied specific_files to prevent over-scanning --
|
4325.3.1
by Johan Walles
Don't reinvent osutils.minimum_path_selection(). |
2195 |
search_specific_files = osutils.minimum_path_selection(specific_files) |
3696.4.10
by Robert Collins
Basic first cut of full-pyrex iter_changes. |
2196 |
|
2197 |
use_filesystem_for_exec = (sys.platform != 'win32') |
|
2198 |
iter_changes = self.target._iter_changes(include_unchanged, |
|
2199 |
use_filesystem_for_exec, search_specific_files, state, |
|
2200 |
source_index, target_index, want_unversioned, self.target) |
|
2201 |
return iter_changes.iter_changes() |
|
2255.2.149
by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4. |
2202 |
|
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2203 |
@staticmethod
|
2204 |
def is_compatible(source, target): |
|
2205 |
# the target must be a dirstate working tree
|
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
2206 |
if not isinstance(target, DirStateWorkingTree): |
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2207 |
return False |
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
2208 |
# the source must be a revtree or dirstate rev tree.
|
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2209 |
if not isinstance(source, |
2210 |
(revisiontree.RevisionTree, DirStateRevisionTree)): |
|
2211 |
return False |
|
2212 |
# the source revid must be in the target dirstate
|
|
4496.3.16
by Andrew Bennetts
Remove lots of unused imports. |
2213 |
if not (source._revision_id == _mod_revision.NULL_REVISION or |
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2214 |
source._revision_id in target.get_parent_ids()): |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2215 |
# TODO: what about ghosts? it may well need to
|
2255.2.117
by Robert Collins
Add an InterDirStateTree InterTree optimiser. |
2216 |
# check for them explicitly.
|
2217 |
return False |
|
2218 |
return True |
|
2219 |
||
2220 |
InterTree.register_optimiser(InterDirStateTree) |
|
2255.12.1
by Robert Collins
Implement upgrade for working trees. |
2221 |
|
2222 |
||
2223 |
class Converter3to4(object): |
|
2224 |
"""Perform an in-place upgrade of format 3 to format 4 trees."""
|
|
2225 |
||
2226 |
def __init__(self): |
|
2227 |
self.target_format = WorkingTreeFormat4() |
|
2228 |
||
2229 |
def convert(self, tree): |
|
2230 |
# lock the control files not the tree, so that we dont get tree
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2231 |
# on-unlock behaviours, and so that noone else diddles with the
|
2255.12.1
by Robert Collins
Implement upgrade for working trees. |
2232 |
# tree during upgrade.
|
2233 |
tree._control_files.lock_write() |
|
2234 |
try: |
|
2334.1.3
by John Arbash Meinel
When upgrading, we can't assume that WorkingTree._inventory is valid, because that is now |
2235 |
tree.read_working_inventory() |
2255.12.1
by Robert Collins
Implement upgrade for working trees. |
2236 |
self.create_dirstate_data(tree) |
2237 |
self.update_format(tree) |
|
2238 |
self.remove_xml_files(tree) |
|
2239 |
finally: |
|
2240 |
tree._control_files.unlock() |
|
2241 |
||
2242 |
def create_dirstate_data(self, tree): |
|
2243 |
"""Create the dirstate based data for tree."""
|
|
2244 |
local_path = tree.bzrdir.get_workingtree_transport(None |
|
2245 |
).local_abspath('dirstate') |
|
2246 |
state = dirstate.DirState.from_tree(tree, local_path) |
|
2247 |
state.save() |
|
2248 |
state.unlock() |
|
2249 |
||
2250 |
def remove_xml_files(self, tree): |
|
2251 |
"""Remove the oldformat 3 data."""
|
|
2252 |
transport = tree.bzrdir.get_workingtree_transport(None) |
|
2253 |
for path in ['basis-inventory-cache', 'inventory', 'last-revision', |
|
2254 |
'pending-merges', 'stat-cache']: |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
2255 |
try: |
2256 |
transport.delete(path) |
|
2257 |
except errors.NoSuchFile: |
|
2258 |
# some files are optional - just deal.
|
|
2259 |
pass
|
|
2255.12.1
by Robert Collins
Implement upgrade for working trees. |
2260 |
|
2261 |
def update_format(self, tree): |
|
2262 |
"""Change the format marker."""
|
|
3407.2.14
by Martin Pool
Remove more cases of getting transport via control_files |
2263 |
tree._transport.put_bytes('format', |
3407.2.5
by Martin Pool
Deprecate LockableFiles.put_utf8 |
2264 |
self.target_format.get_format_string(), |
3407.2.18
by Martin Pool
BzrDir takes responsibility for default file/dir modes |
2265 |
mode=tree.bzrdir._get_file_mode()) |
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
2266 |
|
2267 |
||
2268 |
class Converter4to5(object): |
|
2269 |
"""Perform an in-place upgrade of format 4 to format 5 trees."""
|
|
2270 |
||
2271 |
def __init__(self): |
|
2272 |
self.target_format = WorkingTreeFormat5() |
|
2273 |
||
2274 |
def convert(self, tree): |
|
2275 |
# lock the control files not the tree, so that we don't get tree
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2276 |
# on-unlock behaviours, and so that no-one else diddles with the
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
2277 |
# tree during upgrade.
|
2278 |
tree._control_files.lock_write() |
|
2279 |
try: |
|
4210.4.2
by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6 |
2280 |
self.update_format(tree) |
2281 |
finally: |
|
2282 |
tree._control_files.unlock() |
|
2283 |
||
2284 |
def update_format(self, tree): |
|
2285 |
"""Change the format marker."""
|
|
2286 |
tree._transport.put_bytes('format', |
|
2287 |
self.target_format.get_format_string(), |
|
2288 |
mode=tree.bzrdir._get_file_mode()) |
|
2289 |
||
2290 |
||
2291 |
class Converter4or5to6(object): |
|
2292 |
"""Perform an in-place upgrade of format 4 or 5 to format 6 trees."""
|
|
2293 |
||
2294 |
def __init__(self): |
|
2295 |
self.target_format = WorkingTreeFormat6() |
|
2296 |
||
2297 |
def convert(self, tree): |
|
2298 |
# lock the control files not the tree, so that we don't get tree
|
|
2299 |
# on-unlock behaviours, and so that no-one else diddles with the
|
|
2300 |
# tree during upgrade.
|
|
2301 |
tree._control_files.lock_write() |
|
2302 |
try: |
|
3907.2.3
by Ian Clatworthy
DirStateWorkingTree and DirStateWorkingTreeFormat base classes introduced |
2303 |
self.init_custom_control_files(tree) |
2304 |
self.update_format(tree) |
|
2305 |
finally: |
|
2306 |
tree._control_files.unlock() |
|
2307 |
||
2308 |
def init_custom_control_files(self, tree): |
|
2309 |
"""Initialize custom control files."""
|
|
2310 |
tree._transport.put_bytes('views', '', |
|
2311 |
mode=tree.bzrdir._get_file_mode()) |
|
2312 |
||
2313 |
def update_format(self, tree): |
|
2314 |
"""Change the format marker."""
|
|
2315 |
tree._transport.put_bytes('format', |
|
2316 |
self.target_format.get_format_string(), |
|
2317 |
mode=tree.bzrdir._get_file_mode()) |