bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
453
by Martin Pool
- Split WorkingTree into its own file |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
453
by Martin Pool
- Split WorkingTree into its own file |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
453
by Martin Pool
- Split WorkingTree into its own file |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
17 |
"""WorkingTree object and friends.
|
18 |
||
19 |
A WorkingTree represents the editable working copy of a branch.
|
|
20 |
Operations which represent the WorkingTree are also done here,
|
|
21 |
such as renaming or adding files. The WorkingTree has an inventory
|
|
22 |
which is updated by these operations. A commit produces a
|
|
23 |
new revision based on the workingtree and its inventory.
|
|
24 |
||
25 |
At the moment every WorkingTree has its own branch. Remote
|
|
26 |
WorkingTrees aren't supported.
|
|
27 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
28 |
To get a WorkingTree, call bzrdir.open_workingtree() or
|
29 |
WorkingTree.open(dir).
|
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
30 |
"""
|
31 |
||
32 |
# TODO: Give the workingtree sole responsibility for the working inventory;
|
|
33 |
# remove the variable and references to it from the branch. This may require
|
|
34 |
# updating the commit code so as to update the inventory within the working
|
|
35 |
# copy, and making sure there's only one WorkingTree for any directory on disk.
|
|
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
36 |
# At the moment they may alias the inventory and have old copies of it in
|
37 |
# memory. (Now done? -- mbp 20060309)
|
|
956
by Martin Pool
doc |
38 |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
39 |
from cStringIO import StringIO |
40 |
import os |
|
41 |
||
42 |
from bzrlib.lazy_import import lazy_import |
|
43 |
lazy_import(globals(), """ |
|
1732.1.9
by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files |
44 |
import collections
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
45 |
from copy import deepcopy
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
46 |
import errno
|
1398
by Robert Collins
integrate in Gustavos x-bit patch |
47 |
import stat
|
1713.1.6
by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'. |
48 |
from time import time
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
49 |
import warnings
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
50 |
|
1836.1.21
by John Arbash Meinel
Restore the ability to ignore items by modifying DEFAULT_IGNORE |
51 |
import bzrlib
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
52 |
from bzrlib import (
|
53 |
bzrdir,
|
|
54 |
conflicts as _mod_conflicts,
|
|
55 |
errors,
|
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
56 |
generate_ids,
|
2135.2.7
by Kent Gibson
Implement JAM's review suggestions. |
57 |
globbing,
|
2201.1.1
by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write. |
58 |
hashcache,
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
59 |
ignores,
|
60 |
merge,
|
|
61 |
osutils,
|
|
62 |
textui,
|
|
63 |
transform,
|
|
1986.5.2
by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please |
64 |
urlutils,
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
65 |
xml5,
|
1996.3.20
by John Arbash Meinel
[merge] bzr.dev 2063 |
66 |
xml6,
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
67 |
)
|
1852.3.1
by Robert Collins
Trivial cleanups to workingtree.py |
68 |
import bzrlib.branch
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
69 |
from bzrlib.transport import get_transport
|
70 |
import bzrlib.ui
|
|
71 |
""") |
|
72 |
||
1986.5.6
by Robert Collins
Merge bzr.dev. |
73 |
from bzrlib import symbol_versioning |
1534.4.28
by Robert Collins
first cut at merge from integration. |
74 |
from bzrlib.decorators import needs_read_lock, needs_write_lock |
1986.5.2
by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please |
75 |
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID |
1553.5.63
by Martin Pool
Lock type is now mandatory for LockableFiles constructor |
76 |
from bzrlib.lockable_files import LockableFiles, TransportLock |
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
77 |
from bzrlib.lockdir import LockDir |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
78 |
import bzrlib.mutabletree |
1986.1.8
by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree. |
79 |
from bzrlib.mutabletree import needs_tree_write_lock |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
80 |
from bzrlib.osutils import ( |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
81 |
compact_date, |
82 |
file_kind, |
|
83 |
isdir, |
|
2206.1.8
by Marius Kruger
Converted move/rename error messages to show source => target. |
84 |
normpath, |
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
85 |
pathjoin, |
86 |
rand_chars, |
|
2206.1.8
by Marius Kruger
Converted move/rename error messages to show source => target. |
87 |
realpath, |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
88 |
safe_unicode, |
89 |
splitpath, |
|
90 |
supports_executable, |
|
91 |
)
|
|
92 |
from bzrlib.trace import mutter, note |
|
93 |
from bzrlib.transport.local import LocalTransport |
|
94 |
import bzrlib.tree |
|
1551.2.36
by Aaron Bentley
Make pull update the progress bar more nicely |
95 |
from bzrlib.progress import DummyProgress, ProgressPhase |
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
96 |
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
97 |
import bzrlib.revisiontree |
1534.10.3
by Aaron Bentley
Simplify set_merge_modified with rio_file |
98 |
from bzrlib.rio import RioReader, rio_file, Stanza |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
99 |
from bzrlib.symbol_versioning import (deprecated_passed, |
100 |
deprecated_method, |
|
101 |
deprecated_function, |
|
102 |
DEPRECATED_PARAMETER, |
|
103 |
zero_eight, |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
104 |
zero_eleven, |
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
105 |
zero_thirteen, |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
106 |
)
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
107 |
|
108 |
||
109 |
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1" |
|
110 |
CONFLICT_HEADER_1 = "BZR conflict list format 1" |
|
1685.1.30
by John Arbash Meinel
PEP8 for workingtree.py |
111 |
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
112 |
|
113 |
@deprecated_function(zero_thirteen) |
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
114 |
def gen_file_id(name): |
1713.1.6
by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'. |
115 |
"""Return new file id for the basename 'name'. |
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
116 |
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
117 |
Use bzrlib.generate_ids.gen_file_id() instead
|
1185.85.34
by John Arbash Meinel
Updating 'bzr file-id' exposed that we weren't allowing unicode file ids. Enabling them reveals a lot more bugs. |
118 |
"""
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
119 |
return generate_ids.gen_file_id(name) |
120 |
||
121 |
||
122 |
@deprecated_function(zero_thirteen) |
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
123 |
def gen_root_id(): |
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
124 |
"""Return a new tree-root file id. |
125 |
||
126 |
This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
|
|
127 |
"""
|
|
128 |
return generate_ids.gen_root_id() |
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
129 |
|
130 |
||
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
131 |
class TreeEntry(object): |
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
132 |
"""An entry that implements the minimum interface used by commands. |
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
133 |
|
134 |
This needs further inspection, it may be better to have
|
|
135 |
InventoryEntries without ids - though that seems wrong. For now,
|
|
136 |
this is a parallel hierarchy to InventoryEntry, and needs to become
|
|
137 |
one of several things: decorates to that hierarchy, children of, or
|
|
138 |
parents of it.
|
|
1399.1.3
by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes |
139 |
Another note is that these objects are currently only used when there is
|
140 |
no InventoryEntry available - i.e. for unversioned objects.
|
|
141 |
Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
|
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
142 |
"""
|
143 |
||
144 |
def __eq__(self, other): |
|
145 |
# yes, this us ugly, TODO: best practice __eq__ style.
|
|
146 |
return (isinstance(other, TreeEntry) |
|
147 |
and other.__class__ == self.__class__) |
|
148 |
||
149 |
def kind_character(self): |
|
150 |
return "???" |
|
151 |
||
152 |
||
153 |
class TreeDirectory(TreeEntry): |
|
154 |
"""See TreeEntry. This is a directory in a working tree.""" |
|
155 |
||
156 |
def __eq__(self, other): |
|
157 |
return (isinstance(other, TreeDirectory) |
|
158 |
and other.__class__ == self.__class__) |
|
159 |
||
160 |
def kind_character(self): |
|
161 |
return "/" |
|
162 |
||
163 |
||
164 |
class TreeFile(TreeEntry): |
|
165 |
"""See TreeEntry. This is a regular file in a working tree.""" |
|
166 |
||
167 |
def __eq__(self, other): |
|
168 |
return (isinstance(other, TreeFile) |
|
169 |
and other.__class__ == self.__class__) |
|
170 |
||
171 |
def kind_character(self): |
|
172 |
return '' |
|
173 |
||
174 |
||
175 |
class TreeLink(TreeEntry): |
|
176 |
"""See TreeEntry. This is a symlink in a working tree.""" |
|
177 |
||
178 |
def __eq__(self, other): |
|
179 |
return (isinstance(other, TreeLink) |
|
180 |
and other.__class__ == self.__class__) |
|
181 |
||
182 |
def kind_character(self): |
|
183 |
return '' |
|
184 |
||
185 |
||
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
186 |
class WorkingTree(bzrlib.mutabletree.MutableTree): |
453
by Martin Pool
- Split WorkingTree into its own file |
187 |
"""Working copy tree. |
188 |
||
189 |
The inventory is held in the `Branch` working-inventory, and the
|
|
190 |
files are in a directory on disk.
|
|
191 |
||
192 |
It is possible for a `WorkingTree` to have a filename which is
|
|
193 |
not listed in the Inventory and vice versa.
|
|
194 |
"""
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
195 |
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
196 |
def __init__(self, basedir='.', |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
197 |
branch=DEPRECATED_PARAMETER, |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
198 |
_inventory=None, |
199 |
_control_files=None, |
|
200 |
_internal=False, |
|
201 |
_format=None, |
|
202 |
_bzrdir=None): |
|
1457.1.1
by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own. |
203 |
"""Construct a WorkingTree for basedir. |
204 |
||
205 |
If the branch is not supplied, it is opened automatically.
|
|
206 |
If the branch is supplied, it must be the branch for this basedir.
|
|
207 |
(branch.base is not cross checked, because for remote branches that
|
|
208 |
would be meaningless).
|
|
209 |
"""
|
|
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. |
210 |
self._format = _format |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
211 |
self.bzrdir = _bzrdir |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
212 |
if not _internal: |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
213 |
# not created via open etc.
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
214 |
warnings.warn("WorkingTree() is deprecated as of bzr version 0.8. " |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
215 |
"Please use bzrdir.open_workingtree or WorkingTree.open().", |
216 |
DeprecationWarning, |
|
217 |
stacklevel=2) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
218 |
wt = WorkingTree.open(basedir) |
1681.1.1
by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins) |
219 |
self._branch = wt.branch |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
220 |
self.basedir = wt.basedir |
221 |
self._control_files = wt._control_files |
|
222 |
self._hashcache = wt._hashcache |
|
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
223 |
self._set_inventory(wt._inventory, dirty=False) |
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. |
224 |
self._format = wt._format |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
225 |
self.bzrdir = wt.bzrdir |
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
226 |
assert isinstance(basedir, basestring), \ |
227 |
"base directory %r is not a string" % basedir |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
228 |
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. |
229 |
mutter("opening working tree %r", basedir) |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
230 |
if deprecated_passed(branch): |
231 |
if not _internal: |
|
2206.1.7
by Marius Kruger
* errors |
232 |
warnings.warn("WorkingTree(..., branch=XXX) is deprecated" |
233 |
" as of bzr 0.8. Please use bzrdir.open_workingtree() or"
|
|
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
234 |
" WorkingTree.open().", |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
235 |
DeprecationWarning, |
236 |
stacklevel=2 |
|
237 |
)
|
|
1681.1.1
by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins) |
238 |
self._branch = branch |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
239 |
else: |
1681.1.1
by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins) |
240 |
self._branch = self.bzrdir.open_branch() |
1508.1.10
by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins) |
241 |
self.basedir = realpath(basedir) |
1534.4.28
by Robert Collins
first cut at merge from integration. |
242 |
# 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. |
243 |
if isinstance(self._format, WorkingTreeFormat2): |
244 |
# share control object
|
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
245 |
self._control_files = self.branch.control_files |
246 |
else: |
|
1852.3.1
by Robert Collins
Trivial cleanups to workingtree.py |
247 |
# assume all other formats have their own control files.
|
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
248 |
assert isinstance(_control_files, LockableFiles), \ |
249 |
"_control_files must be a LockableFiles, not %r" \ |
|
250 |
% _control_files |
|
251 |
self._control_files = _control_files |
|
866
by Martin Pool
- use new path-based hashcache for WorkingTree- squash mtime/ctime to whole seconds- update and if necessary write out hashcache when WorkingTree object is created. |
252 |
# update the whole cache up front and write to disk if anything changed;
|
253 |
# in the future we might want to do this more selectively
|
|
1467
by Robert Collins
WorkingTree.__del__ has been removed. |
254 |
# two possible ways offer themselves : in self._unlock, write the cache
|
255 |
# if needed, or, when the cache sees a change, append it to the hash
|
|
256 |
# cache file, and have the parser take the most recent entry for a
|
|
257 |
# given path only.
|
|
2220.1.6
by Marius Kruger
* change error message telling user about --after option sightly |
258 |
wt_trans = self.bzrdir.get_workingtree_transport(None) |
259 |
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. |
260 |
self._hashcache = hashcache.HashCache(basedir, cache_filename, |
261 |
self._control_files._file_mode) |
|
262 |
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. |
263 |
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. |
264 |
# 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 |
265 |
#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. |
266 |
|
267 |
if hc.needs_write: |
|
268 |
mutter("write hc") |
|
269 |
hc.write() |
|
453
by Martin Pool
- Split WorkingTree into its own file |
270 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
271 |
if _inventory is None: |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
272 |
self._inventory_is_modified = False |
273 |
self.read_working_inventory() |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
274 |
else: |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
275 |
# the caller of __init__ has provided an inventory,
|
276 |
# we assume they know what they are doing - as its only
|
|
277 |
# the Format factory and creation methods that are
|
|
278 |
# permitted to do this.
|
|
279 |
self._set_inventory(_inventory, dirty=False) |
|
1185.60.6
by Aaron Bentley
Fixed hashcache |
280 |
|
1681.1.1
by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins) |
281 |
branch = property( |
282 |
fget=lambda self: self._branch, |
|
283 |
doc="""The branch this WorkingTree is connected to. |
|
284 |
||
285 |
This cannot be set - it is reflective of the actual disk structure
|
|
286 |
the working tree has been constructed from.
|
|
287 |
""") |
|
288 |
||
1687.1.9
by Robert Collins
Teach WorkingTree about break-lock. |
289 |
def break_lock(self): |
290 |
"""Break a lock if one is present from another instance. |
|
291 |
||
292 |
Uses the ui factory to ask for confirmation if the lock may be from
|
|
293 |
an active process.
|
|
294 |
||
295 |
This will probe the repository for its lock as well.
|
|
296 |
"""
|
|
297 |
self._control_files.break_lock() |
|
298 |
self.branch.break_lock() |
|
299 |
||
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
300 |
def _set_inventory(self, inv, dirty): |
301 |
"""Set the internal cached inventory. |
|
302 |
||
303 |
:param inv: The inventory to set.
|
|
304 |
:param dirty: A boolean indicating whether the inventory is the same
|
|
305 |
logical inventory as whats on disk. If True the inventory is not
|
|
306 |
the same and should be written to disk or data will be lost, if
|
|
307 |
False then the inventory is the same as that on disk and any
|
|
308 |
serialisation would be unneeded overhead.
|
|
309 |
"""
|
|
1910.2.6
by Aaron Bentley
Update for merge review, handle deprecations |
310 |
assert inv.root is not None |
1508.1.10
by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins) |
311 |
self._inventory = inv |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
312 |
self._inventory_is_modified = dirty |
1534.5.5
by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test. |
313 |
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
314 |
@staticmethod
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
315 |
def open(path=None, _unsupported=False): |
316 |
"""Open an existing working tree at path. |
|
317 |
||
318 |
"""
|
|
319 |
if path is None: |
|
320 |
path = os.path.getcwdu() |
|
321 |
control = bzrdir.BzrDir.open(path, _unsupported) |
|
322 |
return control.open_workingtree(_unsupported) |
|
323 |
||
324 |
@staticmethod
|
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
325 |
def open_containing(path=None): |
326 |
"""Open an existing working tree which has its root about path. |
|
327 |
|
|
328 |
This probes for a working tree at path and searches upwards from there.
|
|
329 |
||
330 |
Basically we keep looking up until we find the control directory or
|
|
331 |
run into /. If there isn't one, raises NotBranchError.
|
|
332 |
TODO: give this a new exception.
|
|
333 |
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 |
334 |
|
335 |
:return: The WorkingTree that contains 'path', and the rest of path
|
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
336 |
"""
|
337 |
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 |
338 |
path = osutils.getcwd() |
1685.1.28
by John Arbash Meinel
Changing open_containing to always return a unicode path. |
339 |
control, relpath = bzrdir.BzrDir.open_containing(path) |
1685.1.27
by John Arbash Meinel
BzrDir works in URLs, but WorkingTree works in unicode paths |
340 |
|
1685.1.28
by John Arbash Meinel
Changing open_containing to always return a unicode path. |
341 |
return control.open_workingtree(), relpath |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
342 |
|
343 |
@staticmethod
|
|
344 |
def open_downlevel(path=None): |
|
345 |
"""Open an unsupported working tree. |
|
346 |
||
347 |
Only intended for advanced situations like upgrading part of a bzrdir.
|
|
348 |
"""
|
|
349 |
return WorkingTree.open(path, _unsupported=True) |
|
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
350 |
|
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
351 |
def __iter__(self): |
352 |
"""Iterate through file_ids for this tree. |
|
353 |
||
354 |
file_ids are in a WorkingTree if they are in the working inventory
|
|
355 |
and the working file exists.
|
|
356 |
"""
|
|
357 |
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. |
358 |
for path, ie in inv.iter_entries(): |
1836.1.22
by John Arbash Meinel
[merge] bzr.dev 1861 |
359 |
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. |
360 |
yield ie.file_id |
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
361 |
|
453
by Martin Pool
- Split WorkingTree into its own file |
362 |
def __repr__(self): |
363 |
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 |
364 |
getattr(self, 'basedir', None)) |
453
by Martin Pool
- Split WorkingTree into its own file |
365 |
|
366 |
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 \ |
367 |
return pathjoin(self.basedir, filename) |
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
368 |
|
369 |
def basis_tree(self): |
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
370 |
"""Return RevisionTree for the current last revision. |
371 |
|
|
372 |
If the left most parent is a ghost then the returned tree will be an
|
|
373 |
empty tree - one obtained by calling repository.revision_tree(None).
|
|
374 |
"""
|
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
375 |
try: |
376 |
revision_id = self.get_parent_ids()[0] |
|
377 |
except IndexError: |
|
378 |
# no parents, return an empty revision tree.
|
|
379 |
# in the future this should return the tree for
|
|
380 |
# 'empty:' - the implicit root empty tree.
|
|
381 |
return self.branch.repository.revision_tree(None) |
|
382 |
else: |
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
383 |
try: |
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
384 |
xml = self.read_basis_inventory() |
1996.3.20
by John Arbash Meinel
[merge] bzr.dev 2063 |
385 |
inv = xml6.serializer_v6.read_inventory_from_string(xml) |
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
386 |
if inv is not None and inv.revision_id == revision_id: |
2079.1.1
by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree() |
387 |
return bzrlib.revisiontree.RevisionTree( |
388 |
self.branch.repository, inv, revision_id) |
|
2206.1.7
by Marius Kruger
* errors |
389 |
except (errors.NoSuchFile, errors.BadInventoryFormat): |
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
390 |
pass
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
391 |
# No cached copy available, retrieve from the repository.
|
392 |
# FIXME? RBC 20060403 should we cache the inventory locally
|
|
393 |
# 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. |
394 |
try: |
395 |
return self.branch.repository.revision_tree(revision_id) |
|
396 |
except errors.RevisionNotPresent: |
|
397 |
# the basis tree *may* be a ghost or a low level error may have
|
|
398 |
# occured. If the revision is present, its a problem, if its not
|
|
399 |
# its a ghost.
|
|
400 |
if self.branch.repository.has_revision(revision_id): |
|
401 |
raise
|
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
402 |
# the basis tree is a ghost so return an empty tree.
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
403 |
return self.branch.repository.revision_tree(None) |
453
by Martin Pool
- Split WorkingTree into its own file |
404 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
405 |
@staticmethod
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
406 |
@deprecated_method(zero_eight) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
407 |
def create(branch, directory): |
408 |
"""Create a workingtree for branch at directory. |
|
409 |
||
410 |
If existing_directory already exists it must have a .bzr directory.
|
|
411 |
If it does not exist, it will be created.
|
|
412 |
||
413 |
This returns a new WorkingTree object for the new checkout.
|
|
414 |
||
415 |
TODO FIXME RBC 20060124 when we have checkout formats in place this
|
|
416 |
should accept an optional revisionid to checkout [and reject this if
|
|
417 |
checking out into the same dir as a pre-checkout-aware branch format.]
|
|
1551.1.2
by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir |
418 |
|
419 |
XXX: When BzrDir is present, these should be created through that
|
|
420 |
interface instead.
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
421 |
"""
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
422 |
warnings.warn('delete WorkingTree.create', stacklevel=3) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
423 |
transport = get_transport(directory) |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
424 |
if branch.bzrdir.root_transport.base == transport.base: |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
425 |
# same dir
|
426 |
return branch.bzrdir.create_workingtree() |
|
427 |
# different directory,
|
|
428 |
# create a branch reference
|
|
429 |
# and now a working tree.
|
|
430 |
raise NotImplementedError |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
431 |
|
432 |
@staticmethod
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
433 |
@deprecated_method(zero_eight) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
434 |
def create_standalone(directory): |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
435 |
"""Create a checkout and a branch and a repo at directory. |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
436 |
|
437 |
Directory must exist and be empty.
|
|
1551.1.2
by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir |
438 |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
439 |
please use BzrDir.create_standalone_workingtree
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
440 |
"""
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
441 |
return bzrdir.BzrDir.create_standalone_workingtree(directory) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
442 |
|
1713.1.9
by Robert Collins
Paired performance tuning of bzr add. (Robert Collins, Martin Pool). |
443 |
def relpath(self, path): |
444 |
"""Return the local path portion from a given path. |
|
445 |
|
|
446 |
The path may be absolute or relative. If its a relative path it is
|
|
447 |
interpreted relative to the python current working directory.
|
|
448 |
"""
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
449 |
return osutils.relpath(self.basedir, path) |
1457.1.3
by Robert Collins
make Branch.relpath delegate to the working tree. |
450 |
|
453
by Martin Pool
- Split WorkingTree into its own file |
451 |
def has_filename(self, filename): |
1836.1.22
by John Arbash Meinel
[merge] bzr.dev 1861 |
452 |
return osutils.lexists(self.abspath(filename)) |
453
by Martin Pool
- Split WorkingTree into its own file |
453 |
|
454 |
def get_file(self, file_id): |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
455 |
file_id = osutils.safe_file_id(file_id) |
453
by Martin Pool
- Split WorkingTree into its own file |
456 |
return self.get_file_byname(self.id2path(file_id)) |
457 |
||
1852.6.9
by Robert Collins
Add more test trees to the tree-implementations tests. |
458 |
def get_file_text(self, file_id): |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
459 |
file_id = osutils.safe_file_id(file_id) |
1852.6.9
by Robert Collins
Add more test trees to the tree-implementations tests. |
460 |
return self.get_file(file_id).read() |
461 |
||
453
by Martin Pool
- Split WorkingTree into its own file |
462 |
def get_file_byname(self, filename): |
463 |
return file(self.abspath(filename), 'rb') |
|
464 |
||
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
465 |
def annotate_iter(self, file_id): |
466 |
"""See Tree.annotate_iter |
|
467 |
||
468 |
This implementation will use the basis tree implementation if possible.
|
|
469 |
Lines not in the basis are attributed to CURRENT_REVISION
|
|
470 |
||
471 |
If there are pending merges, lines added by those merges will be
|
|
472 |
incorrectly attributed to CURRENT_REVISION (but after committing, the
|
|
473 |
attribution will be correct).
|
|
474 |
"""
|
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
475 |
file_id = osutils.safe_file_id(file_id) |
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
476 |
basis = self.basis_tree() |
477 |
changes = self._iter_changes(basis, True, [file_id]).next() |
|
478 |
changed_content, kind = changes[2], changes[6] |
|
479 |
if not changed_content: |
|
480 |
return basis.annotate_iter(file_id) |
|
481 |
if kind[1] is None: |
|
482 |
return None |
|
483 |
import annotate |
|
484 |
if kind[0] != 'file': |
|
485 |
old_lines = [] |
|
486 |
else: |
|
487 |
old_lines = list(basis.annotate_iter(file_id)) |
|
1551.9.17
by Aaron Bentley
Annotate for working trees across all parents |
488 |
old = [old_lines] |
489 |
for tree in self.branch.repository.revision_trees( |
|
490 |
self.get_parent_ids()[1:]): |
|
491 |
if file_id not in tree: |
|
492 |
continue
|
|
493 |
old.append(list(tree.annotate_iter(file_id))) |
|
494 |
return annotate.reannotate(old, self.get_file(file_id).readlines(), |
|
1551.9.16
by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree |
495 |
CURRENT_REVISION) |
1551.9.18
by Aaron Bentley
Updates from review comments |
496 |
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
497 |
def get_parent_ids(self): |
498 |
"""See Tree.get_parent_ids. |
|
499 |
|
|
500 |
This implementation reads the pending merges list and last_revision
|
|
501 |
value and uses that to decide what the parents list should be.
|
|
502 |
"""
|
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
503 |
last_rev = self._last_revision() |
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
504 |
if last_rev is None: |
505 |
parents = [] |
|
506 |
else: |
|
507 |
parents = [last_rev] |
|
1908.6.10
by Robert Collins
forward to get_parent_ids in pending_merges. |
508 |
try: |
2249.5.7
by John Arbash Meinel
Make sure WorkingTree revision_ids are also returned as utf8 strings |
509 |
merges_file = self._control_files.get('pending-merges') |
2206.1.7
by Marius Kruger
* errors |
510 |
except errors.NoSuchFile: |
1908.6.10
by Robert Collins
forward to get_parent_ids in pending_merges. |
511 |
pass
|
512 |
else: |
|
513 |
for l in merges_file.readlines(): |
|
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
514 |
revision_id = osutils.safe_revision_id(l.rstrip('\n')) |
515 |
parents.append(revision_id) |
|
1908.6.10
by Robert Collins
forward to get_parent_ids in pending_merges. |
516 |
return parents |
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
517 |
|
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. |
518 |
@needs_read_lock
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
519 |
def get_root_id(self): |
520 |
"""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. |
521 |
return self._inventory.root.file_id |
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
522 |
|
453
by Martin Pool
- Split WorkingTree into its own file |
523 |
def _get_store_filename(self, file_id): |
1508.1.1
by Robert Collins
Provide a open_containing for WorkingTree. |
524 |
## XXX: badly named; this is not in the store at all
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
525 |
file_id = osutils.safe_file_id(file_id) |
453
by Martin Pool
- Split WorkingTree into its own file |
526 |
return self.abspath(self.id2path(file_id)) |
527 |
||
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
528 |
@needs_read_lock
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
529 |
def clone(self, to_bzrdir, revision_id=None, basis=None): |
530 |
"""Duplicate this working tree into to_bzr, including all state. |
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
531 |
|
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. |
532 |
Specifically modified files are kept as modified, but
|
533 |
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() |
534 |
|
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. |
535 |
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() |
536 |
|
537 |
revision
|
|
538 |
If not None, the cloned tree will have its last revision set to
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
539 |
revision, and and difference between the source trees last revision
|
540 |
and this one merged in.
|
|
541 |
||
542 |
basis
|
|
543 |
If not None, a closer copy of a tree which may have some files in
|
|
544 |
common, and which file content should be preferentially copied from.
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
545 |
"""
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
546 |
# assumes the target bzr dir format is compatible.
|
547 |
result = self._format.initialize(to_bzrdir) |
|
548 |
self.copy_content_into(result, revision_id) |
|
549 |
return result |
|
550 |
||
551 |
@needs_read_lock
|
|
552 |
def copy_content_into(self, tree, revision_id=None): |
|
553 |
"""Copy the current content and user files of this tree into tree.""" |
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
554 |
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. |
555 |
if revision_id is None: |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
556 |
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. |
557 |
else: |
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
558 |
# TODO now merge from tree.last_revision to revision (to preserve
|
559 |
# user local changes)
|
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
560 |
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. |
561 |
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() |
562 |
|
1248
by Martin Pool
- new weave based cleanup [broken] |
563 |
def id2abspath(self, file_id): |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
564 |
file_id = osutils.safe_file_id(file_id) |
1248
by Martin Pool
- new weave based cleanup [broken] |
565 |
return self.abspath(self.id2path(file_id)) |
566 |
||
1185.12.39
by abentley
Propogated has_or_had_id to Tree |
567 |
def has_id(self, file_id): |
453
by Martin Pool
- Split WorkingTree into its own file |
568 |
# files that have been deleted are excluded
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
569 |
file_id = osutils.safe_file_id(file_id) |
1185.12.39
by abentley
Propogated has_or_had_id to Tree |
570 |
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. |
571 |
if not inv.has_id(file_id): |
453
by Martin Pool
- Split WorkingTree into its own file |
572 |
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. |
573 |
path = inv.id2path(file_id) |
1836.1.22
by John Arbash Meinel
[merge] bzr.dev 1861 |
574 |
return osutils.lexists(self.abspath(path)) |
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
575 |
|
1185.12.39
by abentley
Propogated has_or_had_id to Tree |
576 |
def has_or_had_id(self, file_id): |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
577 |
file_id = osutils.safe_file_id(file_id) |
1185.12.39
by abentley
Propogated has_or_had_id to Tree |
578 |
if file_id == self.inventory.root.file_id: |
579 |
return True |
|
580 |
return self.inventory.has_id(file_id) |
|
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
581 |
|
582 |
__contains__ = has_id |
|
583 |
||
453
by Martin Pool
- Split WorkingTree into its own file |
584 |
def get_file_size(self, file_id): |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
585 |
file_id = osutils.safe_file_id(file_id) |
1248
by Martin Pool
- new weave based cleanup [broken] |
586 |
return os.path.getsize(self.id2abspath(file_id)) |
453
by Martin Pool
- Split WorkingTree into its own file |
587 |
|
1185.60.6
by Aaron Bentley
Fixed hashcache |
588 |
@needs_read_lock
|
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
589 |
def get_file_sha1(self, file_id, path=None, stat_value=None): |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
590 |
file_id = osutils.safe_file_id(file_id) |
1732.1.19
by John Arbash Meinel
If you have the path, use it rather than looking it up again |
591 |
if not path: |
592 |
path = self._inventory.id2path(file_id) |
|
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
593 |
return self._hashcache.get_sha1(path, stat_value) |
453
by Martin Pool
- Split WorkingTree into its own file |
594 |
|
1740.2.5
by Aaron Bentley
Merge from bzr.dev |
595 |
def get_file_mtime(self, file_id, path=None): |
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
596 |
file_id = osutils.safe_file_id(file_id) |
1740.2.5
by Aaron Bentley
Merge from bzr.dev |
597 |
if not path: |
598 |
path = self._inventory.id2path(file_id) |
|
599 |
return os.lstat(self.abspath(path)).st_mtime |
|
600 |
||
1732.1.19
by John Arbash Meinel
If you have the path, use it rather than looking it up again |
601 |
if not supports_executable(): |
602 |
def is_executable(self, file_id, path=None): |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
603 |
file_id = osutils.safe_file_id(file_id) |
1398
by Robert Collins
integrate in Gustavos x-bit patch |
604 |
return self._inventory[file_id].executable |
1732.1.19
by John Arbash Meinel
If you have the path, use it rather than looking it up again |
605 |
else: |
606 |
def is_executable(self, file_id, path=None): |
|
607 |
if not path: |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
608 |
file_id = osutils.safe_file_id(file_id) |
1732.1.19
by John Arbash Meinel
If you have the path, use it rather than looking it up again |
609 |
path = self._inventory.id2path(file_id) |
1398
by Robert Collins
integrate in Gustavos x-bit patch |
610 |
mode = os.lstat(self.abspath(path)).st_mode |
1733.1.4
by Robert Collins
Cosmetic niceties for debugging, extra comments etc. |
611 |
return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode) |
1398
by Robert Collins
integrate in Gustavos x-bit patch |
612 |
|
1457.1.16
by Robert Collins
Move set_pending_merges to WorkingTree. |
613 |
@needs_write_lock
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
614 |
def _add(self, files, ids, kinds): |
615 |
"""See MutableTree._add.""" |
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
616 |
# TODO: Re-adding a file that is removed in the working copy
|
617 |
# should probably put it back with the previous ID.
|
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
618 |
# the read and write working inventory should not occur in this
|
619 |
# function - they should be part of lock_write and unlock.
|
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
620 |
inv = self.read_working_inventory() |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
621 |
for f, file_id, kind in zip(files, ids, kinds): |
622 |
assert kind is not None |
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
623 |
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'. |
624 |
inv.add_path(f, kind=kind) |
625 |
else: |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
626 |
file_id = osutils.safe_file_id(file_id) |
1713.1.6
by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'. |
627 |
inv.add_path(f, kind=kind, file_id=file_id) |
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
628 |
self._write_inventory(inv) |
629 |
||
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
630 |
@needs_tree_write_lock
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
631 |
def _gather_kinds(self, files, kinds): |
632 |
"""See MutableTree._gather_kinds.""" |
|
633 |
for pos, f in enumerate(files): |
|
634 |
if kinds[pos] is None: |
|
635 |
fullpath = normpath(self.abspath(f)) |
|
636 |
try: |
|
637 |
kinds[pos] = file_kind(fullpath) |
|
638 |
except OSError, e: |
|
639 |
if e.errno == errno.ENOENT: |
|
2206.1.7
by Marius Kruger
* errors |
640 |
raise errors.NoSuchFile(fullpath) |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
641 |
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
642 |
@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. |
643 |
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. |
644 |
"""Add revision_id as a parent. |
645 |
||
646 |
This is equivalent to retrieving the current list of parent ids
|
|
647 |
and setting the list to its value plus revision_id.
|
|
648 |
||
649 |
: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. |
650 |
be a ghost revision as long as its not the first parent to be added,
|
651 |
or the allow_leftmost_as_ghost parameter is set True.
|
|
652 |
: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. |
653 |
"""
|
1908.5.13
by Robert Collins
Adding a parent when the first is a ghost already should not require forcing it. |
654 |
parents = self.get_parent_ids() + [revision_id] |
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
655 |
self.set_parent_ids(parents, allow_leftmost_as_ghost=len(parents) > 1 |
2206.1.7
by Marius Kruger
* errors |
656 |
or allow_leftmost_as_ghost) |
1908.5.4
by Robert Collins
Add add_parent_tree_id WorkingTree helper api. |
657 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
658 |
@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. |
659 |
def add_parent_tree(self, parent_tuple, allow_leftmost_as_ghost=False): |
1908.5.6
by Robert Collins
Add add_parent_tree to WorkingTree. |
660 |
"""Add revision_id, tree tuple as a parent. |
661 |
||
662 |
This is equivalent to retrieving the current list of parent trees
|
|
663 |
and setting the list to its value plus parent_tuple. See also
|
|
664 |
add_parent_tree_id - if you only have a parent id available it will be
|
|
665 |
simpler to use that api. If you have the parent already available, using
|
|
666 |
this api is preferred.
|
|
667 |
||
1908.5.12
by Robert Collins
Apply review feedback - paired with Martin. |
668 |
:param parent_tuple: The (revision id, tree) to add to the parent list.
|
669 |
If the revision_id is a ghost, pass None for the tree.
|
|
670 |
: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. |
671 |
"""
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
672 |
parent_ids = self.get_parent_ids() + [parent_tuple[0]] |
673 |
if len(parent_ids) > 1: |
|
674 |
# the leftmost may have already been a ghost, preserve that if it
|
|
675 |
# was.
|
|
676 |
allow_leftmost_as_ghost = True |
|
677 |
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. |
678 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
1908.5.6
by Robert Collins
Add add_parent_tree to WorkingTree. |
679 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
680 |
@needs_tree_write_lock
|
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
681 |
def add_pending_merge(self, *revision_ids): |
682 |
# TODO: Perhaps should check at this point that the
|
|
683 |
# 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. |
684 |
parents = self.get_parent_ids() |
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
685 |
updated = False |
686 |
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. |
687 |
if rev_id in parents: |
688 |
continue
|
|
689 |
parents.append(rev_id) |
|
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
690 |
updated = True |
691 |
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. |
692 |
self.set_parent_ids(parents, allow_leftmost_as_ghost=True) |
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
693 |
|
1908.7.7
by Robert Collins
Deprecated WorkingTree.pending_merges. |
694 |
@deprecated_method(zero_eleven) |
1185.69.2
by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch |
695 |
@needs_read_lock
|
1457.1.14
by Robert Collins
Move pending_merges() to WorkingTree. |
696 |
def pending_merges(self): |
697 |
"""Return a list of pending merges. |
|
698 |
||
699 |
These are revisions that have been merged into the working
|
|
700 |
directory but not yet committed.
|
|
1908.7.9
by Robert Collins
WorkingTree.last_revision and WorkingTree.pending_merges are deprecated. |
701 |
|
702 |
As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
|
|
703 |
instead - which is available on all tree objects.
|
|
1457.1.14
by Robert Collins
Move pending_merges() to WorkingTree. |
704 |
"""
|
1908.6.10
by Robert Collins
forward to get_parent_ids in pending_merges. |
705 |
return self.get_parent_ids()[1:] |
1457.1.14
by Robert Collins
Move pending_merges() to WorkingTree. |
706 |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
707 |
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost): |
708 |
"""Common ghost checking functionality from set_parent_*. |
|
709 |
||
710 |
This checks that the left hand-parent exists if there are any
|
|
711 |
revisions present.
|
|
712 |
"""
|
|
713 |
if len(revision_ids) > 0: |
|
714 |
leftmost_id = revision_ids[0] |
|
715 |
if (not allow_leftmost_as_ghost and not |
|
716 |
self.branch.repository.has_revision(leftmost_id)): |
|
717 |
raise errors.GhostRevisionUnusableHere(leftmost_id) |
|
718 |
||
719 |
def _set_merges_from_parent_ids(self, parent_ids): |
|
720 |
merges = parent_ids[1:] |
|
2294.1.2
by John Arbash Meinel
Track down and add tests that all tree.commit() can handle |
721 |
self._control_files.put_bytes('pending-merges', '\n'.join(merges)) |
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
722 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
723 |
@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. |
724 |
def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False): |
1908.5.5
by Robert Collins
Add WorkingTree.set_parent_ids. |
725 |
"""Set the parent ids to revision_ids. |
726 |
|
|
727 |
See also set_parent_trees. This api will try to retrieve the tree data
|
|
728 |
for each element of revision_ids from the trees repository. If you have
|
|
729 |
tree data already available, it is more efficient to use
|
|
730 |
set_parent_trees rather than set_parent_ids. set_parent_ids is however
|
|
731 |
an easier API to use.
|
|
732 |
||
733 |
:param revision_ids: The revision_ids to set as the parent ids of this
|
|
734 |
working tree. Any of these may be ghosts.
|
|
735 |
"""
|
|
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
736 |
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids] |
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
737 |
self._check_parents_for_ghosts(revision_ids, |
738 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
|
739 |
||
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
740 |
if len(revision_ids) > 0: |
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
741 |
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. |
742 |
else: |
743 |
self.set_last_revision(None) |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
744 |
|
745 |
self._set_merges_from_parent_ids(revision_ids) |
|
1908.5.5
by Robert Collins
Add WorkingTree.set_parent_ids. |
746 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
747 |
@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. |
748 |
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 |
749 |
"""See MutableTree.set_parent_trees.""" |
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
750 |
parent_ids = [osutils.safe_revision_id(rev) for (rev, tree) in parents_list] |
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
751 |
|
752 |
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. |
753 |
allow_leftmost_as_ghost=allow_leftmost_as_ghost) |
1908.5.2
by Robert Collins
Create and test set_parent_trees. |
754 |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
755 |
if len(parent_ids) == 0: |
2041.1.3
by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision |
756 |
leftmost_parent_id = None |
757 |
leftmost_parent_tree = None |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
758 |
else: |
759 |
leftmost_parent_id, leftmost_parent_tree = parents_list[0] |
|
760 |
||
2041.1.3
by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision |
761 |
if self._change_last_revision(leftmost_parent_id): |
762 |
if leftmost_parent_tree is None: |
|
2041.1.4
by John Arbash Meinel
NEWS and documentation |
763 |
# If we don't have a tree, fall back to reading the
|
764 |
# parent tree from the repository.
|
|
2041.1.3
by John Arbash Meinel
Call _cache_basis_inventory directly rather than set_last_revision |
765 |
self._cache_basis_inventory(leftmost_parent_id) |
766 |
else: |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
767 |
inv = leftmost_parent_tree.inventory |
768 |
xml = self._create_basis_xml_from_inventory( |
|
769 |
leftmost_parent_id, inv) |
|
770 |
self._write_basis_inventory(xml) |
|
771 |
self._set_merges_from_parent_ids(parent_ids) |
|
772 |
||
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
773 |
@needs_tree_write_lock
|
1457.1.16
by Robert Collins
Move set_pending_merges to WorkingTree. |
774 |
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. |
775 |
parents = self.get_parent_ids() |
776 |
leftmost = parents[:1] |
|
777 |
new_parents = leftmost + rev_list |
|
778 |
self.set_parent_ids(new_parents) |
|
1457.1.16
by Robert Collins
Move set_pending_merges to WorkingTree. |
779 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
780 |
@needs_tree_write_lock
|
1534.7.192
by Aaron Bentley
Record hashes produced by merges |
781 |
def set_merge_modified(self, modified_hashes): |
1534.10.3
by Aaron Bentley
Simplify set_merge_modified with rio_file |
782 |
def iter_stanzas(): |
783 |
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 |
784 |
yield Stanza(file_id=file_id.decode('utf8'), hash=hash) |
1534.10.3
by Aaron Bentley
Simplify set_merge_modified with rio_file |
785 |
self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1) |
786 |
||
787 |
def _put_rio(self, filename, stanzas, header): |
|
2298.1.1
by Martin Pool
Add test for merge_modified |
788 |
self._must_be_locked() |
1534.10.3
by Aaron Bentley
Simplify set_merge_modified with rio_file |
789 |
my_file = rio_file(stanzas, header) |
790 |
self._control_files.put(filename, my_file) |
|
1534.7.192
by Aaron Bentley
Record hashes produced by merges |
791 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
792 |
@needs_write_lock # because merge pulls data into the branch. |
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
793 |
def merge_from_branch(self, branch, to_revision=None): |
794 |
"""Merge from a branch into this working tree. |
|
795 |
||
796 |
:param branch: The branch to merge from.
|
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
797 |
:param to_revision: If non-None, the merge will merge to to_revision,
|
798 |
but not beyond it. to_revision does not need to be in the history
|
|
2206.1.7
by Marius Kruger
* errors |
799 |
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. |
800 |
branch.last_revision().
|
801 |
"""
|
|
802 |
from bzrlib.merge import Merger, Merge3Merger |
|
803 |
pb = bzrlib.ui.ui_factory.nested_progress_bar() |
|
804 |
try: |
|
805 |
merger = Merger(self.branch, this_tree=self, pb=pb) |
|
806 |
merger.pp = ProgressPhase("Merge phase", 5, pb) |
|
807 |
merger.pp.next_phase() |
|
808 |
# check that there are no
|
|
809 |
# local alterations
|
|
810 |
merger.check_basis(check_clean=True, require_commits=False) |
|
811 |
if to_revision is None: |
|
812 |
to_revision = branch.last_revision() |
|
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
813 |
else: |
814 |
to_revision = osutils.safe_revision_id(to_revision) |
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
815 |
merger.other_rev_id = to_revision |
816 |
if merger.other_rev_id is None: |
|
817 |
raise error.NoCommits(branch) |
|
818 |
self.branch.fetch(branch, last_revision=merger.other_rev_id) |
|
819 |
merger.other_basis = merger.other_rev_id |
|
820 |
merger.other_tree = self.branch.repository.revision_tree( |
|
821 |
merger.other_rev_id) |
|
822 |
merger.pp.next_phase() |
|
823 |
merger.find_base() |
|
824 |
if merger.base_rev_id == merger.other_rev_id: |
|
825 |
raise errors.PointlessMerge |
|
826 |
merger.backup_files = False |
|
827 |
merger.merge_type = Merge3Merger |
|
828 |
merger.set_interesting_files(None) |
|
829 |
merger.show_base = False |
|
830 |
merger.reprocess = False |
|
831 |
conflicts = merger.do_merge() |
|
832 |
merger.set_pending() |
|
833 |
finally: |
|
834 |
pb.finished() |
|
835 |
return conflicts |
|
836 |
||
1534.7.192
by Aaron Bentley
Record hashes produced by merges |
837 |
@needs_read_lock
|
838 |
def merge_modified(self): |
|
2298.1.1
by Martin Pool
Add test for merge_modified |
839 |
"""Return a dictionary of files modified by a merge. |
840 |
||
841 |
The list is initialized by WorkingTree.set_merge_modified, which is
|
|
842 |
typically called after we make some automatic updates to the tree
|
|
843 |
because of a merge.
|
|
844 |
||
845 |
This returns a map of file_id->sha1, containing only files which are
|
|
846 |
still in the working inventory and have that text hash.
|
|
847 |
"""
|
|
1534.7.192
by Aaron Bentley
Record hashes produced by merges |
848 |
try: |
849 |
hashfile = self._control_files.get('merge-hashes') |
|
2206.1.7
by Marius Kruger
* errors |
850 |
except errors.NoSuchFile: |
1534.7.192
by Aaron Bentley
Record hashes produced by merges |
851 |
return {} |
1534.7.196
by Aaron Bentley
Switched to Rio format for merge-modified list |
852 |
merge_hashes = {} |
853 |
try: |
|
854 |
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n': |
|
2206.1.7
by Marius Kruger
* errors |
855 |
raise errors.MergeModifiedFormatError() |
1534.7.196
by Aaron Bentley
Switched to Rio format for merge-modified list |
856 |
except StopIteration: |
2206.1.7
by Marius Kruger
* errors |
857 |
raise errors.MergeModifiedFormatError() |
1534.7.196
by Aaron Bentley
Switched to Rio format for merge-modified list |
858 |
for s in RioReader(hashfile): |
1534.7.198
by Aaron Bentley
Removed spurious encode/decode |
859 |
file_id = s.get("file_id") |
1558.12.10
by Aaron Bentley
Be robust when merge_hash file_id not in inventory |
860 |
if file_id not in self.inventory: |
861 |
continue
|
|
2298.1.1
by Martin Pool
Add test for merge_modified |
862 |
text_hash = s.get("hash") |
863 |
if text_hash == self.get_file_sha1(file_id): |
|
864 |
merge_hashes[file_id] = text_hash |
|
1534.7.196
by Aaron Bentley
Switched to Rio format for merge-modified list |
865 |
return merge_hashes |
1534.7.192
by Aaron Bentley
Record hashes produced by merges |
866 |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
867 |
@needs_write_lock
|
868 |
def mkdir(self, path, file_id=None): |
|
869 |
"""See MutableTree.mkdir().""" |
|
870 |
if file_id is None: |
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
871 |
file_id = generate_ids.gen_file_id(os.path.basename(path)) |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
872 |
os.mkdir(self.abspath(path)) |
873 |
self.add(path, file_id, 'directory') |
|
874 |
return file_id |
|
875 |
||
1092.2.6
by Robert Collins
symlink support updated to work |
876 |
def get_symlink_target(self, file_id): |
1185.15.10
by Scott James Remnant
Fix WorkingTree.get_symlink_target() to read the absolute path of the |
877 |
return os.readlink(self.id2abspath(file_id)) |
453
by Martin Pool
- Split WorkingTree into its own file |
878 |
|
879 |
def file_class(self, filename): |
|
880 |
if self.path2id(filename): |
|
881 |
return 'V' |
|
882 |
elif self.is_ignored(filename): |
|
883 |
return 'I' |
|
884 |
else: |
|
885 |
return '?' |
|
886 |
||
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
887 |
def flush(self): |
888 |
"""Write the in memory inventory to disk.""" |
|
889 |
# TODO: Maybe this should only write on dirty ?
|
|
890 |
if self._control_files._lock_mode != 'w': |
|
891 |
raise errors.NotWriteLocked(self) |
|
892 |
sio = StringIO() |
|
1986.5.6
by Robert Collins
Merge bzr.dev. |
893 |
xml5.serializer_v5.write_inventory(self._inventory, sio) |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
894 |
sio.seek(0) |
895 |
self._control_files.put('inventory', sio) |
|
896 |
self._inventory_is_modified = False |
|
897 |
||
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
898 |
def list_files(self, include_root=False): |
1732.1.6
by John Arbash Meinel
Fix documentation bug in workingtree.list_files |
899 |
"""Recursively list all files as (path, class, kind, id, entry). |
453
by Martin Pool
- Split WorkingTree into its own file |
900 |
|
901 |
Lists, but does not descend into unversioned directories.
|
|
902 |
||
903 |
This does not include files that have been deleted in this
|
|
904 |
tree.
|
|
905 |
||
906 |
Skips the control directory.
|
|
907 |
"""
|
|
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. |
908 |
inv = self._inventory |
1910.2.56
by Aaron Bentley
More work on bundles |
909 |
if include_root is True: |
910 |
yield ('', 'V', 'directory', inv.root.file_id, inv.root) |
|
1732.1.9
by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files |
911 |
# Convert these into local objects to save lookup times
|
1836.1.22
by John Arbash Meinel
[merge] bzr.dev 1861 |
912 |
pathjoin = osutils.pathjoin |
913 |
file_kind = osutils.file_kind |
|
1732.1.9
by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files |
914 |
|
915 |
# transport.base ends in a slash, we want the piece
|
|
916 |
# between the last two slashes
|
|
917 |
transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1] |
|
918 |
||
1732.1.11
by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down |
919 |
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink} |
920 |
||
1732.1.9
by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files |
921 |
# directory file_id, relative path, absolute path, reverse sorted children
|
922 |
children = os.listdir(self.basedir) |
|
923 |
children.sort() |
|
1732.1.14
by John Arbash Meinel
Some speedups by not calling pathjoin() |
924 |
# jam 20060527 The kernel sized tree seems equivalent whether we
|
925 |
# use a deque and popleft to keep them sorted, or if we use a plain
|
|
926 |
# 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. |
927 |
children = collections.deque(children) |
1732.1.21
by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement |
928 |
stack = [(inv.root.file_id, u'', self.basedir, children)] |
1732.1.9
by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files |
929 |
while stack: |
1732.1.13
by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children. |
930 |
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 |
931 |
|
932 |
while children: |
|
1732.1.13
by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children. |
933 |
f = children.popleft() |
453
by Martin Pool
- Split WorkingTree into its own file |
934 |
## TODO: If we find a subdirectory with its own .bzr
|
935 |
## directory, then that is a separate tree and we
|
|
936 |
## should exclude it.
|
|
1534.5.5
by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test. |
937 |
|
938 |
# the bzrdir for this tree
|
|
1732.1.9
by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files |
939 |
if transport_base_dir == f: |
453
by Martin Pool
- Split WorkingTree into its own file |
940 |
continue
|
941 |
||
1732.1.14
by John Arbash Meinel
Some speedups by not calling pathjoin() |
942 |
# we know that from_dir_relpath and from_dir_abspath never end in a slash
|
943 |
# 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 |
944 |
# than the checks of pathjoin(), all relative paths will have an extra slash
|
945 |
# at the beginning
|
|
1732.1.14
by John Arbash Meinel
Some speedups by not calling pathjoin() |
946 |
fp = from_dir_relpath + '/' + f |
453
by Martin Pool
- Split WorkingTree into its own file |
947 |
|
948 |
# absolute path
|
|
1732.1.14
by John Arbash Meinel
Some speedups by not calling pathjoin() |
949 |
fap = from_dir_abspath + '/' + f |
453
by Martin Pool
- Split WorkingTree into its own file |
950 |
|
951 |
f_ie = inv.get_child(from_dir_id, f) |
|
952 |
if f_ie: |
|
953 |
c = 'V' |
|
1551.6.36
by Aaron Bentley
Revert --debris/--detritus changes |
954 |
elif self.is_ignored(fp[1:]): |
955 |
c = 'I' |
|
453
by Martin Pool
- Split WorkingTree into its own file |
956 |
else: |
1830.3.3
by John Arbash Meinel
inside workingtree check for normalized filename access |
957 |
# we may not have found this file, because of a unicode issue
|
958 |
f_norm, can_access = osutils.normalized_filename(f) |
|
959 |
if f == f_norm or not can_access: |
|
960 |
# No change, so treat this file normally
|
|
961 |
c = '?' |
|
962 |
else: |
|
963 |
# this file can be accessed by a normalized path
|
|
964 |
# check again if it is versioned
|
|
965 |
# these lines are repeated here for performance
|
|
966 |
f = f_norm |
|
967 |
fp = from_dir_relpath + '/' + f |
|
968 |
fap = from_dir_abspath + '/' + f |
|
969 |
f_ie = inv.get_child(from_dir_id, f) |
|
970 |
if f_ie: |
|
971 |
c = 'V' |
|
972 |
elif self.is_ignored(fp[1:]): |
|
973 |
c = 'I' |
|
974 |
else: |
|
975 |
c = '?' |
|
453
by Martin Pool
- Split WorkingTree into its own file |
976 |
|
977 |
fk = file_kind(fap) |
|
978 |
||
979 |
if f_ie: |
|
980 |
if f_ie.kind != fk: |
|
2206.1.7
by Marius Kruger
* errors |
981 |
raise errors.BzrCheckError( |
982 |
"file %r entered as kind %r id %r, now of kind %r" |
|
983 |
% (fap, f_ie.kind, f_ie.file_id, fk)) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
984 |
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
985 |
# make a last minute entry
|
986 |
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 |
987 |
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 |
988 |
else: |
1732.1.11
by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down |
989 |
try: |
1732.1.21
by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement |
990 |
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 |
991 |
except KeyError: |
1732.1.21
by John Arbash Meinel
We don't need to strip off 2 characters, just do one, minor memory improvement |
992 |
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. |
993 |
continue
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
994 |
|
453
by Martin Pool
- Split WorkingTree into its own file |
995 |
if fk != 'directory': |
996 |
continue
|
|
997 |
||
1732.1.9
by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files |
998 |
# But do this child first
|
1732.1.13
by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children. |
999 |
new_children = os.listdir(fap) |
1000 |
new_children.sort() |
|
1001 |
new_children = collections.deque(new_children) |
|
1002 |
stack.append((f_ie.file_id, fp, fap, new_children)) |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1003 |
# Break out of inner loop,
|
2206.1.7
by Marius Kruger
* errors |
1004 |
# so that we start outer loop with child
|
1732.1.9
by John Arbash Meinel
Non-recursive implementation of WorkingTree.list_files |
1005 |
break
|
1732.1.22
by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory |
1006 |
else: |
1007 |
# 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. |
1008 |
stack.pop() |
1732.1.13
by John Arbash Meinel
A large improvement from not popping the parent off until we have done all children. |
1009 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1010 |
@needs_tree_write_lock
|
2123.3.8
by Steffen Eichenberg
new parameter to_dir must be a named parameter |
1011 |
def move(self, from_paths, to_dir=None, after=False, **kwargs): |
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1012 |
"""Rename files. |
1013 |
||
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1014 |
to_dir must exist in the inventory.
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1015 |
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1016 |
If to_dir exists and is a directory, the files are moved into
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1017 |
it, keeping their old names.
|
1018 |
||
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1019 |
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. |
1020 |
this doesn't change the directory.
|
1021 |
||
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1022 |
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 |
1023 |
independently.
|
1024 |
||
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1025 |
The first mode moves the file in the filesystem and updates the
|
1026 |
inventory. The second mode only updates the inventory without
|
|
1027 |
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 |
1028 |
in version 0.15.
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1029 |
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1030 |
move uses the second mode if 'after == True' and the target is not
|
1031 |
versioned but present in the working tree.
|
|
1032 |
||
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1033 |
move uses the second mode if 'after == False' and the source is
|
1034 |
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 |
1035 |
versioned but present in the working tree.
|
1036 |
||
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1037 |
move uses the first mode if 'after == False' and the source is
|
1038 |
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 |
1039 |
versioned and not present in the working tree.
|
1040 |
||
1041 |
Everything else results in an error.
|
|
1042 |
||
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1043 |
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 |
1044 |
entry that is moved.
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1045 |
"""
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1046 |
rename_entries = [] |
1047 |
rename_tuples = [] |
|
1048 |
||
1049 |
# check for deprecated use of signature
|
|
1050 |
if to_dir is None: |
|
1051 |
to_dir = kwargs.get('to_name', None) |
|
1052 |
if to_dir is None: |
|
1053 |
raise TypeError('You must supply a target directory') |
|
1054 |
else: |
|
1055 |
symbol_versioning.warn('The parameter to_name was deprecated' |
|
1056 |
' in version 0.13. Use to_dir instead', |
|
1057 |
DeprecationWarning) |
|
1058 |
||
1059 |
# check destination directory
|
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1060 |
assert not isinstance(from_paths, basestring) |
1061 |
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 |
1062 |
to_abs = self.abspath(to_dir) |
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1063 |
if not isdir(to_abs): |
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1064 |
raise errors.BzrMoveFailedError('',to_dir, |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1065 |
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 |
1066 |
if not self.has_filename(to_dir): |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1067 |
raise errors.BzrMoveFailedError('',to_dir, |
1068 |
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 |
1069 |
to_dir_id = inv.path2id(to_dir) |
2123.3.6
by Steffen Eichenberg
unified error messages |
1070 |
if to_dir_id is None: |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1071 |
raise errors.BzrMoveFailedError('',to_dir, |
1072 |
errors.NotVersionedError(path=str(to_dir))) |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1073 |
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1074 |
to_dir_ie = inv[to_dir_id] |
1731.1.2
by Aaron Bentley
Removed all remaining uses of root_directory |
1075 |
if to_dir_ie.kind != 'directory': |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1076 |
raise errors.BzrMoveFailedError('',to_dir, |
1077 |
errors.NotADirectory(to_abs)) |
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1078 |
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1079 |
# create rename entries and tuples
|
1080 |
for from_rel in from_paths: |
|
1081 |
from_tail = splitpath(from_rel)[-1] |
|
1082 |
from_id = inv.path2id(from_rel) |
|
1083 |
if from_id is None: |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1084 |
raise errors.BzrMoveFailedError(from_rel,to_dir, |
1085 |
errors.NotVersionedError(path=str(from_rel))) |
|
2206.1.4
by Marius Kruger
Improved WorkingTree.move excptions. (as requested) |
1086 |
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1087 |
from_entry = inv[from_id] |
1088 |
from_parent_id = from_entry.parent_id |
|
1089 |
to_rel = pathjoin(to_dir, from_tail) |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1090 |
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel, |
2123.3.2
by Steffen Eichenberg
fixed the most obvious bugs |
1091 |
from_id=from_id, |
1092 |
from_tail=from_tail, |
|
1093 |
from_parent_id=from_parent_id, |
|
1094 |
to_rel=to_rel, to_tail=from_tail, |
|
1095 |
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 |
1096 |
rename_entries.append(rename_entry) |
1097 |
rename_tuples.append((from_rel, to_rel)) |
|
1098 |
||
1099 |
# determine which move mode to use. checks also for movability
|
|
1100 |
rename_entries = self._determine_mv_mode(rename_entries, after) |
|
1101 |
||
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1102 |
original_modified = self._inventory_is_modified |
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1103 |
try: |
2220.1.6
by Marius Kruger
* change error message telling user about --after option sightly |
1104 |
if len(from_paths): |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1105 |
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 |
1106 |
self._move(rename_entries) |
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1107 |
except: |
1108 |
# 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 |
1109 |
self._inventory_is_modified = original_modified |
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1110 |
raise
|
1111 |
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 |
1112 |
return rename_tuples |
1113 |
||
1114 |
def _determine_mv_mode(self, rename_entries, after=False): |
|
1115 |
"""Determines for each from-to pair if both inventory and working tree |
|
1116 |
or only the inventory has to be changed.
|
|
1117 |
||
1118 |
Also does basic plausability tests.
|
|
1119 |
"""
|
|
1120 |
inv = self.inventory |
|
1121 |
||
1122 |
for rename_entry in rename_entries: |
|
1123 |
# store to local variables for easier reference
|
|
1124 |
from_rel = rename_entry.from_rel |
|
1125 |
from_id = rename_entry.from_id |
|
1126 |
to_rel = rename_entry.to_rel |
|
1127 |
to_id = inv.path2id(to_rel) |
|
1128 |
only_change_inv = False |
|
1129 |
||
1130 |
# check the inventory for source and destination
|
|
1131 |
if from_id is None: |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1132 |
raise errors.BzrMoveFailedError(from_rel,to_rel, |
1133 |
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 |
1134 |
if to_id is not None: |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1135 |
raise errors.BzrMoveFailedError(from_rel,to_rel, |
1136 |
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 |
1137 |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1138 |
# 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 |
1139 |
# inv and file system)
|
1140 |
if after: |
|
1141 |
if not self.has_filename(to_rel): |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1142 |
raise errors.BzrMoveFailedError(from_id,to_rel, |
1143 |
errors.NoSuchFile(path=str(to_rel), |
|
1144 |
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 |
1145 |
only_change_inv = True |
1146 |
elif not self.has_filename(from_rel) and self.has_filename(to_rel): |
|
1147 |
only_change_inv = True |
|
1148 |
elif self.has_filename(from_rel) and not self.has_filename(to_rel): |
|
1149 |
only_change_inv = False |
|
1150 |
else: |
|
1151 |
# something is wrong, so lets determine what exactly
|
|
1152 |
if not self.has_filename(from_rel) and \ |
|
1153 |
not self.has_filename(to_rel): |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1154 |
raise errors.BzrRenameFailedError(from_rel,to_rel, |
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1155 |
errors.PathsDoNotExist(paths=(str(from_rel), |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1156 |
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 |
1157 |
else: |
2220.1.11
by Marius Kruger
* bzrlib/errors.py |
1158 |
raise errors.RenameFailedFilesExist(from_rel, to_rel, |
1159 |
extra="(Use --after to update the Bazaar id)") |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1160 |
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 |
1161 |
return rename_entries |
1162 |
||
1163 |
def _move(self, rename_entries): |
|
1164 |
"""Moves a list of files. |
|
1165 |
||
1166 |
Depending on the value of the flag 'only_change_inv', the
|
|
1167 |
file will be moved on the file system or not.
|
|
1168 |
"""
|
|
1169 |
inv = self.inventory |
|
1170 |
moved = [] |
|
1171 |
||
1172 |
for entry in rename_entries: |
|
1173 |
try: |
|
1174 |
self._move_entry(entry) |
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1175 |
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 |
1176 |
self._rollback_move(moved) |
1177 |
raise
|
|
1178 |
moved.append(entry) |
|
1179 |
||
1180 |
def _rollback_move(self, moved): |
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1181 |
"""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 |
1182 |
inv = self.inventory |
1183 |
for entry in moved: |
|
1184 |
try: |
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1185 |
self._move_entry(_RenameEntry(entry.to_rel, entry.from_id, |
1186 |
entry.to_tail, entry.to_parent_id, entry.from_rel, |
|
1187 |
entry.from_tail, entry.from_parent_id, |
|
1188 |
entry.only_change_inv)) |
|
2220.1.14
by Aaron Bentley
Cleanup formatting and error handling |
1189 |
except errors.BzrMoveFailedError, e: |
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1190 |
raise errors.BzrMoveFailedError( '', '', "Rollback failed." |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1191 |
" The working tree is in an inconsistent state."
|
1192 |
" Please consider doing a 'bzr revert'."
|
|
2220.1.14
by Aaron Bentley
Cleanup formatting and error handling |
1193 |
" 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 |
1194 |
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1195 |
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 |
1196 |
inv = self.inventory |
1197 |
from_rel_abs = self.abspath(entry.from_rel) |
|
1198 |
to_rel_abs = self.abspath(entry.to_rel) |
|
1199 |
if from_rel_abs == to_rel_abs: |
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1200 |
raise errors.BzrMoveFailedError(entry.from_rel, entry.to_rel, |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1201 |
"Source and target are identical.") |
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1202 |
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1203 |
if not entry.only_change_inv: |
1204 |
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 |
1205 |
osutils.rename(from_rel_abs, to_rel_abs) |
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1206 |
except OSError, e: |
1207 |
raise errors.BzrMoveFailedError(entry.from_rel, |
|
1208 |
entry.to_rel, e[1]) |
|
1209 |
inv.rename(entry.from_id, entry.to_parent_id, entry.to_tail) |
|
1508.1.8
by Robert Collins
move move() from Branch to WorkingTree. |
1210 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1211 |
@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 |
1212 |
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). |
1213 |
"""Rename one file. |
1214 |
||
1215 |
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 |
1216 |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1217 |
rename_one has several 'modes' to work. First, it can rename a physical
|
1218 |
file and change the file_id. That is the normal mode. Second, it can
|
|
1219 |
only change the file_id without touching any physical file. This is
|
|
1220 |
the new mode introduced in version 0.15.
|
|
1221 |
||
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1222 |
rename_one uses the second mode if 'after == True' and 'to_rel' is not
|
1223 |
versioned but present in the working tree.
|
|
1224 |
||
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1225 |
rename_one uses the second mode if 'after == False' and 'from_rel' is
|
1226 |
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 |
1227 |
versioned but present in the working tree.
|
1228 |
||
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1229 |
rename_one uses the first mode if 'after == False' and 'from_rel' is
|
1230 |
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 |
1231 |
versioned and not present in the working tree.
|
1232 |
||
1233 |
Everything else results in an error.
|
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
1234 |
"""
|
1235 |
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 |
1236 |
rename_entries = [] |
1237 |
||
1238 |
# create rename entries and tuples
|
|
1239 |
from_tail = splitpath(from_rel)[-1] |
|
1240 |
from_id = inv.path2id(from_rel) |
|
1241 |
if from_id is None: |
|
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1242 |
raise errors.BzrRenameFailedError(from_rel,to_rel, |
1243 |
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 |
1244 |
from_entry = inv[from_id] |
1245 |
from_parent_id = from_entry.parent_id |
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
1246 |
to_dir, to_tail = os.path.split(to_rel) |
1247 |
to_dir_id = inv.path2id(to_dir) |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1248 |
rename_entry = WorkingTree._RenameEntry(from_rel=from_rel, |
2123.3.2
by Steffen Eichenberg
fixed the most obvious bugs |
1249 |
from_id=from_id, |
1250 |
from_tail=from_tail, |
|
1251 |
from_parent_id=from_parent_id, |
|
1252 |
to_rel=to_rel, to_tail=to_tail, |
|
1253 |
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 |
1254 |
rename_entries.append(rename_entry) |
1255 |
||
1256 |
# determine which move mode to use. checks also for movability
|
|
1257 |
rename_entries = self._determine_mv_mode(rename_entries, after) |
|
1258 |
||
1259 |
# check if the target changed directory and if the target directory is
|
|
1260 |
# versioned
|
|
2123.3.6
by Steffen Eichenberg
unified error messages |
1261 |
if to_dir_id is None: |
2206.1.9
by Marius Kruger
* Change move/rename errors yet again |
1262 |
raise errors.BzrMoveFailedError(from_rel,to_rel, |
1263 |
errors.NotVersionedError(path=str(to_dir))) |
|
2220.1.9
by Marius Kruger
Remove all trailing white space this bundle would have |
1264 |
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1265 |
# all checks done. now we can continue with our actual work
|
1266 |
mutter('rename_one:\n' |
|
1267 |
' from_id {%s}\n' |
|
1268 |
' from_rel: %r\n' |
|
1269 |
' to_rel: %r\n' |
|
1270 |
' to_dir %r\n' |
|
1271 |
' to_dir_id {%s}\n', |
|
1272 |
from_id, from_rel, to_rel, to_dir, to_dir_id) |
|
1273 |
||
1274 |
self._move(rename_entries) |
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
1275 |
self._write_inventory(inv) |
1276 |
||
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
1277 |
class _RenameEntry(object): |
2123.3.2
by Steffen Eichenberg
fixed the most obvious bugs |
1278 |
def __init__(self, from_rel, from_id, from_tail, from_parent_id, |
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1279 |
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 |
1280 |
self.from_rel = from_rel |
1281 |
self.from_id = from_id |
|
1282 |
self.from_tail = from_tail |
|
1283 |
self.from_parent_id = from_parent_id |
|
1284 |
self.to_rel = to_rel |
|
1285 |
self.to_tail = to_tail |
|
1286 |
self.to_parent_id = to_parent_id |
|
2220.1.12
by Marius Kruger
* Fix errors.py import order |
1287 |
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 |
1288 |
|
1508.1.7
by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins). |
1289 |
@needs_read_lock
|
453
by Martin Pool
- Split WorkingTree into its own file |
1290 |
def unknowns(self): |
1508.1.6
by Robert Collins
Move Branch.unknowns() to WorkingTree. |
1291 |
"""Return all unknown files. |
1292 |
||
1293 |
These are files in the working directory that are not versioned or
|
|
1294 |
control files or ignored.
|
|
1295 |
"""
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
1296 |
for subp in self.extras(): |
1297 |
if not self.is_ignored(subp): |
|
1298 |
yield subp |
|
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
1299 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1300 |
@needs_tree_write_lock
|
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
1301 |
def unversion(self, file_ids): |
1302 |
"""Remove the file ids in file_ids from the current versioned set. |
|
1303 |
||
1304 |
When a file_id is unversioned, all of its children are automatically
|
|
1305 |
unversioned.
|
|
1306 |
||
1307 |
:param file_ids: The file ids to stop versioning.
|
|
1308 |
:raises: NoSuchId if any fileid is not currently versioned.
|
|
1309 |
"""
|
|
1310 |
for file_id in file_ids: |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
1311 |
file_id = osutils.safe_file_id(file_id) |
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
1312 |
if self._inventory.has_id(file_id): |
1988.2.6
by Robert Collins
Review feedback. |
1313 |
self._inventory.remove_recursive_id(file_id) |
1988.2.1
by Robert Collins
WorkingTree has a new api ``unversion`` which allow the unversioning of |
1314 |
else: |
1315 |
raise errors.NoSuchId(self, file_id) |
|
1316 |
if len(file_ids): |
|
1317 |
# in the future this should just set a dirty bit to wait for the
|
|
1318 |
# final unlock. However, until all methods of workingtree start
|
|
1319 |
# with the current in -memory inventory rather than triggering
|
|
1320 |
# a read, it is more complex - we need to teach read_inventory
|
|
1321 |
# to know when to read, and when to not read first... and possibly
|
|
1322 |
# to save first when the in memory one may be corrupted.
|
|
1323 |
# so for now, we just only write it if it is indeed dirty.
|
|
1324 |
# - RBC 20060907
|
|
1325 |
self._write_inventory(self._inventory) |
|
1326 |
||
1534.10.16
by Aaron Bentley
Small tweaks |
1327 |
@deprecated_method(zero_eight) |
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
1328 |
def iter_conflicts(self): |
1534.10.16
by Aaron Bentley
Small tweaks |
1329 |
"""List all files in the tree that have text or content conflicts. |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
1330 |
DEPRECATED. Use conflicts instead."""
|
1534.10.10
by Aaron Bentley
Resolve uses the new stuff. |
1331 |
return self._iter_conflicts() |
1332 |
||
1534.10.9
by Aaron Bentley
Switched display functions to conflict_lines |
1333 |
def _iter_conflicts(self): |
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
1334 |
conflicted = set() |
1732.1.11
by John Arbash Meinel
Trying multiple things to get WorkingTree.list_files time down |
1335 |
for info in self.list_files(): |
1336 |
path = info[0] |
|
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
1337 |
stem = get_conflicted_stem(path) |
1338 |
if stem is None: |
|
1339 |
continue
|
|
1340 |
if stem not in conflicted: |
|
1341 |
conflicted.add(stem) |
|
1342 |
yield stem |
|
453
by Martin Pool
- Split WorkingTree into its own file |
1343 |
|
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
1344 |
@needs_write_lock
|
1551.11.10
by Aaron Bentley
Add change reporting to pull |
1345 |
def pull(self, source, overwrite=False, stop_revision=None, |
1346 |
change_reporter=None): |
|
1551.2.36
by Aaron Bentley
Make pull update the progress bar more nicely |
1347 |
top_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
1348 |
source.lock_read() |
1349 |
try: |
|
1551.2.36
by Aaron Bentley
Make pull update the progress bar more nicely |
1350 |
pp = ProgressPhase("Pull phase", 2, top_pb) |
1351 |
pp.next_phase() |
|
2249.4.2
by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible. |
1352 |
old_revision_info = self.branch.last_revision_info() |
1563.1.4
by Robert Collins
Fix 'bzr pull' on metadir trees. |
1353 |
basis_tree = self.basis_tree() |
1534.4.54
by Robert Collins
Merge from integration. |
1354 |
count = self.branch.pull(source, overwrite, stop_revision) |
2249.4.2
by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible. |
1355 |
new_revision_info = self.branch.last_revision_info() |
1356 |
if new_revision_info != old_revision_info: |
|
1551.2.36
by Aaron Bentley
Make pull update the progress bar more nicely |
1357 |
pp.next_phase() |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
1358 |
repository = self.branch.repository |
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
1359 |
pb = bzrlib.ui.ui_factory.nested_progress_bar() |
1360 |
try: |
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
1361 |
new_basis_tree = self.branch.basis_tree() |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
1362 |
merge.merge_inner( |
1363 |
self.branch, |
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
1364 |
new_basis_tree, |
1365 |
basis_tree, |
|
1366 |
this_tree=self, |
|
1551.11.10
by Aaron Bentley
Add change reporting to pull |
1367 |
pb=pb, |
1368 |
change_reporter=change_reporter) |
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
1369 |
if (basis_tree.inventory.root is None and |
1731.1.47
by Aaron Bentley
Merge bzr.dev |
1370 |
new_basis_tree.inventory.root is not None): |
1371 |
self.set_root_id(new_basis_tree.inventory.root.file_id) |
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
1372 |
finally: |
1373 |
pb.finished() |
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
1374 |
# 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. |
1375 |
# reuse the revisiontree we merged against to set the new
|
1376 |
# tree data.
|
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
1377 |
parent_trees = [(self.branch.last_revision(), new_basis_tree)] |
1908.6.3
by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis. |
1378 |
# we have to pull the merge trees out again, because
|
1379 |
# merge_inner has set the ids. - this corner is not yet
|
|
1380 |
# layered well enough to prevent double handling.
|
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
1381 |
merges = self.get_parent_ids()[1:] |
1382 |
parent_trees.extend([ |
|
1383 |
(parent, repository.revision_tree(parent)) for |
|
1384 |
parent in merges]) |
|
1385 |
self.set_parent_trees(parent_trees) |
|
1185.33.44
by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer) |
1386 |
return count |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
1387 |
finally: |
1388 |
source.unlock() |
|
1551.2.36
by Aaron Bentley
Make pull update the progress bar more nicely |
1389 |
top_pb.finished() |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
1390 |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
1391 |
@needs_write_lock
|
1392 |
def put_file_bytes_non_atomic(self, file_id, bytes): |
|
1393 |
"""See MutableTree.put_file_bytes_non_atomic.""" |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
1394 |
file_id = osutils.safe_file_id(file_id) |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
1395 |
stream = file(self.id2abspath(file_id), 'wb') |
1396 |
try: |
|
1397 |
stream.write(bytes) |
|
1398 |
finally: |
|
1399 |
stream.close() |
|
1400 |
# TODO: update the hashcache here ?
|
|
1401 |
||
453
by Martin Pool
- Split WorkingTree into its own file |
1402 |
def extras(self): |
1403 |
"""Yield all unknown files in this WorkingTree. |
|
1404 |
||
1405 |
If there are any unknown directories then only the directory is
|
|
1406 |
returned, not all its children. But if there are unknown files
|
|
1407 |
under a versioned subdirectory, they are returned.
|
|
1408 |
||
1409 |
Currently returned depth-first, sorted by name within directories.
|
|
1410 |
"""
|
|
1411 |
## TODO: Work from given directory downwards
|
|
1412 |
for path, dir_entry in self.inventory.directories(): |
|
1711.2.101
by John Arbash Meinel
Clean up some unnecessary mutter() calls |
1413 |
# mutter("search for unknowns in %r", path)
|
453
by Martin Pool
- Split WorkingTree into its own file |
1414 |
dirabs = self.abspath(path) |
1415 |
if not isdir(dirabs): |
|
1416 |
# e.g. directory deleted
|
|
1417 |
continue
|
|
1418 |
||
1419 |
fl = [] |
|
1420 |
for subf in os.listdir(dirabs): |
|
1830.3.3
by John Arbash Meinel
inside workingtree check for normalized filename access |
1421 |
if subf == '.bzr': |
1422 |
continue
|
|
1423 |
if subf not in dir_entry.children: |
|
1424 |
subf_norm, can_access = osutils.normalized_filename(subf) |
|
1425 |
if subf_norm != subf and can_access: |
|
1426 |
if subf_norm not in dir_entry.children: |
|
1427 |
fl.append(subf_norm) |
|
1428 |
else: |
|
1429 |
fl.append(subf) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
1430 |
|
1431 |
fl.sort() |
|
1432 |
for subf in fl: |
|
1732.1.1
by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does |
1433 |
subp = pathjoin(path, subf) |
453
by Martin Pool
- Split WorkingTree into its own file |
1434 |
yield subp |
1435 |
||
1713.2.3
by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add. |
1436 |
|
453
by Martin Pool
- Split WorkingTree into its own file |
1437 |
def ignored_files(self): |
1438 |
"""Yield list of PATH, IGNORE_PATTERN""" |
|
1439 |
for subp in self.extras(): |
|
1440 |
pat = self.is_ignored(subp) |
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1441 |
if pat is not None: |
453
by Martin Pool
- Split WorkingTree into its own file |
1442 |
yield subp, pat |
1443 |
||
1444 |
def get_ignore_list(self): |
|
1445 |
"""Return list of ignore patterns. |
|
1446 |
||
1447 |
Cached in the Tree object after the first call.
|
|
1448 |
"""
|
|
1836.1.30
by John Arbash Meinel
Change ignore functions to use sets instead of lists. |
1449 |
ignoreset = getattr(self, '_ignoreset', None) |
1450 |
if ignoreset is not None: |
|
1451 |
return ignoreset |
|
1452 |
||
1453 |
ignore_globs = set(bzrlib.DEFAULT_IGNORE) |
|
1454 |
ignore_globs.update(ignores.get_runtime_ignores()) |
|
1455 |
ignore_globs.update(ignores.get_user_ignores()) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
1456 |
if self.has_filename(bzrlib.IGNORE_FILENAME): |
1457 |
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 |
1458 |
try: |
1836.1.30
by John Arbash Meinel
Change ignore functions to use sets instead of lists. |
1459 |
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 |
1460 |
finally: |
1461 |
f.close() |
|
1836.1.30
by John Arbash Meinel
Change ignore functions to use sets instead of lists. |
1462 |
self._ignoreset = ignore_globs |
1836.1.4
by John Arbash Meinel
Cleanup is_ignored to handle comment lines, and a global ignore pattern |
1463 |
return ignore_globs |
453
by Martin Pool
- Split WorkingTree into its own file |
1464 |
|
2135.2.7
by Kent Gibson
Implement JAM's review suggestions. |
1465 |
def _flush_ignore_list_cache(self): |
2135.2.1
by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637) |
1466 |
"""Resets the cached ignore list to force a cache rebuild.""" |
1467 |
self._ignoreset = None |
|
1468 |
self._ignoreglobster = None |
|
1713.2.3
by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add. |
1469 |
|
453
by Martin Pool
- Split WorkingTree into its own file |
1470 |
def is_ignored(self, filename): |
1471 |
r"""Check whether the filename matches an ignore pattern. |
|
1472 |
||
1473 |
Patterns containing '/' or '\' need to match the whole path;
|
|
1474 |
others match against only the last component.
|
|
1475 |
||
1476 |
If the file is ignored, returns the pattern which caused it to
|
|
1477 |
be ignored, otherwise None. So this can simply be used as a
|
|
1478 |
boolean if desired."""
|
|
2135.2.1
by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637) |
1479 |
if getattr(self, '_ignoreglobster', None) is None: |
2135.2.7
by Kent Gibson
Implement JAM's review suggestions. |
1480 |
self._ignoreglobster = globbing.Globster(self.get_ignore_list()) |
2135.2.1
by Kent Gibson
Added glob module to replace broken fnmatch based ignore pattern matching (#57637) |
1481 |
return self._ignoreglobster.match(filename) |
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
1482 |
|
1185.12.28
by Aaron Bentley
Removed use of readonly path for executability test |
1483 |
def kind(self, file_id): |
1484 |
return file_kind(self.id2abspath(file_id)) |
|
1485 |
||
2012.1.7
by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file |
1486 |
def _comparison_data(self, entry, path): |
1487 |
abspath = self.abspath(path) |
|
1488 |
try: |
|
1489 |
stat_value = os.lstat(abspath) |
|
1490 |
except OSError, e: |
|
1491 |
if getattr(e, 'errno', None) == errno.ENOENT: |
|
1492 |
stat_value = None |
|
1493 |
kind = None |
|
1494 |
executable = False |
|
1495 |
else: |
|
1496 |
raise
|
|
1497 |
else: |
|
1498 |
mode = stat_value.st_mode |
|
1499 |
kind = osutils.file_kind_from_stat_mode(mode) |
|
1500 |
if not supports_executable(): |
|
1501 |
executable = entry.executable |
|
1502 |
else: |
|
1503 |
executable = bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode) |
|
1504 |
return kind, executable, stat_value |
|
1505 |
||
1506 |
def _file_size(self, entry, stat_value): |
|
1507 |
return stat_value.st_size |
|
1508 |
||
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1509 |
def last_revision(self): |
1986.1.6
by Robert Collins
Add MemoryTree.last_revision. |
1510 |
"""Return the last revision of the branch for this tree. |
1511 |
||
1512 |
This format tree does not support a separate marker for last-revision
|
|
1513 |
compared to the branch.
|
|
1514 |
||
1515 |
See MutableTree.last_revision
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1516 |
"""
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
1517 |
return self._last_revision() |
1518 |
||
1519 |
@needs_read_lock
|
|
1520 |
def _last_revision(self): |
|
1521 |
"""helper for get_parent_ids.""" |
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1522 |
return self.branch.last_revision() |
1523 |
||
1694.2.6
by Martin Pool
[merge] bzr.dev |
1524 |
def is_locked(self): |
1525 |
return self._control_files.is_locked() |
|
1526 |
||
2298.1.1
by Martin Pool
Add test for merge_modified |
1527 |
def _must_be_locked(self): |
1528 |
if not self.is_locked(): |
|
1529 |
raise errors.ObjectNotLocked(self) |
|
1530 |
||
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1531 |
def lock_read(self): |
1532 |
"""See Branch.lock_read, and WorkingTree.unlock.""" |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1533 |
self.branch.lock_read() |
1534 |
try: |
|
1535 |
return self._control_files.lock_read() |
|
1536 |
except: |
|
1537 |
self.branch.unlock() |
|
1538 |
raise
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1539 |
|
1997.1.1
by Robert Collins
Add WorkingTree.lock_tree_write. |
1540 |
def lock_tree_write(self): |
1986.1.8
by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree. |
1541 |
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.""" |
1997.1.1
by Robert Collins
Add WorkingTree.lock_tree_write. |
1542 |
self.branch.lock_read() |
1543 |
try: |
|
1544 |
return self._control_files.lock_write() |
|
1545 |
except: |
|
1546 |
self.branch.unlock() |
|
1547 |
raise
|
|
1548 |
||
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1549 |
def lock_write(self): |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
1550 |
"""See MutableTree.lock_write, and WorkingTree.unlock.""" |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1551 |
self.branch.lock_write() |
1552 |
try: |
|
1553 |
return self._control_files.lock_write() |
|
1554 |
except: |
|
1555 |
self.branch.unlock() |
|
1556 |
raise
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1557 |
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
1558 |
def get_physical_lock_status(self): |
1559 |
return self._control_files.get_physical_lock_status() |
|
1560 |
||
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
1561 |
def _basis_inventory_name(self): |
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
1562 |
return 'basis-inventory-cache' |
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
1563 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1564 |
@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. |
1565 |
def set_last_revision(self, new_revision): |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1566 |
"""Change the last revision in the working tree.""" |
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
1567 |
new_revision = osutils.safe_revision_id(new_revision) |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1568 |
if self._change_last_revision(new_revision): |
1569 |
self._cache_basis_inventory(new_revision) |
|
1570 |
||
1571 |
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. |
1572 |
"""Template method part of set_last_revision to perform the change. |
1573 |
|
|
1574 |
This is used to allow WorkingTree3 instances to not affect branch
|
|
1575 |
when their last revision is set.
|
|
1576 |
"""
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1577 |
if new_revision is None: |
1578 |
self.branch.set_revision_history([]) |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1579 |
return False |
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1580 |
try: |
1908.1.1
by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set. |
1581 |
self.branch.generate_revision_history(new_revision) |
1582 |
except errors.NoSuchRevision: |
|
1583 |
# not present in the repo - dont try to set it deeper than the tip
|
|
1584 |
self.branch.set_revision_history([new_revision]) |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1585 |
return True |
1586 |
||
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
1587 |
def _write_basis_inventory(self, xml): |
1588 |
"""Write the basis inventory XML to the basis-inventory file""" |
|
1589 |
assert isinstance(xml, str), 'serialised xml must be bytestring.' |
|
1590 |
path = self._basis_inventory_name() |
|
1591 |
sio = StringIO(xml) |
|
1592 |
self._control_files.put(path, sio) |
|
1593 |
||
1594 |
def _create_basis_xml_from_inventory(self, revision_id, inventory): |
|
1595 |
"""Create the text that will be saved in basis-inventory""" |
|
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
1596 |
# TODO: jam 20070209 This should be redundant, as the revision_id
|
1597 |
# as all callers should have already converted the revision_id to
|
|
1598 |
# utf8
|
|
1599 |
inventory.revision_id = osutils.safe_revision_id(revision_id) |
|
1996.3.20
by John Arbash Meinel
[merge] bzr.dev 2063 |
1600 |
return xml6.serializer_v6.write_inventory_to_string(inventory) |
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
1601 |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1602 |
def _cache_basis_inventory(self, new_revision): |
1603 |
"""Cache new_revision as the basis inventory.""" |
|
1740.2.3
by Aaron Bentley
Only reserialize the working tree basis inventory when needed. |
1604 |
# TODO: this should allow the ready-to-use inventory to be passed in,
|
1605 |
# as commit already has that ready-to-use [while the format is the
|
|
1606 |
# same, that is].
|
|
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
1607 |
try: |
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
1608 |
# this double handles the inventory - unpack and repack -
|
1609 |
# but is easier to understand. We can/should put a conditional
|
|
1610 |
# in here based on whether the inventory is in the latest format
|
|
1611 |
# - perhaps we should repack all inventories on a repository
|
|
1612 |
# upgrade ?
|
|
1740.2.3
by Aaron Bentley
Only reserialize the working tree basis inventory when needed. |
1613 |
# the fast path is to copy the raw xml from the repository. If the
|
1614 |
# xml contains 'revision_id="', then we assume the right
|
|
1615 |
# revision_id is set. We must check for this full string, because a
|
|
1616 |
# root node id can legitimately look like 'revision_id' but cannot
|
|
1617 |
# contain a '"'.
|
|
1618 |
xml = self.branch.repository.get_inventory_xml(new_revision) |
|
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
1619 |
firstline = xml.split('\n', 1)[0] |
1620 |
if (not 'revision_id="' in firstline or |
|
1910.2.31
by Aaron Bentley
Fix bugs in basis inventory handling, change filename |
1621 |
'format="6"' not in firstline): |
1740.2.3
by Aaron Bentley
Only reserialize the working tree basis inventory when needed. |
1622 |
inv = self.branch.repository.deserialise_inventory( |
1623 |
new_revision, xml) |
|
2041.1.2
by John Arbash Meinel
Update WorkingTree.set_parent_trees() to directly cache inv. |
1624 |
xml = self._create_basis_xml_from_inventory(new_revision, inv) |
1625 |
self._write_basis_inventory(xml) |
|
1908.1.1
by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set. |
1626 |
except (errors.NoSuchRevision, errors.RevisionNotPresent): |
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
1627 |
pass
|
1628 |
||
1638.1.2
by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name. |
1629 |
def read_basis_inventory(self): |
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
1630 |
"""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. |
1631 |
path = self._basis_inventory_name() |
1757.1.3
by Robert Collins
Dont treat the basis inventory xml as ascii - its utf8 and should be preserved as such. |
1632 |
return self._control_files.get(path).read() |
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
1633 |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1634 |
@needs_read_lock
|
1635 |
def read_working_inventory(self): |
|
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1636 |
"""Read the working inventory. |
1637 |
|
|
1986.5.7
by Robert Collins
Merge reviews. |
1638 |
:raises errors.InventoryModified: read_working_inventory will fail
|
1639 |
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 |
1640 |
"""
|
1641 |
# conceptually this should be an implementation detail of the tree.
|
|
1642 |
# XXX: Deprecate this.
|
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1643 |
# ElementTree does its own conversion from UTF-8, so open in
|
1644 |
# binary.
|
|
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1645 |
if self._inventory_is_modified: |
1646 |
raise errors.InventoryModified(self) |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
1647 |
result = xml5.serializer_v5.read_inventory( |
1534.4.28
by Robert Collins
first cut at merge from integration. |
1648 |
self._control_files.get('inventory')) |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1649 |
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() |
1650 |
return result |
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1651 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1652 |
@needs_tree_write_lock
|
1685.1.77
by Wouter van Heyst
WorkingTree.remove takes an optional output file |
1653 |
def remove(self, files, verbose=False, to_file=None): |
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1654 |
"""Remove nominated files from the working inventory.. |
1655 |
||
1656 |
This does not remove their text. This does not run on XXX on what? RBC
|
|
1657 |
||
1658 |
TODO: Refuse to remove modified files unless --force is given?
|
|
1659 |
||
1660 |
TODO: Do something useful with directories.
|
|
1661 |
||
1662 |
TODO: Should this remove the text or not? Tough call; not
|
|
1663 |
removing may be useful and the user can just use use rm, and
|
|
1664 |
is the opposite of add. Removing it is consistent with most
|
|
1665 |
other tools. Maybe an option.
|
|
1666 |
"""
|
|
1667 |
## TODO: Normalize names
|
|
1668 |
## TODO: Remove nested loops; better scalability
|
|
1669 |
if isinstance(files, basestring): |
|
1670 |
files = [files] |
|
1671 |
||
1672 |
inv = self.inventory |
|
1673 |
||
1674 |
# do this before any modifications
|
|
1675 |
for f in files: |
|
1676 |
fid = inv.path2id(f) |
|
1677 |
if not fid: |
|
2245.5.1
by Marius Kruger
Let bzr rm rather give a warning than an error when trying to remove a non-versioned file. |
1678 |
note("%s is not versioned."%f) |
1679 |
else: |
|
1680 |
if verbose: |
|
1681 |
# having remove it, it must be either ignored or unknown
|
|
1682 |
if self.is_ignored(f): |
|
1683 |
new_status = 'I' |
|
1684 |
else: |
|
1685 |
new_status = '?' |
|
1686 |
textui.show_status(new_status, inv[fid].kind, f, |
|
1687 |
to_file=to_file) |
|
1688 |
del inv[fid] |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1689 |
|
1457.1.11
by Robert Collins
Move _write_inventory to WorkingTree. |
1690 |
self._write_inventory(inv) |
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1691 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1692 |
@needs_tree_write_lock
|
1534.9.4
by Aaron Bentley
Added progress bars to revert. |
1693 |
def revert(self, filenames, old_tree=None, backups=True, |
2225.1.1
by Aaron Bentley
Added revert change display, with tests |
1694 |
pb=DummyProgress(), report_changes=False): |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
1695 |
from bzrlib.conflicts import resolve |
1501
by Robert Collins
Move revert from Branch to WorkingTree. |
1696 |
if old_tree is None: |
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1697 |
old_tree = self.basis_tree() |
2225.1.1
by Aaron Bentley
Added revert change display, with tests |
1698 |
conflicts = transform.revert(self, old_tree, filenames, backups, pb, |
1699 |
report_changes) |
|
1457.1.8
by Robert Collins
Replace the WorkingTree.revert method algorithm with a call to merge_inner. |
1700 |
if not len(filenames): |
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
1701 |
self.set_parent_ids(self.get_parent_ids()[:1]) |
1534.10.14
by Aaron Bentley
Made revert clear conflicts |
1702 |
resolve(self) |
1703 |
else: |
|
1534.10.15
by Aaron Bentley
Revert does resolve |
1704 |
resolve(self, filenames, ignore_misses=True) |
1558.7.13
by Aaron Bentley
WorkingTree.revert returns conflicts |
1705 |
return conflicts |
1501
by Robert Collins
Move revert from Branch to WorkingTree. |
1706 |
|
1658.1.3
by Martin Pool
Doc |
1707 |
# XXX: This method should be deprecated in favour of taking in a proper
|
1708 |
# new Inventory object.
|
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1709 |
@needs_tree_write_lock
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1710 |
def set_inventory(self, new_inventory_list): |
1711 |
from bzrlib.inventory import (Inventory, |
|
1712 |
InventoryDirectory, |
|
1713 |
InventoryEntry, |
|
1714 |
InventoryFile, |
|
1715 |
InventoryLink) |
|
1716 |
inv = Inventory(self.get_root_id()) |
|
1658.1.2
by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools |
1717 |
for path, file_id, parent, kind in new_inventory_list: |
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1718 |
name = os.path.basename(path) |
1719 |
if name == "": |
|
1720 |
continue
|
|
1721 |
# fixme, there should be a factory function inv,add_??
|
|
1722 |
if kind == 'directory': |
|
1723 |
inv.add(InventoryDirectory(file_id, name, parent)) |
|
1724 |
elif kind == 'file': |
|
1658.1.2
by Martin Pool
Revert changes to WorkingTree.set_inventory to unbreak bzrtools |
1725 |
inv.add(InventoryFile(file_id, name, parent)) |
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1726 |
elif kind == 'symlink': |
1727 |
inv.add(InventoryLink(file_id, name, parent)) |
|
1728 |
else: |
|
2206.1.7
by Marius Kruger
* errors |
1729 |
raise errors.BzrError("unknown kind %r" % kind) |
1457.1.11
by Robert Collins
Move _write_inventory to WorkingTree. |
1730 |
self._write_inventory(inv) |
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1731 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1732 |
@needs_tree_write_lock
|
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
1733 |
def set_root_id(self, file_id): |
1734 |
"""Set the root id for this tree.""" |
|
1986.5.2
by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please |
1735 |
# for compatability
|
1736 |
if file_id is None: |
|
1737 |
symbol_versioning.warn(symbol_versioning.zero_twelve |
|
1738 |
% 'WorkingTree.set_root_id with fileid=None', |
|
1739 |
DeprecationWarning, |
|
1740 |
stacklevel=3) |
|
1741 |
file_id = ROOT_ID |
|
2294.1.10
by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass |
1742 |
else: |
1743 |
file_id = osutils.safe_file_id(file_id) |
|
1986.5.2
by Robert Collins
``WorkingTree.set_root_id(None)`` is now deprecated. Please |
1744 |
inv = self._inventory |
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
1745 |
orig_root_id = inv.root.file_id |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1746 |
# TODO: it might be nice to exit early if there was nothing
|
1747 |
# to do, saving us from trigger a sync on unlock.
|
|
1748 |
self._inventory_is_modified = True |
|
1749 |
# we preserve the root inventory entry object, but
|
|
1750 |
# unlinkit from the byid index
|
|
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
1751 |
del inv._byid[inv.root.file_id] |
1752 |
inv.root.file_id = file_id |
|
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1753 |
# and link it into the index with the new changed id.
|
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
1754 |
inv._byid[inv.root.file_id] = inv.root |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1755 |
# and finally update all children to reference the new id.
|
1756 |
# XXX: this should be safe to just look at the root.children
|
|
1757 |
# list, not the WHOLE INVENTORY.
|
|
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
1758 |
for fid in inv: |
1759 |
entry = inv[fid] |
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1760 |
if entry.parent_id == orig_root_id: |
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
1761 |
entry.parent_id = inv.root.file_id |
1762 |
||
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1763 |
def unlock(self): |
1764 |
"""See Branch.unlock. |
|
1765 |
|
|
1766 |
WorkingTree locking just uses the Branch locking facilities.
|
|
1767 |
This is current because all working trees have an embedded branch
|
|
1768 |
within them. IF in the future, we were to make branch data shareable
|
|
1769 |
between multiple working trees, i.e. via shared storage, then we
|
|
1770 |
would probably want to lock both the local tree, and the branch.
|
|
1771 |
"""
|
|
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. |
1772 |
raise NotImplementedError(self.unlock) |
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
1773 |
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1774 |
def update(self): |
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
1775 |
"""Update a working tree along its branch. |
1776 |
||
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
1777 |
This will update the branch if its bound too, which means we have
|
1778 |
multiple trees involved:
|
|
1779 |
||
1780 |
- The new basis tree of the master.
|
|
1781 |
- The old basis tree of the branch.
|
|
1782 |
- The old basis tree of the working tree.
|
|
1783 |
- The current working tree state.
|
|
1784 |
||
1785 |
Pathologically, all three may be different, and non-ancestors of each
|
|
1786 |
other. Conceptually we want to:
|
|
1787 |
||
1788 |
- Preserve the wt.basis->wt.state changes
|
|
1789 |
- Transform the wt.basis to the new master basis.
|
|
1790 |
- Apply a merge of the old branch basis to get any 'local' changes from
|
|
1791 |
it into the tree.
|
|
1792 |
- Restore the wt.basis->wt.state changes.
|
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
1793 |
|
1794 |
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 |
1795 |
- Merge current state -> basis tree of the master w.r.t. the old tree
|
1796 |
basis.
|
|
1797 |
- Do a 'normal' merge of the old branch basis if it is relevant.
|
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
1798 |
"""
|
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
1799 |
if self.branch.get_master_branch() is not None: |
1800 |
self.lock_write() |
|
1801 |
update_branch = True |
|
1802 |
else: |
|
1803 |
self.lock_tree_write() |
|
1804 |
update_branch = False |
|
1805 |
try: |
|
1806 |
if update_branch: |
|
1807 |
old_tip = self.branch.update() |
|
1808 |
else: |
|
1809 |
old_tip = None |
|
1810 |
return self._update_tree(old_tip) |
|
1811 |
finally: |
|
1812 |
self.unlock() |
|
1813 |
||
1814 |
@needs_tree_write_lock
|
|
1815 |
def _update_tree(self, old_tip=None): |
|
1816 |
"""Update a tree to the master branch. |
|
1817 |
||
1818 |
:param old_tip: if supplied, the previous tip revision the branch,
|
|
1819 |
before it was changed to the master branch's tip.
|
|
1820 |
"""
|
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1821 |
# here if old_tip is not None, it is the old tip of the branch before
|
1822 |
# it was updated from the master branch. This should become a pending
|
|
1823 |
# merge in the working tree to preserve the user existing work. we
|
|
1824 |
# cant set that until we update the working trees last revision to be
|
|
1825 |
# one from the new branch, because it will just get absorbed by the
|
|
1826 |
# parent de-duplication logic.
|
|
1827 |
#
|
|
1828 |
# We MUST save it even if an error occurs, because otherwise the users
|
|
1829 |
# local work is unreferenced and will appear to have been lost.
|
|
1830 |
#
|
|
1831 |
result = 0 |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
1832 |
try: |
1833 |
last_rev = self.get_parent_ids()[0] |
|
1834 |
except IndexError: |
|
1835 |
last_rev = None |
|
1836 |
if last_rev != self.branch.last_revision(): |
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1837 |
# merge tree state up to new branch tip.
|
1838 |
basis = self.basis_tree() |
|
1839 |
to_tree = self.branch.basis_tree() |
|
1731.1.47
by Aaron Bentley
Merge bzr.dev |
1840 |
if basis.inventory.root is None: |
1841 |
self.set_root_id(to_tree.inventory.root.file_id) |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
1842 |
result += merge.merge_inner( |
1843 |
self.branch, |
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1844 |
to_tree, |
1845 |
basis, |
|
1846 |
this_tree=self) |
|
1908.6.6
by Robert Collins
Merge updated set_parents api. |
1847 |
# TODO - dedup parents list with things merged by pull ?
|
1848 |
# reuse the tree we've updated to to set the basis:
|
|
1849 |
parent_trees = [(self.branch.last_revision(), to_tree)] |
|
1850 |
merges = self.get_parent_ids()[1:] |
|
1851 |
# Ideally we ask the tree for the trees here, that way the working
|
|
1852 |
# tree can decide whether to give us teh entire tree or give us a
|
|
1853 |
# lazy initialised tree. dirstate for instance will have the trees
|
|
1854 |
# in ram already, whereas a last-revision + basis-inventory tree
|
|
1855 |
# will not, but also does not need them when setting parents.
|
|
1856 |
for parent in merges: |
|
1857 |
parent_trees.append( |
|
1858 |
(parent, self.branch.repository.revision_tree(parent))) |
|
1859 |
if old_tip is not None: |
|
1860 |
parent_trees.append( |
|
1861 |
(old_tip, self.branch.repository.revision_tree(old_tip))) |
|
1862 |
self.set_parent_trees(parent_trees) |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
1863 |
last_rev = parent_trees[0][0] |
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1864 |
else: |
1865 |
# the working tree had the same last-revision as the master
|
|
1866 |
# branch did. We may still have pivot local work from the local
|
|
1867 |
# branch into old_tip:
|
|
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. |
1868 |
if old_tip is not None: |
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
1869 |
self.add_parent_tree_id(old_tip) |
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
1870 |
if old_tip and old_tip != last_rev: |
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1871 |
# our last revision was not the prior branch last revision
|
1872 |
# and we have converted that last revision to a pending merge.
|
|
1873 |
# base is somewhere between the branch tip now
|
|
1874 |
# and the now pending merge
|
|
1875 |
from bzrlib.revision import common_ancestor |
|
1876 |
try: |
|
1877 |
base_rev_id = common_ancestor(self.branch.last_revision(), |
|
1878 |
old_tip, |
|
1879 |
self.branch.repository) |
|
1880 |
except errors.NoCommonAncestor: |
|
1881 |
base_rev_id = None |
|
1882 |
base_tree = self.branch.repository.revision_tree(base_rev_id) |
|
1883 |
other_tree = self.branch.repository.revision_tree(old_tip) |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
1884 |
result += merge.merge_inner( |
1885 |
self.branch, |
|
1927.2.3
by Robert Collins
review comment application - paired with Martin. |
1886 |
other_tree, |
1887 |
base_tree, |
|
1888 |
this_tree=self) |
|
1889 |
return result |
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1890 |
|
2201.1.1
by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write. |
1891 |
def _write_hashcache_if_dirty(self): |
1892 |
"""Write out the hashcache if it is dirty.""" |
|
1893 |
if self._hashcache.needs_write: |
|
1894 |
try: |
|
1895 |
self._hashcache.write() |
|
1896 |
except OSError, e: |
|
1897 |
if e.errno not in (errno.EPERM, errno.EACCES): |
|
1898 |
raise
|
|
1899 |
# TODO: jam 20061219 Should this be a warning? A single line
|
|
1900 |
# warning might be sufficient to let the user know what
|
|
1901 |
# is going on.
|
|
1902 |
mutter('Could not write hashcache for %s\nError: %s', |
|
1903 |
self._hashcache.cache_file_name(), e) |
|
1904 |
||
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
1905 |
@needs_tree_write_lock
|
1457.1.11
by Robert Collins
Move _write_inventory to WorkingTree. |
1906 |
def _write_inventory(self, inv): |
1907 |
"""Write inventory as the current inventory.""" |
|
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1908 |
self._set_inventory(inv, dirty=True) |
1909 |
self.flush() |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1910 |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
1911 |
def set_conflicts(self, arg): |
2206.1.7
by Marius Kruger
* errors |
1912 |
raise errors.UnsupportedOperation(self.set_conflicts, self) |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1913 |
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
1914 |
def add_conflicts(self, arg): |
2206.1.7
by Marius Kruger
* errors |
1915 |
raise errors.UnsupportedOperation(self.add_conflicts, self) |
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
1916 |
|
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1917 |
@needs_read_lock
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
1918 |
def conflicts(self): |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
1919 |
conflicts = _mod_conflicts.ConflictList() |
1534.10.9
by Aaron Bentley
Switched display functions to conflict_lines |
1920 |
for conflicted in self._iter_conflicts(): |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1921 |
text = True |
1922 |
try: |
|
1923 |
if file_kind(self.abspath(conflicted)) != "file": |
|
1924 |
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. |
1925 |
except errors.NoSuchFile: |
1926 |
text = False |
|
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1927 |
if text is True: |
1928 |
for suffix in ('.THIS', '.OTHER'): |
|
1929 |
try: |
|
1930 |
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. |
1931 |
if kind != "file": |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1932 |
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. |
1933 |
except errors.NoSuchFile: |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1934 |
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. |
1935 |
if text == False: |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
1936 |
break
|
1937 |
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. |
1938 |
conflicts.append(_mod_conflicts.Conflict.factory(ctype, |
1939 |
path=conflicted, |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
1940 |
file_id=self.path2id(conflicted))) |
1941 |
return conflicts |
|
1942 |
||
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1943 |
|
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. |
1944 |
class WorkingTree2(WorkingTree): |
1945 |
"""This is the Format 2 working tree. |
|
1946 |
||
1947 |
This was the first weave based working tree.
|
|
1948 |
- uses os locks for locking.
|
|
1949 |
- uses the branch last-revision.
|
|
1950 |
"""
|
|
1951 |
||
1997.1.1
by Robert Collins
Add WorkingTree.lock_tree_write. |
1952 |
def lock_tree_write(self): |
1953 |
"""See WorkingTree.lock_tree_write(). |
|
1954 |
||
1955 |
In Format2 WorkingTrees we have a single lock for the branch and tree
|
|
1956 |
so lock_tree_write() degrades to lock_write().
|
|
1957 |
"""
|
|
1958 |
self.branch.lock_write() |
|
1959 |
try: |
|
1960 |
return self._control_files.lock_write() |
|
1961 |
except: |
|
1962 |
self.branch.unlock() |
|
1963 |
raise
|
|
1964 |
||
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. |
1965 |
def unlock(self): |
1966 |
# we share control files:
|
|
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
1967 |
if self._control_files._lock_count == 3: |
1968 |
# _inventory_is_modified is always False during a read lock.
|
|
1969 |
if self._inventory_is_modified: |
|
1970 |
self.flush() |
|
2201.1.1
by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write. |
1971 |
self._write_hashcache_if_dirty() |
1972 |
||
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. |
1973 |
# reverse order of locking.
|
1974 |
try: |
|
1975 |
return self._control_files.unlock() |
|
1976 |
finally: |
|
1977 |
self.branch.unlock() |
|
1978 |
||
1979 |
||
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1980 |
class WorkingTree3(WorkingTree): |
1981 |
"""This is the Format 3 working tree. |
|
1982 |
||
1983 |
This differs from the base WorkingTree by:
|
|
1984 |
- having its own file lock
|
|
1985 |
- having its own last-revision property.
|
|
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
1986 |
|
1987 |
This is new in bzr 0.8
|
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1988 |
"""
|
1989 |
||
1990 |
@needs_read_lock
|
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
1991 |
def _last_revision(self): |
1986.1.6
by Robert Collins
Add MemoryTree.last_revision. |
1992 |
"""See Mutable.last_revision.""" |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1993 |
try: |
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
1994 |
return osutils.safe_revision_id( |
1995 |
self._control_files.get('last-revision').read()) |
|
2206.1.7
by Marius Kruger
* errors |
1996 |
except errors.NoSuchFile: |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1997 |
return None |
1998 |
||
1999 |
def _change_last_revision(self, revision_id): |
|
2000 |
"""See WorkingTree._change_last_revision.""" |
|
2001 |
if revision_id is None or revision_id == NULL_REVISION: |
|
2002 |
try: |
|
2003 |
self._control_files._transport.delete('last-revision') |
|
2004 |
except errors.NoSuchFile: |
|
2005 |
pass
|
|
2006 |
return False |
|
2007 |
else: |
|
2294.1.1
by John Arbash Meinel
Track down some non-ascii deficiencies in commit logic. |
2008 |
self._control_files.put_bytes('last-revision', revision_id) |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
2009 |
return True |
2010 |
||
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
2011 |
@needs_tree_write_lock
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
2012 |
def set_conflicts(self, conflicts): |
2013 |
self._put_rio('conflicts', conflicts.to_stanzas(), |
|
1534.10.21
by Aaron Bentley
Moved and renamed conflict functions |
2014 |
CONFLICT_HEADER_1) |
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
2015 |
|
1997.1.3
by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch |
2016 |
@needs_tree_write_lock
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
2017 |
def add_conflicts(self, new_conflicts): |
2018 |
conflict_set = set(self.conflicts()) |
|
2019 |
conflict_set.update(set(list(new_conflicts))) |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
2020 |
self.set_conflicts(_mod_conflicts.ConflictList(sorted(conflict_set, |
2021 |
key=_mod_conflicts.Conflict.sort_key))) |
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
2022 |
|
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
2023 |
@needs_read_lock
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
2024 |
def conflicts(self): |
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
2025 |
try: |
2026 |
confile = self._control_files.get('conflicts') |
|
2206.1.7
by Marius Kruger
* errors |
2027 |
except errors.NoSuchFile: |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
2028 |
return _mod_conflicts.ConflictList() |
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
2029 |
try: |
2030 |
if confile.next() != CONFLICT_HEADER_1 + '\n': |
|
2206.1.7
by Marius Kruger
* errors |
2031 |
raise errors.ConflictFormatError() |
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
2032 |
except StopIteration: |
2206.1.7
by Marius Kruger
* errors |
2033 |
raise errors.ConflictFormatError() |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
2034 |
return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile)) |
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
2035 |
|
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. |
2036 |
def unlock(self): |
1986.5.3
by Robert Collins
New method ``WorkingTree.flush()`` which will write the current memory |
2037 |
if self._control_files._lock_count == 1: |
2038 |
# _inventory_is_modified is always False during a read lock.
|
|
2039 |
if self._inventory_is_modified: |
|
2040 |
self.flush() |
|
2201.1.1
by John Arbash Meinel
Fix bug #76299 by ignoring write errors during readonly hashcache write. |
2041 |
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. |
2042 |
# reverse order of locking.
|
2043 |
try: |
|
2044 |
return self._control_files.unlock() |
|
2045 |
finally: |
|
2046 |
self.branch.unlock() |
|
2047 |
||
1534.10.6
by Aaron Bentley
Conflict serialization working for WorkingTree3 |
2048 |
|
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
2049 |
def get_conflicted_stem(path): |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
2050 |
for suffix in _mod_conflicts.CONFLICT_SUFFIXES: |
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
2051 |
if path.endswith(suffix): |
2052 |
return path[:-len(suffix)] |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
2053 |
|
1534.5.5
by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test. |
2054 |
@deprecated_function(zero_eight) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
2055 |
def is_control_file(filename): |
1534.5.5
by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test. |
2056 |
"""See WorkingTree.is_control_filename(filename).""" |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
2057 |
## FIXME: better check
|
2058 |
filename = normpath(filename) |
|
2059 |
while filename != '': |
|
2060 |
head, tail = os.path.split(filename) |
|
2061 |
## mutter('check %r for control file' % ((head, tail),))
|
|
1534.5.5
by Robert Collins
Move is_control_file into WorkingTree.is_control_filename and test. |
2062 |
if tail == '.bzr': |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
2063 |
return True |
2064 |
if filename == head: |
|
2065 |
break
|
|
2066 |
filename = head |
|
2067 |
return False |
|
2068 |
||
2069 |
||
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
2070 |
class WorkingTreeFormat(object): |
2071 |
"""An encapsulation of the initialization and open routines for a format. |
|
2072 |
||
2073 |
Formats provide three things:
|
|
2074 |
* An initialization routine,
|
|
2075 |
* a format string,
|
|
2076 |
* an open routine.
|
|
2077 |
||
2078 |
Formats are placed in an dict by their format string for reference
|
|
2079 |
during workingtree opening. Its not required that these be instances, they
|
|
2080 |
can be classes themselves with class methods - it simply depends on
|
|
2081 |
whether state is needed for a given format or not.
|
|
2082 |
||
2083 |
Once a format is deprecated, just deprecate the initialize and open
|
|
2084 |
methods on the format class. Do not deprecate the object, as the
|
|
2085 |
object will be created every time regardless.
|
|
2086 |
"""
|
|
2087 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2088 |
_default_format = None |
2089 |
"""The default format used for new trees.""" |
|
2090 |
||
2091 |
_formats = {} |
|
2092 |
"""The known formats.""" |
|
2093 |
||
2094 |
@classmethod
|
|
2095 |
def find_format(klass, a_bzrdir): |
|
2096 |
"""Return the format for the working tree object in a_bzrdir.""" |
|
2097 |
try: |
|
2098 |
transport = a_bzrdir.get_workingtree_transport(None) |
|
2099 |
format_string = transport.get("format").read() |
|
2100 |
return klass._formats[format_string] |
|
2206.1.7
by Marius Kruger
* errors |
2101 |
except errors.NoSuchFile: |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
2102 |
raise errors.NoWorkingTree(base=transport.base) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2103 |
except KeyError: |
1740.5.6
by Martin Pool
Clean up many exception classes. |
2104 |
raise errors.UnknownFormatError(format=format_string) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2105 |
|
2106 |
@classmethod
|
|
2107 |
def get_default_format(klass): |
|
2108 |
"""Return the current default format.""" |
|
2109 |
return klass._default_format |
|
2110 |
||
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
2111 |
def get_format_string(self): |
2112 |
"""Return the ASCII format string that identifies this format.""" |
|
2113 |
raise NotImplementedError(self.get_format_string) |
|
2114 |
||
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
2115 |
def get_format_description(self): |
2116 |
"""Return the short description for this format.""" |
|
2117 |
raise NotImplementedError(self.get_format_description) |
|
2118 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2119 |
def is_supported(self): |
2120 |
"""Is this format supported? |
|
2121 |
||
2122 |
Supported formats can be initialized and opened.
|
|
2123 |
Unsupported formats may not support initialization or committing or
|
|
2124 |
some other features depending on the reason for not being supported.
|
|
2125 |
"""
|
|
2126 |
return True |
|
2127 |
||
2128 |
@classmethod
|
|
2129 |
def register_format(klass, format): |
|
2130 |
klass._formats[format.get_format_string()] = format |
|
2131 |
||
2132 |
@classmethod
|
|
2133 |
def set_default_format(klass, format): |
|
2134 |
klass._default_format = format |
|
2135 |
||
2136 |
@classmethod
|
|
2137 |
def unregister_format(klass, format): |
|
2138 |
assert klass._formats[format.get_format_string()] is format |
|
2139 |
del klass._formats[format.get_format_string()] |
|
2140 |
||
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
2141 |
|
2142 |
||
2143 |
class WorkingTreeFormat2(WorkingTreeFormat): |
|
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
2144 |
"""The second working tree format. |
2145 |
||
2146 |
This format modified the hash cache from the format 1 hash cache.
|
|
2147 |
"""
|
|
2148 |
||
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
2149 |
def get_format_description(self): |
2150 |
"""See WorkingTreeFormat.get_format_description().""" |
|
2151 |
return "Working tree format 2" |
|
2152 |
||
1692.7.9
by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064) |
2153 |
def stub_initialize_remote(self, control_files): |
2154 |
"""As a special workaround create critical control files for a remote working tree |
|
2155 |
|
|
2156 |
This ensures that it can later be updated and dealt with locally,
|
|
2157 |
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
|
|
2158 |
no working tree. (See bug #43064).
|
|
2159 |
"""
|
|
2160 |
sio = StringIO() |
|
2161 |
inv = Inventory() |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
2162 |
xml5.serializer_v5.write_inventory(inv, sio) |
1692.7.9
by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064) |
2163 |
sio.seek(0) |
2164 |
control_files.put('inventory', sio) |
|
2165 |
||
2294.1.2
by John Arbash Meinel
Track down and add tests that all tree.commit() can handle |
2166 |
control_files.put_bytes('pending-merges', '') |
1692.7.9
by Martin Pool
Don't create broken standalone branches over sftp (Malone #43064) |
2167 |
|
2168 |
||
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
2169 |
def initialize(self, a_bzrdir, revision_id=None): |
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
2170 |
"""See WorkingTreeFormat.initialize().""" |
2171 |
if not isinstance(a_bzrdir.transport, LocalTransport): |
|
2172 |
raise errors.NotLocalUrl(a_bzrdir.transport.base) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
2173 |
branch = a_bzrdir.open_branch() |
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
2174 |
if revision_id is not None: |
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
2175 |
revision_id = osutils.safe_revision_id(revision_id) |
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
2176 |
branch.lock_write() |
2177 |
try: |
|
2178 |
revision_history = branch.revision_history() |
|
2179 |
try: |
|
2180 |
position = revision_history.index(revision_id) |
|
2181 |
except ValueError: |
|
2182 |
raise errors.NoSuchRevision(branch, revision_id) |
|
2183 |
branch.set_revision_history(revision_history[:position + 1]) |
|
2184 |
finally: |
|
2185 |
branch.unlock() |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
2186 |
revision = branch.last_revision() |
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
2187 |
inv = Inventory() |
1852.4.2
by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from. |
2188 |
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. |
2189 |
branch, |
2190 |
inv, |
|
2191 |
_internal=True, |
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
2192 |
_format=self, |
2193 |
_bzrdir=a_bzrdir) |
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
2194 |
basis_tree = branch.repository.revision_tree(revision) |
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
2195 |
if basis_tree.inventory.root is not None: |
1986.5.8
by Robert Collins
Merge bzr.dev. |
2196 |
wt.set_root_id(basis_tree.inventory.root.file_id) |
2197 |
# set the parent list and cache the basis tree.
|
|
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
2198 |
wt.set_parent_trees([(revision, basis_tree)]) |
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
2199 |
transform.build_tree(basis_tree, wt) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2200 |
return wt |
2201 |
||
2202 |
def __init__(self): |
|
2203 |
super(WorkingTreeFormat2, self).__init__() |
|
2204 |
self._matchingbzrdir = bzrdir.BzrDirFormat6() |
|
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
2205 |
|
2206 |
def open(self, a_bzrdir, _found=False): |
|
2207 |
"""Return the WorkingTree object for a_bzrdir |
|
2208 |
||
2209 |
_found is a private parameter, do not use it. It is used to indicate
|
|
2210 |
if format probing has already been done.
|
|
2211 |
"""
|
|
2212 |
if not _found: |
|
2213 |
# we are being called directly and must probe.
|
|
2214 |
raise NotImplementedError |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2215 |
if not isinstance(a_bzrdir.transport, LocalTransport): |
2216 |
raise errors.NotLocalUrl(a_bzrdir.transport.base) |
|
1852.4.2
by Robert Collins
Refactor workingtree.unlock to be cleaner, adding a trivial test for unlock. Introduces an explicit Format2 tree type, making the base WorkingTree cleaner to derive from. |
2217 |
return WorkingTree2(a_bzrdir.root_transport.local_abspath('.'), |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
2218 |
_internal=True, |
2219 |
_format=self, |
|
2220 |
_bzrdir=a_bzrdir) |
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
2221 |
|
2222 |
||
2223 |
class WorkingTreeFormat3(WorkingTreeFormat): |
|
2224 |
"""The second working tree format updated to record a format marker. |
|
2225 |
||
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
2226 |
This format:
|
2227 |
- exists within a metadir controlling .bzr
|
|
2228 |
- includes an explicit version marker for the workingtree control
|
|
2229 |
files, separate from the BzrDir format
|
|
2230 |
- modifies the hash cache format
|
|
2231 |
- is new in bzr 0.8
|
|
1852.3.1
by Robert Collins
Trivial cleanups to workingtree.py |
2232 |
- uses a LockDir to guard access for writes.
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
2233 |
"""
|
2234 |
||
2235 |
def get_format_string(self): |
|
2236 |
"""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 |
2237 |
return "Bazaar-NG Working Tree format 3" |
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
2238 |
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
2239 |
def get_format_description(self): |
2240 |
"""See WorkingTreeFormat.get_format_description().""" |
|
2241 |
return "Working tree format 3" |
|
2242 |
||
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
2243 |
_lock_file_name = 'lock' |
2244 |
_lock_class = LockDir |
|
2245 |
||
2246 |
def _open_control_files(self, a_bzrdir): |
|
2247 |
transport = a_bzrdir.get_workingtree_transport(None) |
|
2248 |
return LockableFiles(transport, self._lock_file_name, |
|
2249 |
self._lock_class) |
|
2250 |
||
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
2251 |
def initialize(self, a_bzrdir, revision_id=None): |
2252 |
"""See WorkingTreeFormat.initialize(). |
|
2253 |
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
2254 |
revision_id allows creating a working tree at a different
|
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
2255 |
revision than the branch is at.
|
2256 |
"""
|
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
2257 |
if not isinstance(a_bzrdir.transport, LocalTransport): |
2258 |
raise errors.NotLocalUrl(a_bzrdir.transport.base) |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2259 |
transport = a_bzrdir.get_workingtree_transport(self) |
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
2260 |
control_files = self._open_control_files(a_bzrdir) |
2261 |
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. |
2262 |
control_files.lock_write() |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2263 |
control_files.put_utf8('format', self.get_format_string()) |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
2264 |
branch = a_bzrdir.open_branch() |
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
2265 |
if revision_id is None: |
2266 |
revision_id = branch.last_revision() |
|
2249.5.9
by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate |
2267 |
else: |
2268 |
revision_id = osutils.safe_revision_id(revision_id) |
|
2084.1.1
by John Arbash Meinel
Don't create new working trees with unique roots, because it breaks older versions of bzr |
2269 |
# WorkingTree3 can handle an inventory which has a unique root id.
|
2270 |
# as of bzr 0.12. However, bzr 0.11 and earlier fail to handle
|
|
2271 |
# those trees. And because there isn't a format bump inbetween, we
|
|
2272 |
# are maintaining compatibility with older clients.
|
|
2273 |
# inv = Inventory(root_id=gen_root_id())
|
|
2274 |
inv = Inventory() |
|
1685.1.9
by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url |
2275 |
wt = WorkingTree3(a_bzrdir.root_transport.local_abspath('.'), |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
2276 |
branch, |
2277 |
inv, |
|
2278 |
_internal=True, |
|
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
2279 |
_format=self, |
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
2280 |
_bzrdir=a_bzrdir, |
2281 |
_control_files=control_files) |
|
1997.1.4
by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well |
2282 |
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. |
2283 |
try: |
1908.6.1
by Robert Collins
Change all callers of set_last_revision to use set_parent_trees. |
2284 |
basis_tree = branch.repository.revision_tree(revision_id) |
1986.5.8
by Robert Collins
Merge bzr.dev. |
2285 |
# only set an explicit root id if there is one to set.
|
2286 |
if basis_tree.inventory.root is not None: |
|
2287 |
wt.set_root_id(basis_tree.inventory.root.file_id) |
|
1996.3.6
by John Arbash Meinel
Find a few places that weren't importing their dependencies. |
2288 |
if revision_id == NULL_REVISION: |
1551.8.20
by Aaron Bentley
Fix BzrDir.create_workingtree for NULL_REVISION |
2289 |
wt.set_parent_trees([]) |
2290 |
else: |
|
2291 |
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. |
2292 |
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. |
2293 |
finally: |
1986.5.7
by Robert Collins
Merge reviews. |
2294 |
# 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) |
2295 |
# WorkingTree is given a chance to fire.
|
2296 |
control_files.unlock() |
|
1607.1.14
by Robert Collins
Reduce lock thrashing somewhat - drops bound branch tests lock count from 6554 to 4456 locks. |
2297 |
wt.unlock() |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2298 |
return wt |
2299 |
||
2300 |
def __init__(self): |
|
2301 |
super(WorkingTreeFormat3, self).__init__() |
|
2302 |
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1() |
|
1534.4.45
by Robert Collins
Start WorkingTree -> .bzr/checkout transition |
2303 |
|
2304 |
def open(self, a_bzrdir, _found=False): |
|
2305 |
"""Return the WorkingTree object for a_bzrdir |
|
2306 |
||
2307 |
_found is a private parameter, do not use it. It is used to indicate
|
|
2308 |
if format probing has already been done.
|
|
2309 |
"""
|
|
2310 |
if not _found: |
|
2311 |
# we are being called directly and must probe.
|
|
2312 |
raise NotImplementedError |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2313 |
if not isinstance(a_bzrdir.transport, LocalTransport): |
2314 |
raise errors.NotLocalUrl(a_bzrdir.transport.base) |
|
1852.3.1
by Robert Collins
Trivial cleanups to workingtree.py |
2315 |
return self._open(a_bzrdir, self._open_control_files(a_bzrdir)) |
2316 |
||
2317 |
def _open(self, a_bzrdir, control_files): |
|
2318 |
"""Open the tree itself. |
|
2319 |
|
|
2320 |
:param a_bzrdir: the dir for the tree.
|
|
2321 |
:param control_files: the control files for the tree.
|
|
2322 |
"""
|
|
1685.1.9
by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url |
2323 |
return WorkingTree3(a_bzrdir.root_transport.local_abspath('.'), |
1534.4.51
by Robert Collins
Test the disk layout of format3 working trees. |
2324 |
_internal=True, |
2325 |
_format=self, |
|
1553.5.74
by Martin Pool
Convert WorkingTree format3 to use LockDirs |
2326 |
_bzrdir=a_bzrdir, |
2327 |
_control_files=control_files) |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2328 |
|
1534.5.1
by Robert Collins
Give info some reasonable output and tests. |
2329 |
def __str__(self): |
2330 |
return self.get_format_string() |
|
2331 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2332 |
|
2333 |
# formats which have no format string are not discoverable
|
|
2334 |
# and not independently creatable, so are not registered.
|
|
2335 |
__default_format = WorkingTreeFormat3() |
|
2336 |
WorkingTreeFormat.register_format(__default_format) |
|
2337 |
WorkingTreeFormat.set_default_format(__default_format) |
|
2338 |
_legacy_formats = [WorkingTreeFormat2(), |
|
2339 |
]
|
|
2340 |
||
2341 |
||
2342 |
class WorkingTreeTestProviderAdapter(object): |
|
2343 |
"""A tool to generate a suite testing multiple workingtree formats at once. |
|
2344 |
||
2345 |
This is done by copying the test once for each transport and injecting
|
|
2346 |
the transport_server, transport_readonly_server, and workingtree_format
|
|
2347 |
classes into each copy. Each copy is also given a new id() to make it
|
|
2348 |
easy to identify.
|
|
2349 |
"""
|
|
2350 |
||
2351 |
def __init__(self, transport_server, transport_readonly_server, formats): |
|
2352 |
self._transport_server = transport_server |
|
2353 |
self._transport_readonly_server = transport_readonly_server |
|
2354 |
self._formats = formats |
|
2355 |
||
1852.6.1
by Robert Collins
Start tree implementation tests. |
2356 |
def _clone_test(self, test, bzrdir_format, workingtree_format, variation): |
2357 |
"""Clone test for adaption.""" |
|
2358 |
new_test = deepcopy(test) |
|
2359 |
new_test.transport_server = self._transport_server |
|
2360 |
new_test.transport_readonly_server = self._transport_readonly_server |
|
2361 |
new_test.bzrdir_format = bzrdir_format |
|
2362 |
new_test.workingtree_format = workingtree_format |
|
2363 |
def make_new_test_id(): |
|
2364 |
new_id = "%s(%s)" % (test.id(), variation) |
|
2365 |
return lambda: new_id |
|
2366 |
new_test.id = make_new_test_id() |
|
2367 |
return new_test |
|
2368 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2369 |
def adapt(self, test): |
2370 |
from bzrlib.tests import TestSuite |
|
2371 |
result = TestSuite() |
|
2372 |
for workingtree_format, bzrdir_format in self._formats: |
|
1852.6.1
by Robert Collins
Start tree implementation tests. |
2373 |
new_test = self._clone_test( |
2374 |
test, |
|
2375 |
bzrdir_format, |
|
2376 |
workingtree_format, workingtree_format.__class__.__name__) |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2377 |
result.addTest(new_test) |
2378 |
return result |