29
29
WorkingTree.open(dir).
32
# TODO: Give the workingtree sole responsibility for the working inventory;
33
# remove the variable and references to it from the branch. This may require
34
# updating the commit code so as to update the inventory within the working
35
# copy, and making sure there's only one WorkingTree for any directory on disk.
36
# At the moment they may alias the inventory and have old copies of it in
37
# memory. (Now done? -- mbp 20060309)
39
33
from cStringIO import StringIO
101
96
from bzrlib.filters import filtered_input_file
102
97
from bzrlib.trace import mutter, note
103
98
from bzrlib.transport.local import LocalTransport
104
from bzrlib.progress import ProgressPhase
105
99
from bzrlib.revision import CURRENT_REVISION
106
100
from bzrlib.rio import RioReader, rio_file, Stanza
107
101
from bzrlib.symbol_versioning import (
345
351
path = osutils.getcwd()
346
352
control, relpath = bzrdir.BzrDir.open_containing(path)
348
353
return control.open_workingtree(), relpath
356
def open_containing_paths(file_list, default_directory=None,
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
if default_directory is None:
366
default_directory = u'.'
367
# recommended replacement for builtins.internal_tree_files
368
if file_list is None or len(file_list) == 0:
369
tree = WorkingTree.open_containing(default_directory)[0]
370
# XXX: doesn't really belong here, and seems to have the strange
371
# side effect of making it return a bunch of files, not the whole
372
# tree -- mbp 20100716
373
if tree.supports_views() and apply_view:
374
view_files = tree.views.lookup_view()
376
file_list = view_files
377
view_str = views.view_display_str(view_files)
378
note("Ignoring files outside view. View is %s" % view_str)
379
return tree, file_list
380
if default_directory == u'.':
383
seed = default_directory
384
file_list = [osutils.pathjoin(default_directory, f)
386
tree = WorkingTree.open_containing(seed)[0]
387
return tree, tree.safe_relpath_files(file_list, canonicalize,
388
apply_view=apply_view)
390
def safe_relpath_files(self, file_list, canonicalize=True, apply_view=True):
391
"""Convert file_list into a list of relpaths in tree.
393
:param self: A tree to operate on.
394
:param file_list: A list of user provided paths or None.
395
:param apply_view: if True and a view is set, apply it or check that
396
specified files are within it
397
:return: A list of relative paths.
398
:raises errors.PathNotChild: When a provided path is in a different self
401
if file_list is None:
403
if self.supports_views() and apply_view:
404
view_files = self.views.lookup_view()
408
# self.relpath exists as a "thunk" to osutils, but canonical_relpath
409
# doesn't - fix that up here before we enter the loop.
411
fixer = lambda p: osutils.canonical_relpath(self.basedir, p)
414
for filename in file_list:
415
relpath = fixer(osutils.dereference_path(filename))
416
if view_files and not osutils.is_inside_any(view_files, relpath):
417
raise errors.FileOutsideView(filename, view_files)
418
new_list.append(relpath)
351
422
def open_downlevel(path=None):
352
423
"""Open an unsupported working tree.
366
437
return True, None
368
439
return True, tree
369
transport = get_transport(location)
370
iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
440
t = transport.get_transport(location)
441
iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
371
442
list_current=list_current)
372
return [t for t in iterator if t is not None]
443
return [tr for tr in iterator if tr is not None]
374
445
# should be deprecated - this is slow and in any case treating them as a
375
446
# container is (we now know) bad style -- mbp 20070302
460
531
return (file_obj, stat_value)
462
533
def get_file_text(self, file_id, path=None, filtered=True):
463
return self.get_file(file_id, path=path, filtered=filtered).read()
534
my_file = self.get_file(file_id, path=path, filtered=filtered)
536
return my_file.read()
465
540
def get_file_byname(self, filename, filtered=True):
466
541
path = self.abspath(filename)
521
596
# Now we have the parents of this content
522
597
annotator = self.branch.repository.texts.get_annotator()
523
text = self.get_file(file_id).read()
598
text = self.get_file_text(file_id)
524
599
this_key =(file_id, default_revision)
525
600
annotator.add_special_text(this_key, file_parent_keys, text)
526
601
annotations = [(key[-1], line)
1094
1169
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1095
1170
if tree_transport.base != branch_transport.base:
1096
1171
tree_bzrdir = format.initialize_on_transport(tree_transport)
1097
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1172
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1173
target_branch=new_branch)
1099
1175
tree_bzrdir = branch_bzrdir
1100
1176
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1138
1214
This does not include files that have been deleted in this
1139
1215
tree. Skips the control directory.
1141
:param include_root: if True, do not return an entry for the root
1217
:param include_root: if True, return an entry for the root
1142
1218
:param from_dir: start from this directory or None for the root
1143
1219
:param recursive: whether to recurse into subdirectories or not
1199
1275
# absolute path
1200
1276
fap = from_dir_abspath + '/' + f
1202
f_ie = inv.get_child(from_dir_id, f)
1278
dir_ie = inv[from_dir_id]
1279
if dir_ie.kind == 'directory':
1280
f_ie = dir_ie.children.get(f)
1205
1285
elif self.is_ignored(fp[1:]):
1208
# we may not have found this file, because of a unicode issue
1288
# we may not have found this file, because of a unicode
1289
# issue, or because the directory was actually a symlink.
1209
1290
f_norm, can_access = osutils.normalized_filename(f)
1210
1291
if f == f_norm or not can_access:
1211
1292
# No change, so treat this file normally
1295
1376
# check for deprecated use of signature
1296
1377
if to_dir is None:
1297
to_dir = kwargs.get('to_name', None)
1299
raise TypeError('You must supply a target directory')
1301
symbol_versioning.warn('The parameter to_name was deprecated'
1302
' in version 0.13. Use to_dir instead',
1378
raise TypeError('You must supply a target directory')
1305
1379
# check destination directory
1306
1380
if isinstance(from_paths, basestring):
1307
1381
raise ValueError()
1598
1672
@needs_write_lock
1599
1673
def pull(self, source, overwrite=False, stop_revision=None,
1600
change_reporter=None, possible_transports=None, local=False):
1674
change_reporter=None, possible_transports=None, local=False,
1601
1676
source.lock_read()
1603
1678
old_revision_info = self.branch.last_revision_info()
1795
1871
raise errors.ObjectNotLocked(self)
1797
1873
def lock_read(self):
1798
"""See Branch.lock_read, and WorkingTree.unlock."""
1874
"""Lock the tree for reading.
1876
This also locks the branch, and can be unlocked via self.unlock().
1878
:return: A bzrlib.lock.LogicalLockResult.
1799
1880
if not self.is_locked():
1800
1881
self._reset_data()
1801
1882
self.branch.lock_read()
1803
return self._control_files.lock_read()
1884
self._control_files.lock_read()
1885
return LogicalLockResult(self.unlock)
1805
1887
self.branch.unlock()
1808
1890
def lock_tree_write(self):
1809
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1891
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1893
:return: A bzrlib.lock.LogicalLockResult.
1810
1895
if not self.is_locked():
1811
1896
self._reset_data()
1812
1897
self.branch.lock_read()
1814
return self._control_files.lock_write()
1899
self._control_files.lock_write()
1900
return LogicalLockResult(self.unlock)
1816
1902
self.branch.unlock()
1819
1905
def lock_write(self):
1820
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1906
"""See MutableTree.lock_write, and WorkingTree.unlock.
1908
:return: A bzrlib.lock.LogicalLockResult.
1821
1910
if not self.is_locked():
1822
1911
self._reset_data()
1823
1912
self.branch.lock_write()
1825
return self._control_files.lock_write()
1914
self._control_files.lock_write()
1915
return LogicalLockResult(self.unlock)
1827
1917
self.branch.unlock()
2038
all_files = set() # specified and nested files
1949
2039
unknown_nested_files=set()
1950
2040
if to_file is None:
1951
2041
to_file = sys.stdout
2043
files_to_backup = []
1953
2045
def recurse_directory_to_add_files(directory):
1954
2046
# Recurse directory and add all files
1955
2047
# so we can check if they have changed.
1956
for parent_info, file_infos in\
1957
self.walkdirs(directory):
2048
for parent_info, file_infos in self.walkdirs(directory):
1958
2049
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1959
2050
# Is it versioned or ignored?
1960
if self.path2id(relpath) or self.is_ignored(relpath):
2051
if self.path2id(relpath):
1961
2052
# Add nested content for deletion.
1962
new_files.add(relpath)
2053
all_files.add(relpath)
1964
# Files which are not versioned and not ignored
2055
# Files which are not versioned
1965
2056
# should be treated as unknown.
1966
unknown_nested_files.add((relpath, None, kind))
2057
files_to_backup.append(relpath)
1968
2059
for filename in files:
1969
2060
# Get file name into canonical form.
1970
2061
abspath = self.abspath(filename)
1971
2062
filename = self.relpath(abspath)
1972
2063
if len(filename) > 0:
1973
new_files.add(filename)
2064
all_files.add(filename)
1974
2065
recurse_directory_to_add_files(filename)
1976
files = list(new_files)
2067
files = list(all_files)
1978
2069
if len(files) == 0:
1979
2070
return # nothing to do
1984
2075
# Bail out if we are going to delete files we shouldn't
1985
2076
if not keep_files and not force:
1986
has_changed_files = len(unknown_nested_files) > 0
1987
if not has_changed_files:
1988
for (file_id, path, content_change, versioned, parent_id, name,
1989
kind, executable) in self.iter_changes(self.basis_tree(),
1990
include_unchanged=True, require_versioned=False,
1991
want_unversioned=True, specific_files=files):
1992
if versioned == (False, False):
1993
# The record is unknown ...
1994
if not self.is_ignored(path[1]):
1995
# ... but not ignored
1996
has_changed_files = True
1998
elif content_change and (kind[1] is not None):
1999
# Versioned and changed, but not deleted
2000
has_changed_files = True
2077
for (file_id, path, content_change, versioned, parent_id, name,
2078
kind, executable) in self.iter_changes(self.basis_tree(),
2079
include_unchanged=True, require_versioned=False,
2080
want_unversioned=True, specific_files=files):
2081
if versioned[0] == False:
2082
# The record is unknown or newly added
2083
files_to_backup.append(path[1])
2084
elif (content_change and (kind[1] is not None) and
2085
osutils.is_inside_any(files, path[1])):
2086
# Versioned and changed, but not deleted, and still
2087
# in one of the dirs to be deleted.
2088
files_to_backup.append(path[1])
2003
if has_changed_files:
2004
# Make delta show ALL applicable changes in error message.
2005
tree_delta = self.changes_from(self.basis_tree(),
2006
require_versioned=False, want_unversioned=True,
2007
specific_files=files)
2008
for unknown_file in unknown_nested_files:
2009
if unknown_file not in tree_delta.unversioned:
2010
tree_delta.unversioned.extend((unknown_file,))
2011
raise errors.BzrRemoveChangedFilesError(tree_delta)
2090
def backup(file_to_backup):
2091
backup_name = self.bzrdir._available_backup_name(file_to_backup)
2092
osutils.rename(abs_path, self.abspath(backup_name))
2093
return "removed %s (but kept a copy: %s)" % (file_to_backup,
2013
2096
# Build inv_delta and delete files where applicable,
2014
2097
# do this before any modifications to inventory.
2038
2121
len(os.listdir(abs_path)) > 0):
2040
2123
osutils.rmtree(abs_path)
2124
message = "deleted %s" % (f,)
2042
message = "%s is not an empty directory "\
2043
"and won't be deleted." % (f,)
2045
osutils.delete_any(abs_path)
2046
message = "deleted %s" % (f,)
2128
if f in files_to_backup:
2131
osutils.delete_any(abs_path)
2132
message = "deleted %s" % (f,)
2047
2133
elif message is not None:
2048
2134
# Only care if we haven't done anything yet.
2049
2135
message = "%s does not exist." % (f,)
2186
2272
_marker = object()
2188
2274
def update(self, change_reporter=None, possible_transports=None,
2189
revision=None, old_tip=_marker):
2275
revision=None, old_tip=_marker, show_base=False):
2190
2276
"""Update a working tree along its branch.
2192
2278
This will update the branch if its bound too, which means we have
2230
2316
if old_tip is self._marker:
2232
return self._update_tree(old_tip, change_reporter, revision)
2318
return self._update_tree(old_tip, change_reporter, revision, show_base)
2236
2322
@needs_tree_write_lock
2237
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2323
def _update_tree(self, old_tip=None, change_reporter=None, revision=None,
2238
2325
"""Update a tree to the master branch.
2240
2327
:param old_tip: if supplied, the previous tip revision the branch,
2270
2354
other_tree = self.branch.repository.revision_tree(old_tip)
2271
2355
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
2356
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2357
change_reporter=change_reporter,
2358
show_base=show_base)
2274
2359
if nb_conflicts:
2275
2360
self.add_parent_tree((old_tip, other_tree))
2276
2361
trace.note('Rerun update after fixing the conflicts.')
2301
2386
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2302
2387
this_tree=self,
2303
change_reporter=change_reporter)
2388
change_reporter=change_reporter,
2389
show_base=show_base)
2304
2390
self.set_last_revision(revision)
2305
2391
# TODO - dedup parents list with things merged by pull ?
2306
2392
# reuse the tree we've updated to to set the basis:
added
removed
bzrlib/workingtree.py
