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