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)
33
39
from cStringIO import StringIO
78
84
from bzrlib import symbol_versioning
79
85
from bzrlib.decorators import needs_read_lock, needs_write_lock
80
from bzrlib.lock import LogicalLockResult
81
86
from bzrlib.lockable_files import LockableFiles
82
87
from bzrlib.lockdir import LockDir
83
88
import bzrlib.mutabletree
96
101
from bzrlib.filters import filtered_input_file
97
102
from bzrlib.trace import mutter, note
98
103
from bzrlib.transport.local import LocalTransport
104
from bzrlib.progress import ProgressPhase
99
105
from bzrlib.revision import CURRENT_REVISION
100
106
from bzrlib.rio import RioReader, rio_file, Stanza
101
107
from bzrlib.symbol_versioning import (
107
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
108
# TODO: Modifying the conflict objects or their type is currently nearly
109
# impossible as there is no clear relationship between the working tree format
110
# and the conflict list file format.
111
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
113
116
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
248
250
self._rules_searcher = None
249
251
self.views = self._make_views()
252
def user_transport(self):
253
return self.bzrdir.user_transport
256
def control_transport(self):
257
return self._transport
259
253
def _detect_case_handling(self):
260
254
wt_trans = self.bzrdir.get_workingtree_transport(None)
1097
1091
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1098
1092
if tree_transport.base != branch_transport.base:
1099
1093
tree_bzrdir = format.initialize_on_transport(tree_transport)
1100
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1101
target_branch=new_branch)
1094
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1103
1096
tree_bzrdir = branch_bzrdir
1104
1097
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1142
1135
This does not include files that have been deleted in this
1143
1136
tree. Skips the control directory.
1145
:param include_root: if True, return an entry for the root
1138
:param include_root: if True, do not return an entry for the root
1146
1139
:param from_dir: start from this directory or None for the root
1147
1140
:param recursive: whether to recurse into subdirectories or not
1735
1728
r"""Check whether the filename matches an ignore pattern.
1737
1730
Patterns containing '/' or '\' need to match the whole path;
1738
others match against only the last component. Patterns starting
1739
with '!' are ignore exceptions. Exceptions take precedence
1740
over regular patterns and cause the filename to not be ignored.
1731
others match against only the last component.
1742
1733
If the file is ignored, returns the pattern which caused it to
1743
1734
be ignored, otherwise None. So this can simply be used as a
1744
1735
boolean if desired."""
1745
1736
if getattr(self, '_ignoreglobster', None) is None:
1746
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1737
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1747
1738
return self._ignoreglobster.match(filename)
1749
1740
def kind(self, file_id):
1799
1790
raise errors.ObjectNotLocked(self)
1801
1792
def lock_read(self):
1802
"""Lock the tree for reading.
1804
This also locks the branch, and can be unlocked via self.unlock().
1806
:return: A bzrlib.lock.LogicalLockResult.
1793
"""See Branch.lock_read, and WorkingTree.unlock."""
1808
1794
if not self.is_locked():
1809
1795
self._reset_data()
1810
1796
self.branch.lock_read()
1812
self._control_files.lock_read()
1813
return LogicalLockResult(self.unlock)
1798
return self._control_files.lock_read()
1815
1800
self.branch.unlock()
1818
1803
def lock_tree_write(self):
1819
"""See MutableTree.lock_tree_write, and WorkingTree.unlock.
1821
:return: A bzrlib.lock.LogicalLockResult.
1804
"""See MutableTree.lock_tree_write, and WorkingTree.unlock."""
1823
1805
if not self.is_locked():
1824
1806
self._reset_data()
1825
1807
self.branch.lock_read()
1827
self._control_files.lock_write()
1828
return LogicalLockResult(self.unlock)
1809
return self._control_files.lock_write()
1830
1811
self.branch.unlock()
1833
1814
def lock_write(self):
1834
"""See MutableTree.lock_write, and WorkingTree.unlock.
1836
:return: A bzrlib.lock.LogicalLockResult.
1815
"""See MutableTree.lock_write, and WorkingTree.unlock."""
1838
1816
if not self.is_locked():
1839
1817
self._reset_data()
1840
1818
self.branch.lock_write()
1842
self._control_files.lock_write()
1843
return LogicalLockResult(self.unlock)
1820
return self._control_files.lock_write()
1845
1822
self.branch.unlock()
1911
1888
# revision_id is set. We must check for this full string, because a
1912
1889
# root node id can legitimately look like 'revision_id' but cannot
1913
1890
# contain a '"'.
1914
xml = self.branch.repository._get_inventory_xml(new_revision)
1891
xml = self.branch.repository.get_inventory_xml(new_revision)
1915
1892
firstline = xml.split('\n', 1)[0]
1916
1893
if (not 'revision_id="' in firstline or
1917
1894
'format="7"' not in firstline):
1971
1948
def recurse_directory_to_add_files(directory):
1972
1949
# Recurse directory and add all files
1973
1950
# so we can check if they have changed.
1974
for parent_info, file_infos in self.walkdirs(directory):
1951
for parent_info, file_infos in\
1952
self.walkdirs(directory):
1975
1953
for relpath, basename, kind, lstat, fileid, kind in file_infos:
1976
1954
# Is it versioned or ignored?
1977
1955
if self.path2id(relpath) or self.is_ignored(relpath):
2012
1990
# ... but not ignored
2013
1991
has_changed_files = True
2015
elif (content_change and (kind[1] is not None) and
2016
osutils.is_inside_any(files, path[1])):
2017
# Versioned and changed, but not deleted, and still
2018
# in one of the dirs to be deleted.
1993
elif content_change and (kind[1] is not None):
1994
# Versioned and changed, but not deleted
2019
1995
has_changed_files = True
2269
2245
# We MUST save it even if an error occurs, because otherwise the users
2270
2246
# local work is unreferenced and will appear to have been lost.
2274
2250
last_rev = self.get_parent_ids()[0]
2275
2251
except IndexError:
2276
2252
last_rev = _mod_revision.NULL_REVISION
2277
2253
if revision is None:
2278
2254
revision = self.branch.last_revision()
2280
old_tip = old_tip or _mod_revision.NULL_REVISION
2282
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2283
# the branch we are bound to was updated
2284
# merge those changes in first
2285
base_tree = self.basis_tree()
2286
other_tree = self.branch.repository.revision_tree(old_tip)
2287
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2288
base_tree, this_tree=self,
2289
change_reporter=change_reporter)
2291
self.add_parent_tree((old_tip, other_tree))
2292
trace.note('Rerun update after fixing the conflicts.')
2256
if revision not in self.branch.revision_history():
2257
raise errors.NoSuchRevision(self.branch, revision)
2295
2258
if last_rev != _mod_revision.ensure_null(revision):
2296
# the working tree is up to date with the branch
2297
# we can merge the specified revision from master
2298
to_tree = self.branch.repository.revision_tree(revision)
2299
to_root_id = to_tree.get_root_id()
2259
# merge tree state up to specified revision.
2301
2260
basis = self.basis_tree()
2302
2261
basis.lock_read()
2263
to_tree = self.branch.repository.revision_tree(revision)
2264
to_root_id = to_tree.get_root_id()
2304
2265
if (basis.inventory.root is None
2305
2266
or basis.inventory.root.file_id != to_root_id):
2306
2267
self.set_root_id(to_root_id)
2269
result += merge.merge_inner(
2274
change_reporter=change_reporter)
2275
self.set_last_revision(revision)
2311
# determine the branch point
2312
graph = self.branch.repository.get_graph()
2313
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2315
base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2319
change_reporter=change_reporter)
2320
self.set_last_revision(revision)
2321
2278
# TODO - dedup parents list with things merged by pull ?
2322
2279
# reuse the tree we've updated to to set the basis:
2323
2280
parent_trees = [(revision, to_tree)]
2330
2287
for parent in merges:
2331
2288
parent_trees.append(
2332
2289
(parent, self.branch.repository.revision_tree(parent)))
2333
if not _mod_revision.is_null(old_tip):
2290
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2334
2291
parent_trees.append(
2335
2292
(old_tip, self.branch.repository.revision_tree(old_tip)))
2336
2293
self.set_parent_trees(parent_trees)
2337
2294
last_rev = parent_trees[0][0]
2296
# the working tree had the same last-revision as the master
2297
# branch did. We may still have pivot local work from the local
2298
# branch into old_tip:
2299
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2300
self.add_parent_tree_id(old_tip)
2301
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2302
and old_tip != last_rev):
2303
# our last revision was not the prior branch last revision
2304
# and we have converted that last revision to a pending merge.
2305
# base is somewhere between the branch tip now
2306
# and the now pending merge
2308
# Since we just modified the working tree and inventory, flush out
2309
# the current state, before we modify it again.
2310
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2311
# requires it only because TreeTransform directly munges the
2312
# inventory and calls tree._write_inventory(). Ultimately we
2313
# should be able to remove this extra flush.
2315
graph = self.branch.repository.get_graph()
2316
base_rev_id = graph.find_unique_lca(revision, old_tip)
2317
base_tree = self.branch.repository.revision_tree(base_rev_id)
2318
other_tree = self.branch.repository.revision_tree(old_tip)
2319
result += merge.merge_inner(
2324
change_reporter=change_reporter)
2340
2327
def _write_hashcache_if_dirty(self):
2341
2328
"""Write out the hashcache if it is dirty."""
added
removed
bzrlib/workingtree.py
