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