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
95
101
from bzrlib.filters import filtered_input_file
96
102
from bzrlib.trace import mutter, note
97
103
from bzrlib.transport.local import LocalTransport
104
from bzrlib.progress import ProgressPhase
98
105
from bzrlib.revision import CURRENT_REVISION
99
106
from bzrlib.rio import RioReader, rio_file, Stanza
100
107
from bzrlib.symbol_versioning import (
106
113
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
107
# TODO: Modifying the conflict objects or their type is currently nearly
108
# impossible as there is no clear relationship between the working tree format
109
# and the conflict list file format.
110
114
CONFLICT_HEADER_1 = "BZR conflict list format 1"
112
116
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
247
250
self._rules_searcher = None
248
251
self.views = self._make_views()
251
def user_transport(self):
252
return self.bzrdir.user_transport
255
def control_transport(self):
256
return self._transport
258
253
def _detect_case_handling(self):
259
254
wt_trans = self.bzrdir.get_workingtree_transport(None)
1096
1091
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1092
if tree_transport.base != branch_transport.base:
1098
1093
tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
target_branch=new_branch)
1094
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1096
tree_bzrdir = branch_bzrdir
1103
1097
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1135
This does not include files that have been deleted in this
1142
1136
tree. Skips the control directory.
1144
: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
1145
1139
:param from_dir: start from this directory or None for the root
1146
1140
:param recursive: whether to recurse into subdirectories or not
1734
1728
r"""Check whether the filename matches an ignore pattern.
1736
1730
Patterns containing '/' or '\' need to match the whole path;
1737
others match against only the last component. Patterns starting
1738
with '!' are ignore exceptions. Exceptions take precedence
1739
over regular patterns and cause the filename to not be ignored.
1731
others match against only the last component.
1741
1733
If the file is ignored, returns the pattern which caused it to
1742
1734
be ignored, otherwise None. So this can simply be used as a
1743
1735
boolean if desired."""
1744
1736
if getattr(self, '_ignoreglobster', None) is None:
1745
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1737
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1738
return self._ignoreglobster.match(filename)
1748
1740
def kind(self, file_id):
1896
1888
# revision_id is set. We must check for this full string, because a
1897
1889
# root node id can legitimately look like 'revision_id' but cannot
1898
1890
# contain a '"'.
1899
xml = self.branch.repository._get_inventory_xml(new_revision)
1891
xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1892
firstline = xml.split('\n', 1)[0]
1901
1893
if (not 'revision_id="' in firstline or
1902
1894
'format="7"' not in firstline):
2253
2245
# We MUST save it even if an error occurs, because otherwise the users
2254
2246
# local work is unreferenced and will appear to have been lost.
2258
2250
last_rev = self.get_parent_ids()[0]
2259
2251
except IndexError:
2260
2252
last_rev = _mod_revision.NULL_REVISION
2261
2253
if revision is None:
2262
2254
revision = self.branch.last_revision()
2264
old_tip = old_tip or _mod_revision.NULL_REVISION
2266
if not _mod_revision.is_null(old_tip) and old_tip != last_rev:
2267
# the branch we are bound to was updated
2268
# merge those changes in first
2269
base_tree = self.basis_tree()
2270
other_tree = self.branch.repository.revision_tree(old_tip)
2271
nb_conflicts = merge.merge_inner(self.branch, other_tree,
2272
base_tree, this_tree=self,
2273
change_reporter=change_reporter)
2275
self.add_parent_tree((old_tip, other_tree))
2276
trace.note('Rerun update after fixing the conflicts.')
2256
if revision not in self.branch.revision_history():
2257
raise errors.NoSuchRevision(self.branch, revision)
2279
2258
if last_rev != _mod_revision.ensure_null(revision):
2280
# the working tree is up to date with the branch
2281
# we can merge the specified revision from master
2282
to_tree = self.branch.repository.revision_tree(revision)
2283
to_root_id = to_tree.get_root_id()
2259
# merge tree state up to specified revision.
2285
2260
basis = self.basis_tree()
2286
2261
basis.lock_read()
2263
to_tree = self.branch.repository.revision_tree(revision)
2264
to_root_id = to_tree.get_root_id()
2288
2265
if (basis.inventory.root is None
2289
2266
or basis.inventory.root.file_id != to_root_id):
2290
2267
self.set_root_id(to_root_id)
2269
result += merge.merge_inner(
2274
change_reporter=change_reporter)
2275
self.set_last_revision(revision)
2295
# determine the branch point
2296
graph = self.branch.repository.get_graph()
2297
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2299
base_tree = self.branch.repository.revision_tree(base_rev_id)
2301
nb_conflicts = merge.merge_inner(self.branch, to_tree, base_tree,
2303
change_reporter=change_reporter)
2304
self.set_last_revision(revision)
2305
2278
# TODO - dedup parents list with things merged by pull ?
2306
2279
# reuse the tree we've updated to to set the basis:
2307
2280
parent_trees = [(revision, to_tree)]
2314
2287
for parent in merges:
2315
2288
parent_trees.append(
2316
2289
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
2290
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2291
parent_trees.append(
2319
2292
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2293
self.set_parent_trees(parent_trees)
2321
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)
2324
2327
def _write_hashcache_if_dirty(self):
2325
2328
"""Write out the hashcache if it is dirty."""
added
removed
bzrlib/workingtree.py
