78
78
from bzrlib import symbol_versioning
79
79
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lock import LogicalLockResult
80
81
from bzrlib.lockable_files import LockableFiles
81
82
from bzrlib.lockdir import LockDir
82
83
import bzrlib.mutabletree
347
351
path = osutils.getcwd()
348
352
control, relpath = bzrdir.BzrDir.open_containing(path)
350
353
return control.open_workingtree(), relpath
356
def open_containing_paths(file_list, default_directory='.',
357
canonicalize=True, apply_view=True):
358
"""Open the WorkingTree that contains a set of paths.
360
Fail if the paths given are not all in a single tree.
362
This is used for the many command-line interfaces that take a list of
363
any number of files and that require they all be in the same tree.
365
# recommended replacement for builtins.internal_tree_files
366
if file_list is None or len(file_list) == 0:
367
tree = WorkingTree.open_containing(default_directory)[0]
368
# XXX: doesn't really belong here, and seems to have the strange
369
# side effect of making it return a bunch of files, not the whole
370
# tree -- mbp 20100716
371
if tree.supports_views() and apply_view:
372
view_files = tree.views.lookup_view()
374
file_list = view_files
375
view_str = views.view_display_str(view_files)
376
note("Ignoring files outside view. View is %s" % view_str)
377
return tree, file_list
378
tree = WorkingTree.open_containing(file_list[0])[0]
379
return tree, tree.safe_relpath_files(file_list, canonicalize,
380
apply_view=apply_view)
382
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
383
"""Convert file_list into a list of relpaths in tree.
385
:param self: A tree to operate on.
386
:param file_list: A list of user provided paths or None.
387
:param apply_view: if True and a view is set, apply it or check that
388
specified files are within it
389
:return: A list of relative paths.
390
:raises errors.PathNotChild: When a provided path is in a different self
393
if file_list is None:
395
if self.supports_views() and apply_view:
396
view_files = self.views.lookup_view()
400
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
401
# doesn't - fix that up here before we enter the loop.
403
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
406
for filename in file_list:
407
relpath = fixer(osutils.dereference_path(filename))
408
if view_files and not osutils.is_inside_any(view_files, relpath):
409
raise errors.FileOutsideView(filename, view_files)
410
new_list.append(relpath)
353
414
def open_downlevel(path=None):
354
415
"""Open an unsupported working tree.
368
429
return True, None
370
431
return True, tree
371
transport = get_transport(location)
372
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
432
t = transport.get_transport(location)
433
iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
373
434
list_current=list_current)
374
return [t for t in iterator if t is not None]
435
return [tr for tr in iterator if tr is not None]
376
437
# should be deprecated - this is slow and in any case treating them as a
377
438
# container is (we now know) bad style -- mbp 20070302
462
523
return (file_obj, stat_value)
464
525
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
526
my_file = self.get_file(file_id, path=path, filtered=filtered)
528
return my_file.read()
467
532
def get_file_byname(self, filename, filtered=True):
468
533
path = self.abspath(filename)
523
588
# Now we have the parents of this content
524
589
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
590
text = self.get_file_text(file_id)
526
591
this_key =(file_id, default_revision)
527
592
annotator.add_special_text(this_key, file_parent_keys, text)
528
593
annotations = [(key[-1], line)
1202
1267
# absolute path
1203
1268
fap = from_dir_abspath + '/' + f
1205
f_ie = inv.get_child(from_dir_id, f)
1270
dir_ie = inv[from_dir_id]
1271
if dir_ie.kind == 'directory':
1272
f_ie = dir_ie.children.get(f)
1208
1277
elif self.is_ignored(fp[1:]):
1211
# we may not have found this file, because of a unicode issue
1280
# we may not have found this file, because of a unicode
1281
# issue, or because the directory was actually a symlink.
1212
1282
f_norm, can_access = osutils.normalized_filename(f)
1213
1283
if f == f_norm or not can_access:
1214
1284
# No change, so treat this file normally
1298
1368
# check for deprecated use of signature
1299
1369
if to_dir is None:
1300
to_dir = kwargs.get('to_name', None)
1302
raise TypeError('You must supply a target directory')
1304
symbol_versioning.warn('The parameter to_name was deprecated'
1305
' in version 0.13. Use to_dir instead',
1370
raise TypeError('You must supply a target directory')
1308
1371
# check destination directory
1309
1372
if isinstance(from_paths, basestring):
1310
1373
raise ValueError()
1798
1861
raise errors.ObjectNotLocked(self)
1800
1863
def lock_read(self):
1801
"""See Branch.lock_read, and WorkingTree.unlock."""
1864
"""Lock the tree for reading.
1866
This also locks the branch, and can be unlocked via self.unlock().
1868
:return: A bzrlib.lock.LogicalLockResult.
1802
1870
if not self.is_locked():
1803
1871
self._reset_data()
1804
1872
self.branch.lock_read()
1806
return self._control_files.lock_read()
1874
self._control_files.lock_read()
1875
return LogicalLockResult(self.unlock)
1808
1877
self.branch.unlock()
1811
1880
def lock_tree_write(self):
1812
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1881
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1883
:return: A bzrlib.lock.LogicalLockResult.
1813
1885
if not self.is_locked():
1814
1886
self._reset_data()
1815
1887
self.branch.lock_read()
1817
return self._control_files.lock_write()
1889
self._control_files.lock_write()
1890
return LogicalLockResult(self.unlock)
1819
1892
self.branch.unlock()
1822
1895
def lock_write(self):
1823
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1896
"""See MutableTree.lock_write, and WorkingTree.unlock.
1898
:return: A bzrlib.lock.LogicalLockResult.
1824
1900
if not self.is_locked():
1825
1901
self._reset_data()
1826
1902
self.branch.lock_write()
1828
return self._control_files.lock_write()
1904
self._control_files.lock_write()
1905
return LogicalLockResult(self.unlock)
1830
1907
self.branch.unlock()
1956
2033
def recurse_directory_to_add_files(directory):
1957
2034
# Recurse directory and add all files
1958
2035
# so we can check if they have changed.
1959
for parent_info, file_infos in\
1960
self.walkdirs(directory):
2036
for parent_info, file_infos in self.walkdirs(directory):
1961
2037
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1962
2038
# Is it versioned or ignored?
1963
2039
if self.path2id(relpath) or self.is_ignored(relpath):
1998
2074
# ... but not ignored
1999
2075
has_changed_files = True
2001
elif content_change and (kind[1] is not None):
2002
# Versioned and changed, but not deleted
2077
elif (content_change and (kind[1] is not None) and
2078
osutils.is_inside_any(files, path[1])):
2079
# Versioned and changed, but not deleted, and still
2080
# in one of the dirs to be deleted.
2003
2081
has_changed_files = True
added
removed
bzrlib/workingtree.py
