bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
453
by Martin Pool
- Split WorkingTree into its own file |
1 |
# Copyright (C) 2005 Canonical Ltd
|
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 |
||
28 |
To get a WorkingTree, call Branch.working_tree():
|
|
29 |
"""
|
|
30 |
||
31 |
||
32 |
# TODO: Don't allow WorkingTrees to be constructed for remote branches if
|
|
33 |
# they don't work.
|
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
34 |
|
|
956
by Martin Pool
doc |
35 |
# FIXME: I don't know if writing out the cache from the destructor is really a
|
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
36 |
# good idea, because destructors are considered poor taste in Python, and it's
|
37 |
# not predictable when it will be written out.
|
|
38 |
||
39 |
# TODO: Give the workingtree sole responsibility for the working inventory;
|
|
40 |
# remove the variable and references to it from the branch. This may require
|
|
41 |
# updating the commit code so as to update the inventory within the working
|
|
42 |
# copy, and making sure there's only one WorkingTree for any directory on disk.
|
|
43 |
# At the momenthey may alias the inventory and have old copies of it in memory.
|
|
|
956
by Martin Pool
doc |
44 |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
45 |
import os |
|
1398
by Robert Collins
integrate in Gustavos x-bit patch |
46 |
import stat |
|
1140
by Martin Pool
- lift out import statements within WorkingTree |
47 |
import fnmatch |
|
1457.1.1
by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own. |
48 |
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
49 |
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock, quotefn |
|
453
by Martin Pool
- Split WorkingTree into its own file |
50 |
import bzrlib.tree |
|
1457.1.11
by Robert Collins
Move _write_inventory to WorkingTree. |
51 |
from bzrlib.osutils import (appendpath, |
52 |
file_kind, |
|
53 |
isdir, |
|
54 |
pumpfile, |
|
55 |
splitpath, |
|
56 |
relpath) |
|
|
1185.12.60
by Aaron Bentley
Merge from mainline |
57 |
from bzrlib.errors import BzrCheckError, DivergedBranches, NotVersionedError |
|
1140
by Martin Pool
- lift out import statements within WorkingTree |
58 |
from bzrlib.trace import mutter |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
59 |
import bzrlib.xml5 |
|
453
by Martin Pool
- Split WorkingTree into its own file |
60 |
|
|
1465
by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts. |
61 |
|
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
62 |
class TreeEntry(object): |
63 |
"""An entry that implements the minium interface used by commands. |
|
64 |
||
65 |
This needs further inspection, it may be better to have
|
|
66 |
InventoryEntries without ids - though that seems wrong. For now,
|
|
67 |
this is a parallel hierarchy to InventoryEntry, and needs to become
|
|
68 |
one of several things: decorates to that hierarchy, children of, or
|
|
69 |
parents of it.
|
|
|
1399.1.3
by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes |
70 |
Another note is that these objects are currently only used when there is
|
71 |
no InventoryEntry available - i.e. for unversioned objects.
|
|
72 |
Perhaps they should be UnversionedEntry et al. ? - RBC 20051003
|
|
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
73 |
"""
|
74 |
||
75 |
def __eq__(self, other): |
|
76 |
# yes, this us ugly, TODO: best practice __eq__ style.
|
|
77 |
return (isinstance(other, TreeEntry) |
|
78 |
and other.__class__ == self.__class__) |
|
79 |
||
80 |
def kind_character(self): |
|
81 |
return "???" |
|
82 |
||
83 |
||
84 |
class TreeDirectory(TreeEntry): |
|
85 |
"""See TreeEntry. This is a directory in a working tree.""" |
|
86 |
||
87 |
def __eq__(self, other): |
|
88 |
return (isinstance(other, TreeDirectory) |
|
89 |
and other.__class__ == self.__class__) |
|
90 |
||
91 |
def kind_character(self): |
|
92 |
return "/" |
|
93 |
||
94 |
||
95 |
class TreeFile(TreeEntry): |
|
96 |
"""See TreeEntry. This is a regular file in a working tree.""" |
|
97 |
||
98 |
def __eq__(self, other): |
|
99 |
return (isinstance(other, TreeFile) |
|
100 |
and other.__class__ == self.__class__) |
|
101 |
||
102 |
def kind_character(self): |
|
103 |
return '' |
|
104 |
||
105 |
||
106 |
class TreeLink(TreeEntry): |
|
107 |
"""See TreeEntry. This is a symlink in a working tree.""" |
|
108 |
||
109 |
def __eq__(self, other): |
|
110 |
return (isinstance(other, TreeLink) |
|
111 |
and other.__class__ == self.__class__) |
|
112 |
||
113 |
def kind_character(self): |
|
114 |
return '' |
|
115 |
||
116 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
117 |
class WorkingTree(bzrlib.tree.Tree): |
118 |
"""Working copy tree. |
|
119 |
||
120 |
The inventory is held in the `Branch` working-inventory, and the
|
|
121 |
files are in a directory on disk.
|
|
122 |
||
123 |
It is possible for a `WorkingTree` to have a filename which is
|
|
124 |
not listed in the Inventory and vice versa.
|
|
125 |
"""
|
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
126 |
|
|
1457.1.1
by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own. |
127 |
def __init__(self, basedir, branch=None): |
128 |
"""Construct a WorkingTree for basedir. |
|
129 |
||
130 |
If the branch is not supplied, it is opened automatically.
|
|
131 |
If the branch is supplied, it must be the branch for this basedir.
|
|
132 |
(branch.base is not cross checked, because for remote branches that
|
|
133 |
would be meaningless).
|
|
134 |
"""
|
|
|
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. |
135 |
from bzrlib.hashcache import HashCache |
136 |
from bzrlib.trace import note, mutter |
|
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
137 |
assert isinstance(basedir, basestring), \ |
138 |
"base directory %r is not a string" % basedir |
|
|
1457.1.1
by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own. |
139 |
if branch is None: |
140 |
branch = Branch.open(basedir) |
|
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
141 |
assert isinstance(branch, Branch), \ |
142 |
"branch %r is not a Branch" % branch |
|
|
1457.1.1
by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own. |
143 |
self.branch = branch |
|
453
by Martin Pool
- Split WorkingTree into its own file |
144 |
self.basedir = basedir |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
145 |
self._inventory = self.read_working_inventory() |
146 |
self.path2id = self._inventory.path2id |
|
|
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. |
147 |
|
148 |
# update the whole cache up front and write to disk if anything changed;
|
|
149 |
# in the future we might want to do this more selectively
|
|
|
1467
by Robert Collins
WorkingTree.__del__ has been removed. |
150 |
# two possible ways offer themselves : in self._unlock, write the cache
|
151 |
# if needed, or, when the cache sees a change, append it to the hash
|
|
152 |
# cache file, and have the parser take the most recent entry for a
|
|
153 |
# given path only.
|
|
|
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. |
154 |
hc = self._hashcache = HashCache(basedir) |
155 |
hc.read() |
|
|
954
by Martin Pool
- separate out code that just scans the hash cache to find files that are possibly |
156 |
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. |
157 |
|
158 |
if hc.needs_write: |
|
159 |
mutter("write hc") |
|
160 |
hc.write() |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
161 |
|
|
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
162 |
def __iter__(self): |
163 |
"""Iterate through file_ids for this tree. |
|
164 |
||
165 |
file_ids are in a WorkingTree if they are in the working inventory
|
|
166 |
and the working file exists.
|
|
167 |
"""
|
|
168 |
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. |
169 |
for path, ie in inv.iter_entries(): |
|
1092.2.6
by Robert Collins
symlink support updated to work |
170 |
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. |
171 |
yield ie.file_id |
|
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
172 |
|
173 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
174 |
def __repr__(self): |
175 |
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 |
176 |
getattr(self, 'basedir', None)) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
177 |
|
|
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. |
178 |
|
179 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
180 |
def abspath(self, filename): |
181 |
return os.path.join(self.basedir, filename) |
|
182 |
||
|
1457.1.3
by Robert Collins
make Branch.relpath delegate to the working tree. |
183 |
def relpath(self, abspath): |
184 |
"""Return the local path portion from a given absolute path.""" |
|
185 |
return relpath(self.basedir, abspath) |
|
186 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
187 |
def has_filename(self, filename): |
|
1092.2.6
by Robert Collins
symlink support updated to work |
188 |
return bzrlib.osutils.lexists(self.abspath(filename)) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
189 |
|
190 |
def get_file(self, file_id): |
|
191 |
return self.get_file_byname(self.id2path(file_id)) |
|
192 |
||
193 |
def get_file_byname(self, filename): |
|
194 |
return file(self.abspath(filename), 'rb') |
|
195 |
||
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
196 |
def get_root_id(self): |
197 |
"""Return the id of this trees root""" |
|
198 |
inv = self.read_working_inventory() |
|
199 |
return inv.root.file_id |
|
200 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
201 |
def _get_store_filename(self, file_id): |
202 |
## XXX: badly named; this isn't in the store at all
|
|
203 |
return self.abspath(self.id2path(file_id)) |
|
204 |
||
|
1248
by Martin Pool
- new weave based cleanup [broken] |
205 |
|
206 |
def id2abspath(self, file_id): |
|
207 |
return self.abspath(self.id2path(file_id)) |
|
208 |
||
|
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
209 |
|
|
1185.12.39
by abentley
Propogated has_or_had_id to Tree |
210 |
def has_id(self, file_id): |
|
453
by Martin Pool
- Split WorkingTree into its own file |
211 |
# files that have been deleted are excluded
|
|
1185.12.39
by abentley
Propogated has_or_had_id to Tree |
212 |
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. |
213 |
if not inv.has_id(file_id): |
|
453
by Martin Pool
- Split WorkingTree into its own file |
214 |
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. |
215 |
path = inv.id2path(file_id) |
|
1092.2.6
by Robert Collins
symlink support updated to work |
216 |
return bzrlib.osutils.lexists(self.abspath(path)) |
|
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
217 |
|
|
1185.12.39
by abentley
Propogated has_or_had_id to Tree |
218 |
def has_or_had_id(self, file_id): |
219 |
if file_id == self.inventory.root.file_id: |
|
220 |
return True |
|
221 |
return self.inventory.has_id(file_id) |
|
|
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
222 |
|
223 |
__contains__ = has_id |
|
224 |
||
225 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
226 |
def get_file_size(self, file_id): |
|
1248
by Martin Pool
- new weave based cleanup [broken] |
227 |
return os.path.getsize(self.id2abspath(file_id)) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
228 |
|
229 |
def get_file_sha1(self, 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. |
230 |
path = self._inventory.id2path(file_id) |
231 |
return self._hashcache.get_sha1(path) |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
232 |
|
|
1398
by Robert Collins
integrate in Gustavos x-bit patch |
233 |
|
234 |
def is_executable(self, file_id): |
|
235 |
if os.name == "nt": |
|
236 |
return self._inventory[file_id].executable |
|
237 |
else: |
|
238 |
path = self._inventory.id2path(file_id) |
|
239 |
mode = os.lstat(self.abspath(path)).st_mode |
|
240 |
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode) |
|
241 |
||
|
1457.1.14
by Robert Collins
Move pending_merges() to WorkingTree. |
242 |
def pending_merges(self): |
243 |
"""Return a list of pending merges. |
|
244 |
||
245 |
These are revisions that have been merged into the working
|
|
246 |
directory but not yet committed.
|
|
247 |
"""
|
|
248 |
cfn = self.branch._rel_controlfilename('pending-merges') |
|
249 |
if not self.branch._transport.has(cfn): |
|
250 |
return [] |
|
251 |
p = [] |
|
252 |
for l in self.branch.controlfile('pending-merges', 'r').readlines(): |
|
253 |
p.append(l.rstrip('\n')) |
|
254 |
return p |
|
255 |
||
|
1092.2.6
by Robert Collins
symlink support updated to work |
256 |
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 |
257 |
return os.readlink(self.id2abspath(file_id)) |
|
453
by Martin Pool
- Split WorkingTree into its own file |
258 |
|
259 |
def file_class(self, filename): |
|
260 |
if self.path2id(filename): |
|
261 |
return 'V' |
|
262 |
elif self.is_ignored(filename): |
|
263 |
return 'I' |
|
264 |
else: |
|
265 |
return '?' |
|
266 |
||
267 |
||
268 |
def list_files(self): |
|
269 |
"""Recursively list all files as (path, class, kind, id). |
|
270 |
||
271 |
Lists, but does not descend into unversioned directories.
|
|
272 |
||
273 |
This does not include files that have been deleted in this
|
|
274 |
tree.
|
|
275 |
||
276 |
Skips the control directory.
|
|
277 |
"""
|
|
|
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. |
278 |
inv = self._inventory |
|
453
by Martin Pool
- Split WorkingTree into its own file |
279 |
|
280 |
def descend(from_dir_relpath, from_dir_id, dp): |
|
281 |
ls = os.listdir(dp) |
|
282 |
ls.sort() |
|
283 |
for f in ls: |
|
284 |
## TODO: If we find a subdirectory with its own .bzr
|
|
285 |
## directory, then that is a separate tree and we
|
|
286 |
## should exclude it.
|
|
287 |
if bzrlib.BZRDIR == f: |
|
288 |
continue
|
|
289 |
||
290 |
# path within tree
|
|
291 |
fp = appendpath(from_dir_relpath, f) |
|
292 |
||
293 |
# absolute path
|
|
294 |
fap = appendpath(dp, f) |
|
295 |
||
296 |
f_ie = inv.get_child(from_dir_id, f) |
|
297 |
if f_ie: |
|
298 |
c = 'V' |
|
299 |
elif self.is_ignored(fp): |
|
300 |
c = 'I' |
|
301 |
else: |
|
302 |
c = '?' |
|
303 |
||
304 |
fk = file_kind(fap) |
|
305 |
||
306 |
if f_ie: |
|
307 |
if f_ie.kind != fk: |
|
308 |
raise BzrCheckError("file %r entered as kind %r id %r, " |
|
309 |
"now of kind %r" |
|
310 |
% (fap, f_ie.kind, f_ie.file_id, fk)) |
|
311 |
||
|
1399.1.2
by Robert Collins
push kind character creation into InventoryEntry and TreeEntry |
312 |
# make a last minute entry
|
313 |
if f_ie: |
|
314 |
entry = f_ie |
|
315 |
else: |
|
316 |
if fk == 'directory': |
|
317 |
entry = TreeDirectory() |
|
318 |
elif fk == 'file': |
|
319 |
entry = TreeFile() |
|
320 |
elif fk == 'symlink': |
|
321 |
entry = TreeLink() |
|
322 |
else: |
|
323 |
entry = TreeEntry() |
|
324 |
||
325 |
yield fp, c, fk, (f_ie and f_ie.file_id), entry |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
326 |
|
327 |
if fk != 'directory': |
|
328 |
continue
|
|
329 |
||
330 |
if c != 'V': |
|
331 |
# don't descend unversioned directories
|
|
332 |
continue
|
|
333 |
||
334 |
for ff in descend(fp, f_ie.file_id, fap): |
|
335 |
yield ff |
|
336 |
||
337 |
for f in descend('', inv.root.file_id, self.basedir): |
|
338 |
yield f |
|
339 |
||
340 |
||
341 |
||
342 |
def unknowns(self): |
|
343 |
for subp in self.extras(): |
|
344 |
if not self.is_ignored(subp): |
|
345 |
yield subp |
|
346 |
||
|
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
347 |
def iter_conflicts(self): |
348 |
conflicted = set() |
|
349 |
for path in (s[0] for s in self.list_files()): |
|
350 |
stem = get_conflicted_stem(path) |
|
351 |
if stem is None: |
|
352 |
continue
|
|
353 |
if stem not in conflicted: |
|
354 |
conflicted.add(stem) |
|
355 |
yield stem |
|
|
453
by Martin Pool
- Split WorkingTree into its own file |
356 |
|
|
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
357 |
@needs_write_lock
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
358 |
def pull(self, source, overwrite=False): |
|
1465
by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts. |
359 |
from bzrlib.merge import merge_inner |
|
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
360 |
source.lock_read() |
361 |
try: |
|
362 |
old_revision_history = self.branch.revision_history() |
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
363 |
self.branch.pull(source, overwrite) |
|
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
364 |
new_revision_history = self.branch.revision_history() |
365 |
if new_revision_history != old_revision_history: |
|
|
1465
by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts. |
366 |
if len(old_revision_history): |
367 |
other_revision = old_revision_history[-1] |
|
368 |
else: |
|
369 |
other_revision = None |
|
370 |
merge_inner(self.branch, |
|
371 |
self.branch.basis_tree(), |
|
372 |
self.branch.revision_tree(other_revision)) |
|
|
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
373 |
finally: |
374 |
source.unlock() |
|
375 |
||
|
453
by Martin Pool
- Split WorkingTree into its own file |
376 |
def extras(self): |
377 |
"""Yield all unknown files in this WorkingTree. |
|
378 |
||
379 |
If there are any unknown directories then only the directory is
|
|
380 |
returned, not all its children. But if there are unknown files
|
|
381 |
under a versioned subdirectory, they are returned.
|
|
382 |
||
383 |
Currently returned depth-first, sorted by name within directories.
|
|
384 |
"""
|
|
385 |
## TODO: Work from given directory downwards
|
|
386 |
for path, dir_entry in self.inventory.directories(): |
|
387 |
mutter("search for unknowns in %r" % path) |
|
388 |
dirabs = self.abspath(path) |
|
389 |
if not isdir(dirabs): |
|
390 |
# e.g. directory deleted
|
|
391 |
continue
|
|
392 |
||
393 |
fl = [] |
|
394 |
for subf in os.listdir(dirabs): |
|
395 |
if (subf != '.bzr' |
|
396 |
and (subf not in dir_entry.children)): |
|
397 |
fl.append(subf) |
|
398 |
||
399 |
fl.sort() |
|
400 |
for subf in fl: |
|
401 |
subp = appendpath(path, subf) |
|
402 |
yield subp |
|
403 |
||
404 |
||
405 |
def ignored_files(self): |
|
406 |
"""Yield list of PATH, IGNORE_PATTERN""" |
|
407 |
for subp in self.extras(): |
|
408 |
pat = self.is_ignored(subp) |
|
409 |
if pat != None: |
|
410 |
yield subp, pat |
|
411 |
||
412 |
||
413 |
def get_ignore_list(self): |
|
414 |
"""Return list of ignore patterns. |
|
415 |
||
416 |
Cached in the Tree object after the first call.
|
|
417 |
"""
|
|
418 |
if hasattr(self, '_ignorelist'): |
|
419 |
return self._ignorelist |
|
420 |
||
421 |
l = bzrlib.DEFAULT_IGNORE[:] |
|
422 |
if self.has_filename(bzrlib.IGNORE_FILENAME): |
|
423 |
f = self.get_file_byname(bzrlib.IGNORE_FILENAME) |
|
424 |
l.extend([line.rstrip("\n\r") for line in f.readlines()]) |
|
425 |
self._ignorelist = l |
|
426 |
return l |
|
427 |
||
428 |
||
429 |
def is_ignored(self, filename): |
|
430 |
r"""Check whether the filename matches an ignore pattern. |
|
431 |
||
432 |
Patterns containing '/' or '\' need to match the whole path;
|
|
433 |
others match against only the last component.
|
|
434 |
||
435 |
If the file is ignored, returns the pattern which caused it to
|
|
436 |
be ignored, otherwise None. So this can simply be used as a
|
|
437 |
boolean if desired."""
|
|
438 |
||
439 |
# TODO: Use '**' to match directories, and other extended
|
|
440 |
# globbing stuff from cvs/rsync.
|
|
441 |
||
442 |
# XXX: fnmatch is actually not quite what we want: it's only
|
|
443 |
# approximately the same as real Unix fnmatch, and doesn't
|
|
444 |
# treat dotfiles correctly and allows * to match /.
|
|
445 |
# Eventually it should be replaced with something more
|
|
446 |
# accurate.
|
|
447 |
||
448 |
for pat in self.get_ignore_list(): |
|
449 |
if '/' in pat or '\\' in pat: |
|
450 |
||
451 |
# as a special case, you can put ./ at the start of a
|
|
452 |
# pattern; this is good to match in the top-level
|
|
453 |
# only;
|
|
454 |
||
455 |
if (pat[:2] == './') or (pat[:2] == '.\\'): |
|
456 |
newpat = pat[2:] |
|
457 |
else: |
|
458 |
newpat = pat |
|
459 |
if fnmatch.fnmatchcase(filename, newpat): |
|
460 |
return pat |
|
461 |
else: |
|
462 |
if fnmatch.fnmatchcase(splitpath(filename)[-1], pat): |
|
463 |
return pat |
|
464 |
else: |
|
465 |
return None |
|
|
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
466 |
|
|
1185.12.28
by Aaron Bentley
Removed use of readonly path for executability test |
467 |
def kind(self, file_id): |
468 |
return file_kind(self.id2abspath(file_id)) |
|
469 |
||
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
470 |
def lock_read(self): |
471 |
"""See Branch.lock_read, and WorkingTree.unlock.""" |
|
472 |
return self.branch.lock_read() |
|
473 |
||
474 |
def lock_write(self): |
|
475 |
"""See Branch.lock_write, and WorkingTree.unlock.""" |
|
476 |
return self.branch.lock_write() |
|
477 |
||
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
478 |
@needs_read_lock
|
479 |
def read_working_inventory(self): |
|
480 |
"""Read the working inventory.""" |
|
481 |
# ElementTree does its own conversion from UTF-8, so open in
|
|
482 |
# binary.
|
|
483 |
f = self.branch.controlfile('inventory', 'rb') |
|
484 |
return bzrlib.xml5.serializer_v5.read_inventory(f) |
|
485 |
||
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
486 |
@needs_write_lock
|
487 |
def remove(self, files, verbose=False): |
|
488 |
"""Remove nominated files from the working inventory.. |
|
489 |
||
490 |
This does not remove their text. This does not run on XXX on what? RBC
|
|
491 |
||
492 |
TODO: Refuse to remove modified files unless --force is given?
|
|
493 |
||
494 |
TODO: Do something useful with directories.
|
|
495 |
||
496 |
TODO: Should this remove the text or not? Tough call; not
|
|
497 |
removing may be useful and the user can just use use rm, and
|
|
498 |
is the opposite of add. Removing it is consistent with most
|
|
499 |
other tools. Maybe an option.
|
|
500 |
"""
|
|
501 |
## TODO: Normalize names
|
|
502 |
## TODO: Remove nested loops; better scalability
|
|
503 |
if isinstance(files, basestring): |
|
504 |
files = [files] |
|
505 |
||
506 |
inv = self.inventory |
|
507 |
||
508 |
# do this before any modifications
|
|
509 |
for f in files: |
|
510 |
fid = inv.path2id(f) |
|
511 |
if not fid: |
|
|
1185.16.72
by Martin Pool
[merge] from robert and fix up tests |
512 |
# TODO: Perhaps make this just a warning, and continue?
|
513 |
# This tends to happen when
|
|
514 |
raise NotVersionedError(path=f) |
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
515 |
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid)) |
516 |
if verbose: |
|
517 |
# having remove it, it must be either ignored or unknown
|
|
518 |
if self.is_ignored(f): |
|
519 |
new_status = 'I' |
|
520 |
else: |
|
521 |
new_status = '?' |
|
522 |
show_status(new_status, inv[fid].kind, quotefn(f)) |
|
523 |
del inv[fid] |
|
524 |
||
|
1457.1.11
by Robert Collins
Move _write_inventory to WorkingTree. |
525 |
self._write_inventory(inv) |
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
526 |
|
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
527 |
@needs_write_lock
|
|
1501
by Robert Collins
Move revert from Branch to WorkingTree. |
528 |
def revert(self, filenames, old_tree=None, backups=True): |
|
1457.1.8
by Robert Collins
Replace the WorkingTree.revert method algorithm with a call to merge_inner. |
529 |
from bzrlib.merge import merge_inner |
|
1501
by Robert Collins
Move revert from Branch to WorkingTree. |
530 |
if old_tree is None: |
531 |
old_tree = self.branch.basis_tree() |
|
|
1457.1.8
by Robert Collins
Replace the WorkingTree.revert method algorithm with a call to merge_inner. |
532 |
merge_inner(self.branch, old_tree, |
533 |
self, ignore_zero=True, |
|
534 |
backup_files=backups, |
|
535 |
interesting_files=filenames) |
|
536 |
if not len(filenames): |
|
537 |
self.branch.set_pending_merges([]) |
|
|
1501
by Robert Collins
Move revert from Branch to WorkingTree. |
538 |
|
539 |
@needs_write_lock
|
|
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
540 |
def set_inventory(self, new_inventory_list): |
541 |
from bzrlib.inventory import (Inventory, |
|
542 |
InventoryDirectory, |
|
543 |
InventoryEntry, |
|
544 |
InventoryFile, |
|
545 |
InventoryLink) |
|
546 |
inv = Inventory(self.get_root_id()) |
|
547 |
for path, file_id, parent, kind in new_inventory_list: |
|
548 |
name = os.path.basename(path) |
|
549 |
if name == "": |
|
550 |
continue
|
|
551 |
# fixme, there should be a factory function inv,add_??
|
|
552 |
if kind == 'directory': |
|
553 |
inv.add(InventoryDirectory(file_id, name, parent)) |
|
554 |
elif kind == 'file': |
|
555 |
inv.add(InventoryFile(file_id, name, parent)) |
|
556 |
elif kind == 'symlink': |
|
557 |
inv.add(InventoryLink(file_id, name, parent)) |
|
558 |
else: |
|
559 |
raise BzrError("unknown kind %r" % kind) |
|
|
1457.1.11
by Robert Collins
Move _write_inventory to WorkingTree. |
560 |
self._write_inventory(inv) |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
561 |
|
|
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
562 |
@needs_write_lock
|
563 |
def set_root_id(self, file_id): |
|
564 |
"""Set the root id for this tree.""" |
|
565 |
inv = self.read_working_inventory() |
|
566 |
orig_root_id = inv.root.file_id |
|
567 |
del inv._byid[inv.root.file_id] |
|
568 |
inv.root.file_id = file_id |
|
569 |
inv._byid[inv.root.file_id] = inv.root |
|
570 |
for fid in inv: |
|
571 |
entry = inv[fid] |
|
572 |
if entry.parent_id in (None, orig_root_id): |
|
573 |
entry.parent_id = inv.root.file_id |
|
|
1457.1.11
by Robert Collins
Move _write_inventory to WorkingTree. |
574 |
self._write_inventory(inv) |
|
1457.1.10
by Robert Collins
Move set_root_id to WorkingTree. |
575 |
|
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
576 |
def unlock(self): |
577 |
"""See Branch.unlock. |
|
578 |
|
|
579 |
WorkingTree locking just uses the Branch locking facilities.
|
|
580 |
This is current because all working trees have an embedded branch
|
|
581 |
within them. IF in the future, we were to make branch data shareable
|
|
582 |
between multiple working trees, i.e. via shared storage, then we
|
|
583 |
would probably want to lock both the local tree, and the branch.
|
|
584 |
"""
|
|
585 |
return self.branch.unlock() |
|
586 |
||
|
1457.1.11
by Robert Collins
Move _write_inventory to WorkingTree. |
587 |
@needs_write_lock
|
588 |
def _write_inventory(self, inv): |
|
589 |
"""Write inventory as the current inventory.""" |
|
590 |
from cStringIO import StringIO |
|
591 |
from bzrlib.atomicfile import AtomicFile |
|
592 |
sio = StringIO() |
|
593 |
bzrlib.xml5.serializer_v5.write_inventory(inv, sio) |
|
594 |
sio.seek(0) |
|
595 |
f = AtomicFile(self.branch.controlfilename('inventory')) |
|
596 |
try: |
|
597 |
pumpfile(sio, f) |
|
598 |
f.commit() |
|
599 |
finally: |
|
600 |
f.close() |
|
601 |
mutter('wrote working inventory') |
|
602 |
||
|
1442.1.65
by Robert Collins
Branch.remove has been moved to WorkingTree. |
603 |
|
|
1185.14.6
by Aaron Bentley
Made iter_conflicts a WorkingTree method |
604 |
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER') |
605 |
def get_conflicted_stem(path): |
|
606 |
for suffix in CONFLICT_SUFFIXES: |
|
607 |
if path.endswith(suffix): |
|
608 |
return path[:-len(suffix)] |