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 (
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)
914
909
branch.last_revision().
916
911
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()
912
pb = ui.ui_factory.nested_progress_bar()
914
merger = Merger(self.branch, this_tree=self, pb=pb)
915
merger.pp = ProgressPhase("Merge phase", 5, pb)
916
merger.pp.next_phase()
917
# check that there are no local alterations
918
if not force and self.has_changes():
919
raise errors.UncommittedChanges(self)
920
if to_revision is None:
921
to_revision = _mod_revision.ensure_null(branch.last_revision())
922
merger.other_rev_id = to_revision
923
if _mod_revision.is_null(merger.other_rev_id):
924
raise errors.NoCommits(branch)
925
self.branch.fetch(branch, last_revision=merger.other_rev_id)
926
merger.other_basis = merger.other_rev_id
927
merger.other_tree = self.branch.repository.revision_tree(
929
merger.other_branch = branch
930
merger.pp.next_phase()
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()
1096
1098
tree_transport = self.bzrdir.root_transport.clone(sub_path)
1097
1099
if tree_transport.base != branch_transport.base:
1098
1100
tree_bzrdir = format.initialize_on_transport(tree_transport)
1099
branch.BranchReferenceFormat().initialize(tree_bzrdir,
1100
target_branch=new_branch)
1101
branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1102
1103
tree_bzrdir = branch_bzrdir
1103
1104
wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)
1141
1142
This does not include files that have been deleted in this
1142
1143
tree. Skips the control directory.
1144
:param include_root: if True, return an entry for the root
1145
:param include_root: if True, do not return an entry for the root
1145
1146
:param from_dir: start from this directory or None for the root
1146
1147
:param recursive: whether to recurse into subdirectories or not
1601
1602
@needs_write_lock
1602
1603
def pull(self, source, overwrite=False, stop_revision=None,
1603
1604
change_reporter=None, possible_transports=None, local=False):
1605
top_pb = ui.ui_factory.nested_progress_bar()
1604
1606
source.lock_read()
1608
pp = ProgressPhase("Pull phase", 2, top_pb)
1606
1610
old_revision_info = self.branch.last_revision_info()
1607
1611
basis_tree = self.basis_tree()
1608
1612
count = self.branch.pull(source, overwrite, stop_revision,
1619
1625
new_basis_tree,
1621
1627
this_tree=self,
1623
1629
change_reporter=change_reporter)
1624
1630
basis_root_id = basis_tree.get_root_id()
1625
1631
new_root_id = new_basis_tree.get_root_id()
1626
1632
if basis_root_id != new_root_id:
1627
1633
self.set_root_id(new_root_id)
1629
1636
basis_tree.unlock()
1630
1637
# TODO - dedup parents list with things merged by pull ?
1631
1638
# reuse the revisiontree we merged against to set the new
1734
1742
r"""Check whether the filename matches an ignore pattern.
1736
1744
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.
1745
others match against only the last component.
1741
1747
If the file is ignored, returns the pattern which caused it to
1742
1748
be ignored, otherwise None. So this can simply be used as a
1743
1749
boolean if desired."""
1744
1750
if getattr(self, '_ignoreglobster', None) is None:
1745
self._ignoreglobster = globbing.ExceptionGlobster(self.get_ignore_list())
1751
self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1746
1752
return self._ignoreglobster.match(filename)
1748
1754
def kind(self, file_id):
1896
1902
# revision_id is set. We must check for this full string, because a
1897
1903
# root node id can legitimately look like 'revision_id' but cannot
1898
1904
# contain a '"'.
1899
xml = self.branch.repository._get_inventory_xml(new_revision)
1905
xml = self.branch.repository.get_inventory_xml(new_revision)
1900
1906
firstline = xml.split('\n', 1)[0]
1901
1907
if (not 'revision_id="' in firstline or
1902
1908
'format="7"' not in firstline):
2059
2065
@needs_tree_write_lock
2060
2066
def revert(self, filenames=None, old_tree=None, backups=True,
2061
pb=None, report_changes=False):
2067
pb=DummyProgress(), report_changes=False):
2062
2068
from bzrlib.conflicts import resolve
2063
2069
if filenames == []:
2064
2070
filenames = None
2253
2259
# We MUST save it even if an error occurs, because otherwise the users
2254
2260
# local work is unreferenced and will appear to have been lost.
2258
2264
last_rev = self.get_parent_ids()[0]
2259
2265
except IndexError:
2260
2266
last_rev = _mod_revision.NULL_REVISION
2261
2267
if revision is None:
2262
2268
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.')
2270
if revision not in self.branch.revision_history():
2271
raise errors.NoSuchRevision(self.branch, revision)
2279
2272
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()
2273
# merge tree state up to specified revision.
2285
2274
basis = self.basis_tree()
2286
2275
basis.lock_read()
2277
to_tree = self.branch.repository.revision_tree(revision)
2278
to_root_id = to_tree.get_root_id()
2288
2279
if (basis.inventory.root is None
2289
2280
or basis.inventory.root.file_id != to_root_id):
2290
2281
self.set_root_id(to_root_id)
2283
result += merge.merge_inner(
2288
change_reporter=change_reporter)
2289
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
2292
# TODO - dedup parents list with things merged by pull ?
2306
2293
# reuse the tree we've updated to to set the basis:
2307
2294
parent_trees = [(revision, to_tree)]
2314
2301
for parent in merges:
2315
2302
parent_trees.append(
2316
2303
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
2304
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2305
parent_trees.append(
2319
2306
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2307
self.set_parent_trees(parent_trees)
2321
2308
last_rev = parent_trees[0][0]
2310
# the working tree had the same last-revision as the master
2311
# branch did. We may still have pivot local work from the local
2312
# branch into old_tip:
2313
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2314
self.add_parent_tree_id(old_tip)
2315
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2316
and old_tip != last_rev):
2317
# our last revision was not the prior branch last revision
2318
# and we have converted that last revision to a pending merge.
2319
# base is somewhere between the branch tip now
2320
# and the now pending merge
2322
# Since we just modified the working tree and inventory, flush out
2323
# the current state, before we modify it again.
2324
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2325
# requires it only because TreeTransform directly munges the
2326
# inventory and calls tree._write_inventory(). Ultimately we
2327
# should be able to remove this extra flush.
2329
graph = self.branch.repository.get_graph()
2330
base_rev_id = graph.find_unique_lca(revision, old_tip)
2331
base_tree = self.branch.repository.revision_tree(base_rev_id)
2332
other_tree = self.branch.repository.revision_tree(old_tip)
2333
result += merge.merge_inner(
2338
change_reporter=change_reporter)
2324
2341
def _write_hashcache_if_dirty(self):
2325
2342
"""Write out the hashcache if it is dirty."""
added
removed
bzrlib/workingtree.py
