209
210
self._branch = self.bzrdir.open_branch()
210
211
self.basedir = realpath(basedir)
211
# if branch is at our basedir and is a format 6 or less
212
if isinstance(self._format, WorkingTreeFormat2):
213
# share control object
214
self._control_files = self.branch.control_files
216
# assume all other formats have their own control files.
217
self._control_files = _control_files
212
self._control_files = _control_files
218
213
self._transport = self._control_files._transport
219
214
# update the whole cache up front and write to disk if anything changed;
220
215
# in the future we might want to do this more selectively
350
345
path = osutils.getcwd()
351
346
control, relpath = bzrdir.BzrDir.open_containing(path)
353
347
return control.open_workingtree(), relpath
350
def open_containing_paths(file_list, default_directory=None,
351
canonicalize=True, apply_view=True):
352
"""Open the WorkingTree that contains a set of paths.
354
Fail if the paths given are not all in a single tree.
356
This is used for the many command-line interfaces that take a list of
357
any number of files and that require they all be in the same tree.
359
if default_directory is None:
360
default_directory = u'.'
361
# recommended replacement for builtins.internal_tree_files
362
if file_list is None or len(file_list) == 0:
363
tree = WorkingTree.open_containing(default_directory)[0]
364
# XXX: doesn't really belong here, and seems to have the strange
365
# side effect of making it return a bunch of files, not the whole
366
# tree -- mbp 20100716
367
if tree.supports_views() and apply_view:
368
view_files = tree.views.lookup_view()
370
file_list = view_files
371
view_str = views.view_display_str(view_files)
372
note("Ignoring files outside view. View is %s" % view_str)
373
return tree, file_list
374
if default_directory == u'.':
377
seed = default_directory
378
file_list = [osutils.pathjoin(default_directory, f)
380
tree = WorkingTree.open_containing(seed)[0]
381
return tree, tree.safe_relpath_files(file_list, canonicalize,
382
apply_view=apply_view)
384
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
385
"""Convert file_list into a list of relpaths in tree.
387
:param self: A tree to operate on.
388
:param file_list: A list of user provided paths or None.
389
:param apply_view: if True and a view is set, apply it or check that
390
specified files are within it
391
:return: A list of relative paths.
392
:raises errors.PathNotChild: When a provided path is in a different self
395
if file_list is None:
397
if self.supports_views() and apply_view:
398
view_files = self.views.lookup_view()
402
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
403
# doesn't - fix that up here before we enter the loop.
405
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
408
for filename in file_list:
409
relpath = fixer(osutils.dereference_path(filename))
410
if view_files and not osutils.is_inside_any(view_files, relpath):
411
raise errors.FileOutsideView(filename, view_files)
412
new_list.append(relpath)
356
416
def open_downlevel(path=None):
357
417
"""Open an unsupported working tree.
1310
1370
# check for deprecated use of signature
1311
1371
if to_dir is None:
1312
to_dir = kwargs.get('to_name', None)
1314
raise TypeError('You must supply a target directory')
1316
symbol_versioning.warn('The parameter to_name was deprecated'
1317
' in version 0.13. Use to_dir instead',
1372
raise TypeError('You must supply a target directory')
1320
1373
# check destination directory
1321
1374
if isinstance(from_paths, basestring):
1322
1375
raise ValueError()
1613
1666
@needs_write_lock
1614
1667
def pull(self, source, overwrite=False, stop_revision=None,
1615
change_reporter=None, possible_transports=None, local=False):
1668
change_reporter=None, possible_transports=None, local=False,
1616
1670
source.lock_read()
1618
1672
old_revision_info = self.branch.last_revision_info()
2032
all_files = set() # specified and nested files
1978
2033
unknown_nested_files=set()
1979
2034
if to_file is None:
1980
2035
to_file = sys.stdout
2037
files_to_backup = []
1982
2039
def recurse_directory_to_add_files(directory):
1983
2040
# Recurse directory and add all files
1984
2041
# so we can check if they have changed.
1985
2042
for parent_info, file_infos in self.walkdirs(directory):
1986
2043
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1987
2044
# Is it versioned or ignored?
1988
if self.path2id(relpath) or self.is_ignored(relpath):
2045
if self.path2id(relpath):
1989
2046
# Add nested content for deletion.
1990
new_files.add(relpath)
2047
all_files.add(relpath)
1992
# Files which are not versioned and not ignored
2049
# Files which are not versioned
1993
2050
# should be treated as unknown.
1994
unknown_nested_files.add((relpath, None, kind))
2051
files_to_backup.append(relpath)
1996
2053
for filename in files:
1997
2054
# Get file name into canonical form.
1998
2055
abspath = self.abspath(filename)
1999
2056
filename = self.relpath(abspath)
2000
2057
if len(filename) > 0:
2001
new_files.add(filename)
2058
all_files.add(filename)
2002
2059
recurse_directory_to_add_files(filename)
2004
files = list(new_files)
2061
files = list(all_files)
2006
2063
if len(files) == 0:
2007
2064
return # nothing to do
2012
2069
# Bail out if we are going to delete files we shouldn't
2013
2070
if not keep_files and not force:
2014
has_changed_files = len(unknown_nested_files) > 0
2015
if not has_changed_files:
2016
for (file_id, path, content_change, versioned, parent_id, name,
2017
kind, executable) in self.iter_changes(self.basis_tree(),
2018
include_unchanged=True, require_versioned=False,
2019
want_unversioned=True, specific_files=files):
2020
if versioned == (False, False):
2021
# The record is unknown ...
2022
if not self.is_ignored(path[1]):
2023
# ... but not ignored
2024
has_changed_files = True
2026
elif (content_change and (kind[1] is not None) and
2027
osutils.is_inside_any(files, path[1])):
2028
# Versioned and changed, but not deleted, and still
2029
# in one of the dirs to be deleted.
2030
has_changed_files = True
2071
for (file_id, path, content_change, versioned, parent_id, name,
2072
kind, executable) in self.iter_changes(self.basis_tree(),
2073
include_unchanged=True, require_versioned=False,
2074
want_unversioned=True, specific_files=files):
2075
if versioned[0] == False:
2076
# The record is unknown or newly added
2077
files_to_backup.append(path[1])
2078
elif (content_change and (kind[1] is not None) and
2079
osutils.is_inside_any(files, path[1])):
2080
# Versioned and changed, but not deleted, and still
2081
# in one of the dirs to be deleted.
2082
files_to_backup.append(path[1])
2033
if has_changed_files:
2034
# Make delta show ALL applicable changes in error message.
2035
tree_delta = self.changes_from(self.basis_tree(),
2036
require_versioned=False, want_unversioned=True,
2037
specific_files=files)
2038
for unknown_file in unknown_nested_files:
2039
if unknown_file not in tree_delta.unversioned:
2040
tree_delta.unversioned.extend((unknown_file,))
2041
raise errors.BzrRemoveChangedFilesError(tree_delta)
2084
def backup(file_to_backup):
2085
backup_name = self.bzrdir._available_backup_name(file_to_backup)
2086
osutils.rename(abs_path, self.abspath(backup_name))
2087
return "removed %s (but kept a copy: %s)" % (file_to_backup,
2043
2090
# Build inv_delta and delete files where applicable,
2044
2091
# do this before any modifications to inventory.
2068
2115
len(os.listdir(abs_path)) > 0):
2070
2117
osutils.rmtree(abs_path)
2118
message = "deleted %s" % (f,)
2072
message = "%s is not an empty directory "\
2073
"and won't be deleted." % (f,)
2075
osutils.delete_any(abs_path)
2076
message = "deleted %s" % (f,)
2122
if f in files_to_backup:
2125
osutils.delete_any(abs_path)
2126
message = "deleted %s" % (f,)
2077
2127
elif message is not None:
2078
2128
# Only care if we haven't done anything yet.
2079
2129
message = "%s does not exist." % (f,)
2216
2266
_marker = object()
2218
2268
def update(self, change_reporter=None, possible_transports=None,
2219
revision=None, old_tip=_marker):
2269
revision=None, old_tip=_marker, show_base=False):
2220
2270
"""Update a working tree along its branch.
2222
2272
This will update the branch if its bound too, which means we have
2260
2310
if old_tip is self._marker:
2262
return self._update_tree(old_tip, change_reporter, revision)
2312
return self._update_tree(old_tip, change_reporter, revision, show_base)
2266
2316
@needs_tree_write_lock
2267
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2317
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2268
2319
"""Update a tree to the master branch.
2270
2321
:param old_tip: if supplied, the previous tip revision the branch,
2297
2348
other_tree = self.branch.repository.revision_tree(old_tip)
2298
2349
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2299
2350
base_tree, this_tree=self,
2300
change_reporter=change_reporter)
2351
change_reporter=change_reporter,
2352
show_base=show_base)
2301
2353
if nb_conflicts:
2302
2354
self.add_parent_tree((old_tip, other_tree))
2303
2355
trace.note('Rerun update after fixing the conflicts.')
added
removed
bzrlib/workingtree.py
