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
102
from bzrlib.filters import filtered_input_file
96
103
from bzrlib.trace import mutter, note
97
104
from bzrlib.transport.local import LocalTransport
105
from bzrlib.progress import DummyProgress, ProgressPhase
98
106
from bzrlib.revision import CURRENT_REVISION
99
107
from bzrlib.rio import RioReader, rio_file, Stanza
100
108
from bzrlib.symbol_versioning import (
462
458
return (file_obj, stat_value)
464
460
def get_file_text(self, file_id, path=None, filtered=True):
465
return self.get_file(file_id, path=path, filtered=filtered).read()
461
f = self.get_file(file_id, path=path, filtered=filtered)
467
467
def get_file_byname(self, filename, filtered=True):
468
468
path = self.abspath(filename)
523
523
# Now we have the parents of this content
524
524
annotator = self.branch.repository.texts.get_annotator()
525
text = self.get_file(file_id).read()
525
text = self.get_file_text(file_id)
526
526
this_key =(file_id, default_revision)
527
527
annotator.add_special_text(this_key, file_parent_keys, text)
528
528
annotations = [(key[-1], line)
549
549
parents = [last_rev]
551
merges_bytes = self._transport.get_bytes('pending-merges')
551
merges_file = self._transport.get('pending-merges')
552
552
except errors.NoSuchFile:
555
for l in osutils.split_lines(merges_bytes):
556
revision_id = l.rstrip('\n')
557
parents.append(revision_id)
556
for l in merges_file.readlines():
557
revision_id = l.rstrip('\n')
558
parents.append(revision_id)
641
644
def _is_executable_from_path_and_stat_from_basis(self, path, stat_result):
642
645
file_id = self.path2id(path)
644
# For unversioned files on win32, we just assume they are not
647
646
return self._inventory[file_id].executable
649
648
def _is_executable_from_path_and_stat_from_stat(self, path, stat_result):
905
904
@needs_write_lock # because merge pulls data into the branch.
906
905
def merge_from_branch(self, branch, to_revision=None, from_revision=None,
907
merge_type=None, force=False):
908
907
"""Merge from a branch into this working tree.
910
909
:param branch: The branch to merge from.
914
913
branch.last_revision().
916
915
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()
916
pb = ui.ui_factory.nested_progress_bar()
918
merger = Merger(self.branch, this_tree=self, pb=pb)
919
merger.pp = ProgressPhase("Merge phase", 5, pb)
920
merger.pp.next_phase()
921
# check that there are no
923
merger.check_basis(check_clean=True, require_commits=False)
924
if to_revision is None:
925
to_revision = _mod_revision.ensure_null(branch.last_revision())
926
merger.other_rev_id = to_revision
927
if _mod_revision.is_null(merger.other_rev_id):
928
raise errors.NoCommits(branch)
929
self.branch.fetch(branch, last_revision=merger.other_rev_id)
930
merger.other_basis = merger.other_rev_id
931
merger.other_tree = self.branch.repository.revision_tree(
933
merger.other_branch = branch
934
merger.pp.next_phase()
935
if from_revision is None:
938
merger.set_base_revision(from_revision, branch)
939
if merger.base_rev_id == merger.other_rev_id:
940
raise errors.PointlessMerge
941
merger.backup_files = False
942
if merge_type is None:
943
merger.merge_type = Merge3Merger
945
merger.merge_type = merge_type
946
merger.set_interesting_files(None)
947
merger.show_base = False
948
merger.reprocess = False
949
conflicts = merger.do_merge()
1096
1102
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1103
if tree_transport.base != branch_transport.base:
1098
1104
tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
target_branch=new_branch)
1105
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1107
tree_bzrdir = branch_bzrdir
1103
1108
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1146
This does not include files that have been deleted in this
1142
1147
tree. Skips the control directory.
1144
:param include_root: if True, return an entry for the root
1149
:param include_root: if True, do not return an entry for the root
1145
1150
:param from_dir: start from this directory or None for the root
1146
1151
:param recursive: whether to recurse into subdirectories or not
1601
1606
@needs_write_lock
1602
1607
def pull(self, source, overwrite=False, stop_revision=None,
1603
1608
change_reporter=None, possible_transports=None, local=False):
1609
top_pb = ui.ui_factory.nested_progress_bar()
1604
1610
source.lock_read()
1612
pp = ProgressPhase("Pull phase", 2, top_pb)
1606
1614
old_revision_info = self.branch.last_revision_info()
1607
1615
basis_tree = self.basis_tree()
1608
1616
count = self.branch.pull(source, overwrite, stop_revision,
1619
1629
new_basis_tree,
1621
1631
this_tree=self,
1623
1633
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)
1634
if (basis_tree.inventory.root is None and
1635
new_basis_tree.inventory.root is not None):
1636
self.set_root_id(new_basis_tree.get_root_id())
1629
1639
basis_tree.unlock()
1630
1640
# TODO - dedup parents list with things merged by pull ?
1631
1641
# reuse the revisiontree we merged against to set the new
1734
1745
r"""Check whether the filename matches an ignore pattern.
1736
1747
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.
1748
others match against only the last component.
1741
1750
If the file is ignored, returns the pattern which caused it to
1742
1751
be ignored, otherwise None. So this can simply be used as a
1743
1752
boolean if desired."""
1744
1753
if getattr(self, '_ignoreglobster', None) is None:
1745
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1754
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1755
return self._ignoreglobster.match(filename)
1748
1757
def kind(self, file_id):
1896
1901
# revision_id is set. We must check for this full string, because a
1897
1902
# root node id can legitimately look like 'revision_id' but cannot
1898
1903
# contain a '"'.
1899
xml = self.branch.repository._get_inventory_xml(new_revision)
1904
xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1905
firstline = xml.split('\n', 1)[0]
1901
1906
if (not 'revision_id="' in firstline or
1902
1907
'format="7"' not in firstline):
2027
2026
new_status = 'I'
2029
2028
new_status = '?'
2030
# XXX: Really should be a more abstract reporter interface
2031
kind_ch = osutils.kind_marker(self.kind(fid))
2032
to_file.write(new_status + ' ' + f + kind_ch + '\n')
2029
textui.show_status(new_status, self.kind(fid), f,
2033
2031
# Unversion file
2034
2032
inv_delta.append((f, None, fid, None))
2035
2033
message = "removed %s" % (f,)
2187
2185
raise NotImplementedError(self.unlock)
2191
def update(self, change_reporter=None, possible_transports=None,
2192
revision=None, old_tip=_marker):
2187
def update(self, change_reporter=None, possible_transports=None):
2193
2188
"""Update a working tree along its branch.
2195
2190
This will update the branch if its bound too, which means we have
2213
2208
- Merge current state -> basis tree of the master w.r.t. the old tree
2215
2210
- 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
2212
if self.branch.get_bound_location() is not None:
2224
2213
self.lock_write()
2225
update_branch = (old_tip is self._marker)
2214
update_branch = True
2227
2216
self.lock_tree_write()
2228
2217
update_branch = False
2230
2219
if update_branch:
2231
2220
old_tip = self.branch.update(possible_transports)
2233
if old_tip is self._marker:
2235
return self._update_tree(old_tip, change_reporter, revision)
2223
return self._update_tree(old_tip, change_reporter)
2239
2227
@needs_tree_write_lock
2240
def _update_tree(self, old_tip=None, change_reporter=None, revision=None):
2228
def _update_tree(self, old_tip=None, change_reporter=None):
2241
2229
"""Update a tree to the master branch.
2243
2231
:param old_tip: if supplied, the previous tip revision the branch,
2253
2241
# We MUST save it even if an error occurs, because otherwise the users
2254
2242
# local work is unreferenced and will appear to have been lost.
2258
2246
last_rev = self.get_parent_ids()[0]
2259
2247
except IndexError:
2260
2248
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()
2249
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2250
# merge tree state up to new branch tip.
2285
2251
basis = self.basis_tree()
2286
2252
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)
2254
to_tree = self.branch.basis_tree()
2255
if basis.inventory.root is None:
2256
self.set_root_id(to_tree.get_root_id())
2258
result += merge.merge_inner(
2263
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
2266
# TODO - dedup parents list with things merged by pull ?
2306
2267
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
2268
parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2269
merges = self.get_parent_ids()[1:]
2309
2270
# Ideally we ask the tree for the trees here, that way the working
2310
2271
# tree can decide whether to give us the entire tree or give us a
2314
2275
for parent in merges:
2315
2276
parent_trees.append(
2316
2277
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
2278
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2279
parent_trees.append(
2319
2280
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2281
self.set_parent_trees(parent_trees)
2321
2282
last_rev = parent_trees[0][0]
2284
# the working tree had the same last-revision as the master
2285
# branch did. We may still have pivot local work from the local
2286
# branch into old_tip:
2287
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2288
self.add_parent_tree_id(old_tip)
2289
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2290
and old_tip != last_rev):
2291
# our last revision was not the prior branch last revision
2292
# and we have converted that last revision to a pending merge.
2293
# base is somewhere between the branch tip now
2294
# and the now pending merge
2296
# Since we just modified the working tree and inventory, flush out
2297
# the current state, before we modify it again.
2298
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2299
# requires it only because TreeTransform directly munges the
2300
# inventory and calls tree._write_inventory(). Ultimately we
2301
# should be able to remove this extra flush.
2303
graph = self.branch.repository.get_graph()
2304
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2306
base_tree = self.branch.repository.revision_tree(base_rev_id)
2307
other_tree = self.branch.repository.revision_tree(old_tip)
2308
result += merge.merge_inner(
2313
change_reporter=change_reporter)
2324
2316
def _write_hashcache_if_dirty(self):
2325
2317
"""Write out the hashcache if it is dirty."""