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 DummyProgress, 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 (
914
912
branch.last_revision().
916
914
from bzrlib.merge import Merger, Merge3Merger
917
merger = Merger(self.branch, this_tree=self)
918
# check that there are no local alterations
919
if not force and self.has_changes():
920
raise errors.UncommittedChanges(self)
921
if to_revision is None:
922
to_revision = _mod_revision.ensure_null(branch.last_revision())
923
merger.other_rev_id = to_revision
924
if _mod_revision.is_null(merger.other_rev_id):
925
raise errors.NoCommits(branch)
926
self.branch.fetch(branch, last_revision=merger.other_rev_id)
927
merger.other_basis = merger.other_rev_id
928
merger.other_tree = self.branch.repository.revision_tree(
930
merger.other_branch = branch
931
if from_revision is None:
934
merger.set_base_revision(from_revision, branch)
935
if merger.base_rev_id == merger.other_rev_id:
936
raise errors.PointlessMerge
937
merger.backup_files = False
938
if merge_type is None:
939
merger.merge_type = Merge3Merger
941
merger.merge_type = merge_type
942
merger.set_interesting_files(None)
943
merger.show_base = False
944
merger.reprocess = False
945
conflicts = merger.do_merge()
915
pb = ui.ui_factory.nested_progress_bar()
917
merger = Merger(self.branch, this_tree=self, pb=pb)
918
merger.pp = ProgressPhase("Merge phase", 5, pb)
919
merger.pp.next_phase()
920
# check that there are no local alterations
921
if not force and self.has_changes():
922
raise errors.UncommittedChanges(self)
923
if to_revision is None:
924
to_revision = _mod_revision.ensure_null(branch.last_revision())
925
merger.other_rev_id = to_revision
926
if _mod_revision.is_null(merger.other_rev_id):
927
raise errors.NoCommits(branch)
928
self.branch.fetch(branch, last_revision=merger.other_rev_id)
929
merger.other_basis = merger.other_rev_id
930
merger.other_tree = self.branch.repository.revision_tree(
932
merger.other_branch = branch
933
merger.pp.next_phase()
934
if from_revision is None:
937
merger.set_base_revision(from_revision, branch)
938
if merger.base_rev_id == merger.other_rev_id:
939
raise errors.PointlessMerge
940
merger.backup_files = False
941
if merge_type is None:
942
merger.merge_type = Merge3Merger
944
merger.merge_type = merge_type
945
merger.set_interesting_files(None)
946
merger.show_base = False
947
merger.reprocess = False
948
conflicts = merger.do_merge()
1096
1101
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1102
if tree_transport.base != branch_transport.base:
1098
1103
tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
target_branch=new_branch)
1104
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1106
tree_bzrdir = branch_bzrdir
1103
1107
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1145
This does not include files that have been deleted in this
1142
1146
tree. Skips the control directory.
1144
:param include_root: if True, return an entry for the root
1148
:param include_root: if True, do not return an entry for the root
1145
1149
:param from_dir: start from this directory or None for the root
1146
1150
:param recursive: whether to recurse into subdirectories or not
1601
1605
@needs_write_lock
1602
1606
def pull(self, source, overwrite=False, stop_revision=None,
1603
1607
change_reporter=None, possible_transports=None, local=False):
1608
top_pb = ui.ui_factory.nested_progress_bar()
1604
1609
source.lock_read()
1611
pp = ProgressPhase("Pull phase", 2, top_pb)
1606
1613
old_revision_info = self.branch.last_revision_info()
1607
1614
basis_tree = self.basis_tree()
1608
1615
count = self.branch.pull(source, overwrite, stop_revision,
1619
1628
new_basis_tree,
1621
1630
this_tree=self,
1623
1632
change_reporter=change_reporter)
1624
basis_root_id = basis_tree.get_root_id()
1625
new_root_id = new_basis_tree.get_root_id()
1626
if basis_root_id != new_root_id:
1627
self.set_root_id(new_root_id)
1633
if (basis_tree.inventory.root is None and
1634
new_basis_tree.inventory.root is not None):
1635
self.set_root_id(new_basis_tree.get_root_id())
1629
1638
basis_tree.unlock()
1630
1639
# TODO - dedup parents list with things merged by pull ?
1631
1640
# reuse the revisiontree we merged against to set the new
1734
1744
r"""Check whether the filename matches an ignore pattern.
1736
1746
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.
1747
others match against only the last component.
1741
1749
If the file is ignored, returns the pattern which caused it to
1742
1750
be ignored, otherwise None. So this can simply be used as a
1743
1751
boolean if desired."""
1744
1752
if getattr(self, '_ignoreglobster', None) is None:
1745
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1753
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1754
return self._ignoreglobster.match(filename)
1748
1756
def kind(self, file_id):
1896
1904
# revision_id is set. We must check for this full string, because a
1897
1905
# root node id can legitimately look like 'revision_id' but cannot
1898
1906
# contain a '"'.
1899
xml = self.branch.repository._get_inventory_xml(new_revision)
1907
xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1908
firstline = xml.split('\n', 1)[0]
1901
1909
if (not 'revision_id="' in firstline or
1902
1910
'format="7"' not in firstline):
2187
2195
raise NotImplementedError(self.unlock)
2191
def update(self, change_reporter=None, possible_transports=None,
2192
revision=None, old_tip=_marker):
2197
def update(self, change_reporter=None, possible_transports=None):
2193
2198
"""Update a working tree along its branch.
2195
2200
This will update the branch if its bound too, which means we have
2213
2218
- Merge current state -> basis tree of the master w.r.t. the old tree
2215
2220
- Do a 'normal' merge of the old branch basis if it is relevant.
2217
:param revision: The target revision to update to. Must be in the
2219
:param old_tip: If branch.update() has already been run, the value it
2220
returned (old tip of the branch or None). _marker is used
2223
2222
if self.branch.get_bound_location() is not None:
2224
2223
self.lock_write()
2225
update_branch = (old_tip is self._marker)
2224
update_branch = True
2227
2226
self.lock_tree_write()
2228
2227
update_branch = False
2230
2229
if update_branch:
2231
2230
old_tip = self.branch.update(possible_transports)
2233
if old_tip is self._marker:
2235
return self._update_tree(old_tip, change_reporter, revision)
2233
return self._update_tree(old_tip, change_reporter)
2239
2237
@needs_tree_write_lock
2240
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2238
def _update_tree(self, old_tip=None, change_reporter=None):
2241
2239
"""Update a tree to the master branch.
2243
2241
:param old_tip: if supplied, the previous tip revision the branch,
2253
2251
# We MUST save it even if an error occurs, because otherwise the users
2254
2252
# local work is unreferenced and will appear to have been lost.
2258
2256
last_rev = self.get_parent_ids()[0]
2259
2257
except IndexError:
2260
2258
last_rev = _mod_revision.NULL_REVISION
2261
if revision is None:
2262
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.')
2279
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
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2260
# merge tree state up to new branch tip.
2285
2261
basis = self.basis_tree()
2286
2262
basis.lock_read()
2288
if (basis.inventory.root is None
2289
or basis.inventory.root.file_id != to_root_id):
2290
self.set_root_id(to_root_id)
2264
to_tree = self.branch.basis_tree()
2265
if basis.inventory.root is None:
2266
self.set_root_id(to_tree.get_root_id())
2268
result += merge.merge_inner(
2273
change_reporter=change_reporter)
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
2276
# TODO - dedup parents list with things merged by pull ?
2306
2277
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
2278
parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2279
merges = self.get_parent_ids()[1:]
2309
2280
# Ideally we ask the tree for the trees here, that way the working
2310
2281
# tree can decide whether to give us the entire tree or give us a
2314
2285
for parent in merges:
2315
2286
parent_trees.append(
2316
2287
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
2288
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2289
parent_trees.append(
2319
2290
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2291
self.set_parent_trees(parent_trees)
2321
2292
last_rev = parent_trees[0][0]
2294
# the working tree had the same last-revision as the master
2295
# branch did. We may still have pivot local work from the local
2296
# branch into old_tip:
2297
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2298
self.add_parent_tree_id(old_tip)
2299
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2300
and old_tip != last_rev):
2301
# our last revision was not the prior branch last revision
2302
# and we have converted that last revision to a pending merge.
2303
# base is somewhere between the branch tip now
2304
# and the now pending merge
2306
# Since we just modified the working tree and inventory, flush out
2307
# the current state, before we modify it again.
2308
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2309
# requires it only because TreeTransform directly munges the
2310
# inventory and calls tree._write_inventory(). Ultimately we
2311
# should be able to remove this extra flush.
2313
graph = self.branch.repository.get_graph()
2314
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2316
base_tree = self.branch.repository.revision_tree(base_rev_id)
2317
other_tree = self.branch.repository.revision_tree(old_tip)
2318
result += merge.merge_inner(
2323
change_reporter=change_reporter)
2324
2326
def _write_hashcache_if_dirty(self):
2325
2327
"""Write out the hashcache if it is dirty."""
added
removed
bzrlib/workingtree.py
