351
348
path = osutils.getcwd()
352
349
control, relpath = bzrdir.BzrDir.open_containing(path)
353
351
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)
414
354
def open_downlevel(path=None):
415
355
"""Open an unsupported working tree.
429
369
return True, None
431
371
return True, tree
432
t = transport.get_transport(location)
433
iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
372
transport = get_transport(location)
373
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
434
374
list_current=list_current)
435
return [tr for tr in iterator if tr is not None]
375
return [t for t in iterator if t is not None]
437
377
# should be deprecated - this is slow and in any case treating them as a
438
378
# container is (we now know) bad style -- mbp 20070302
1267
1207
# absolute path
1268
1208
fap = from_dir_abspath + '/' + f
1270
dir_ie = inv[from_dir_id]
1271
if dir_ie.kind == 'directory':
1272
f_ie = dir_ie.children.get(f)
1210
f_ie = inv.get_child(from_dir_id, f)
1277
1213
elif self.is_ignored(fp[1:]):
1280
# we may not have found this file, because of a unicode
1281
# issue, or because the directory was actually a symlink.
1216
# we may not have found this file, because of a unicode issue
1282
1217
f_norm, can_access = osutils.normalized_filename(f)
1283
1218
if f == f_norm or not can_access:
1284
1219
# No change, so treat this file normally
1368
1303
# check for deprecated use of signature
1369
1304
if to_dir is None:
1370
raise TypeError('You must supply a target directory')
1305
to_dir = kwargs.get('to_name', None)
1307
raise TypeError('You must supply a target directory')
1309
symbol_versioning.warn('The parameter to_name was deprecated'
1310
' in version 0.13. Use to_dir instead',
1371
1313
# check destination directory
1372
1314
if isinstance(from_paths, basestring):
1373
1315
raise ValueError()
1664
1606
@needs_write_lock
1665
1607
def pull(self, source, overwrite=False, stop_revision=None,
1666
change_reporter=None, possible_transports=None, local=False,
1608
change_reporter=None, possible_transports=None, local=False):
1668
1609
source.lock_read()
1670
1611
old_revision_info = self.branch.last_revision_info()
2030
all_files = set() # specified and nested files
2031
1971
unknown_nested_files=set()
2032
1972
if to_file is None:
2033
1973
to_file = sys.stdout
2035
files_to_backup = []
2037
1975
def recurse_directory_to_add_files(directory):
2038
1976
# Recurse directory and add all files
2039
1977
# so we can check if they have changed.
2040
1978
for parent_info, file_infos in self.walkdirs(directory):
2041
1979
for relpath, basename, kind, lstat, fileid, kind in file_infos:
2042
1980
# Is it versioned or ignored?
2043
if self.path2id(relpath):
1981
if self.path2id(relpath) or self.is_ignored(relpath):
2044
1982
# Add nested content for deletion.
2045
all_files.add(relpath)
1983
new_files.add(relpath)
2047
# Files which are not versioned
1985
# Files which are not versioned and not ignored
2048
1986
# should be treated as unknown.
2049
files_to_backup.append(relpath)
1987
unknown_nested_files.add((relpath, None, kind))
2051
1989
for filename in files:
2052
1990
# Get file name into canonical form.
2053
1991
abspath = self.abspath(filename)
2054
1992
filename = self.relpath(abspath)
2055
1993
if len(filename) > 0:
2056
all_files.add(filename)
1994
new_files.add(filename)
2057
1995
recurse_directory_to_add_files(filename)
2059
files = list(all_files)
1997
files = list(new_files)
2061
1999
if len(files) == 0:
2062
2000
return # nothing to do
2067
2005
# Bail out if we are going to delete files we shouldn't
2068
2006
if not keep_files and not force:
2069
for (file_id, path, content_change, versioned, parent_id, name,
2070
kind, executable) in self.iter_changes(self.basis_tree(),
2071
include_unchanged=True, require_versioned=False,
2072
want_unversioned=True, specific_files=files):
2073
if versioned[0] == False:
2074
# The record is unknown or newly added
2075
files_to_backup.append(path[1])
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.
2080
files_to_backup.append(path[1])
2007
has_changed_files = len(unknown_nested_files) > 0
2008
if not has_changed_files:
2009
for (file_id, path, content_change, versioned, parent_id, name,
2010
kind, executable) in self.iter_changes(self.basis_tree(),
2011
include_unchanged=True, require_versioned=False,
2012
want_unversioned=True, specific_files=files):
2013
if versioned == (False, False):
2014
# The record is unknown ...
2015
if not self.is_ignored(path[1]):
2016
# ... but not ignored
2017
has_changed_files = True
2019
elif (content_change and (kind[1] is not None) and
2020
osutils.is_inside_any(files, path[1])):
2021
# Versioned and changed, but not deleted, and still
2022
# in one of the dirs to be deleted.
2023
has_changed_files = True
2082
def backup(file_to_backup):
2083
backup_name = self.bzrdir._available_backup_name(file_to_backup)
2084
osutils.rename(abs_path, self.abspath(backup_name))
2085
return "removed %s (but kept a copy: %s)" % (file_to_backup,
2026
if has_changed_files:
2027
# Make delta show ALL applicable changes in error message.
2028
tree_delta = self.changes_from(self.basis_tree(),
2029
require_versioned=False, want_unversioned=True,
2030
specific_files=files)
2031
for unknown_file in unknown_nested_files:
2032
if unknown_file not in tree_delta.unversioned:
2033
tree_delta.unversioned.extend((unknown_file,))
2034
raise errors.BzrRemoveChangedFilesError(tree_delta)
2088
2036
# Build inv_delta and delete files where applicable,
2089
2037
# do this before any modifications to inventory.
2113
2061
len(os.listdir(abs_path)) > 0):
2115
2063
osutils.rmtree(abs_path)
2116
message = "deleted %s" % (f,)
2065
message = "%s is not an empty directory "\
2066
"and won't be deleted." % (f,)
2120
if f in files_to_backup:
2123
osutils.delete_any(abs_path)
2124
message = "deleted %s" % (f,)
2068
osutils.delete_any(abs_path)
2069
message = "deleted %s" % (f,)
2125
2070
elif message is not None:
2126
2071
# Only care if we haven't done anything yet.
2127
2072
message = "%s does not exist." % (f,)
2264
2209
_marker = object()
2266
2211
def update(self, change_reporter=None, possible_transports=None,
2267
revision=None, old_tip=_marker, show_base=False):
2212
revision=None, old_tip=_marker):
2268
2213
"""Update a working tree along its branch.
2270
2215
This will update the branch if its bound too, which means we have
2308
2253
if old_tip is self._marker:
2310
return self._update_tree(old_tip, change_reporter, revision, show_base)
2255
return self._update_tree(old_tip, change_reporter, revision)
2314
2259
@needs_tree_write_lock
2315
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2260
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2317
2261
"""Update a tree to the master branch.
2319
2263
:param old_tip: if supplied, the previous tip revision the branch,
2346
2290
other_tree = self.branch.repository.revision_tree(old_tip)
2347
2291
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2348
2292
base_tree, this_tree=self,
2349
change_reporter=change_reporter,
2350
show_base=show_base)
2293
change_reporter=change_reporter)
2351
2294
if nb_conflicts:
2352
2295
self.add_parent_tree((old_tip, other_tree))
2353
2296
trace.note('Rerun update after fixing the conflicts.')
added
removed
bzrlib/workingtree.py
