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