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