13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""WorkingTree object and friends.
19
19
A WorkingTree represents the editable working copy of a branch.
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files. The WorkingTree has an inventory
22
which is updated by these operations. A commit produces a
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files. The WorkingTree has an inventory
22
which is updated by these operations. A commit produces a
23
23
new revision based on the workingtree and its inventory.
25
25
At the moment every WorkingTree has its own branch. Remote
57
59
conflicts as _mod_conflicts,
66
67
revision as _mod_revision,
75
79
import bzrlib.branch
76
80
from bzrlib.transport import get_transport
77
from bzrlib.workingtree_4 import (
82
from bzrlib.workingtree_4 import WorkingTreeFormat4
84
85
from bzrlib import symbol_versioning
85
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
86
from bzrlib.lockable_files import LockableFiles
87
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
88
from bzrlib.lockable_files import LockableFiles, TransportLock
87
89
from bzrlib.lockdir import LockDir
88
90
import bzrlib.mutabletree
89
91
from bzrlib.mutabletree import needs_tree_write_lock
90
92
from bzrlib import osutils
91
93
from bzrlib.osutils import (
99
103
supports_executable,
101
from bzrlib.filters import filtered_input_file
102
105
from bzrlib.trace import mutter, note
103
106
from bzrlib.transport.local import LocalTransport
104
from bzrlib.progress import ProgressPhase
105
from bzrlib.revision import CURRENT_REVISION
107
from bzrlib.progress import DummyProgress, ProgressPhase
108
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
106
109
from bzrlib.rio import RioReader, rio_file, Stanza
107
from bzrlib.symbol_versioning import (
109
DEPRECATED_PARAMETER,
110
from bzrlib.symbol_versioning import (deprecated_passed,
113
DEPRECATED_PARAMETER,
113
117
MERGE_MODIFIED_HEADER_1 = "BZR merge-modified list format 1"
114
# TODO: Modifying the conflict objects or their type is currently nearly
115
# impossible as there is no clear relationship between the working tree format
116
# and the conflict list file format.
117
118
CONFLICT_HEADER_1 = "BZR conflict list format 1"
119
120
ERROR_PATH_NOT_FOUND = 3 # WindowsError errno code, equivalent to ENOENT
283
278
self._control_files.break_lock()
284
279
self.branch.break_lock()
286
def _get_check_refs(self):
287
"""Return the references needed to perform a check of this tree.
289
The default implementation returns no refs, and is only suitable for
290
trees that have no local caching and can commit on ghosts at any time.
292
:seealso: bzrlib.check for details about check_refs.
296
281
def requires_rich_root(self):
297
282
return self._format.requires_rich_root
299
284
def supports_tree_reference(self):
302
def supports_content_filtering(self):
303
return self._format.supports_content_filtering()
305
def supports_views(self):
306
return self.views.supports_views()
308
287
def _set_inventory(self, inv, dirty):
309
288
"""Set the internal cached inventory.
422
399
return self.branch.repository.revision_tree(revision_id)
423
400
except (errors.RevisionNotPresent, errors.NoSuchRevision):
424
401
# the basis tree *may* be a ghost or a low level error may have
425
# occurred. If the revision is present, its a problem, if its not
402
# occured. If the revision is present, its a problem, if its not
427
404
if self.branch.repository.has_revision(revision_id):
429
406
# the basis tree is a ghost so return an empty tree.
430
return self.branch.repository.revision_tree(
431
_mod_revision.NULL_REVISION)
407
return self.branch.repository.revision_tree(None)
433
409
def _cleanup(self):
434
410
self._flush_ignore_list_cache()
436
412
def relpath(self, path):
437
413
"""Return the local path portion from a given path.
439
The path may be absolute or relative. If its a relative path it is
415
The path may be absolute or relative. If its a relative path it is
440
416
interpreted relative to the python current working directory.
442
418
return osutils.relpath(self.basedir, path)
444
420
def has_filename(self, filename):
445
421
return osutils.lexists(self.abspath(filename))
447
def get_file(self, file_id, path=None, filtered=True):
448
return self.get_file_with_stat(file_id, path, filtered=filtered)[0]
450
def get_file_with_stat(self, file_id, path=None, filtered=True,
452
"""See Tree.get_file_with_stat."""
423
def get_file(self, file_id, path=None):
454
425
path = self.id2path(file_id)
455
file_obj = self.get_file_byname(path, filtered=False)
456
stat_value = _fstat(file_obj.fileno())
457
if filtered and self.supports_content_filtering():
458
filters = self._content_filter_stack(path)
459
file_obj = filtered_input_file(file_obj, filters)
460
return (file_obj, stat_value)
462
def get_file_text(self, file_id, path=None, filtered=True):
463
return self.get_file(file_id, path=path, filtered=filtered).read()
465
def get_file_byname(self, filename, filtered=True):
466
path = self.abspath(filename)
468
if filtered and self.supports_content_filtering():
469
filters = self._content_filter_stack(filename)
470
return filtered_input_file(f, filters)
474
def get_file_lines(self, file_id, path=None, filtered=True):
475
"""See Tree.get_file_lines()"""
476
file = self.get_file(file_id, path, filtered=filtered)
478
return file.readlines()
426
return self.get_file_byname(path)
428
def get_file_text(self, file_id):
429
return self.get_file(file_id).read()
431
def get_file_byname(self, filename):
432
return file(self.abspath(filename), 'rb')
483
435
def annotate_iter(self, file_id, default_revision=CURRENT_REVISION):
490
442
incorrectly attributed to CURRENT_REVISION (but after committing, the
491
443
attribution will be correct).
493
maybe_file_parent_keys = []
494
for parent_id in self.get_parent_ids():
496
parent_tree = self.revision_tree(parent_id)
497
except errors.NoSuchRevisionInTree:
498
parent_tree = self.branch.repository.revision_tree(parent_id)
499
parent_tree.lock_read()
501
if file_id not in parent_tree:
503
ie = parent_tree.inventory[file_id]
504
if ie.kind != 'file':
505
# Note: this is slightly unnecessary, because symlinks and
506
# directories have a "text" which is the empty text, and we
507
# know that won't mess up annotations. But it seems cleaner
509
parent_text_key = (file_id, ie.revision)
510
if parent_text_key not in maybe_file_parent_keys:
511
maybe_file_parent_keys.append(parent_text_key)
514
graph = _mod_graph.Graph(self.branch.repository.texts)
515
heads = graph.heads(maybe_file_parent_keys)
516
file_parent_keys = []
517
for key in maybe_file_parent_keys:
519
file_parent_keys.append(key)
521
# Now we have the parents of this content
522
annotator = self.branch.repository.texts.get_annotator()
523
text = self.get_file(file_id).read()
524
this_key =(file_id, default_revision)
525
annotator.add_special_text(this_key, file_parent_keys, text)
526
annotations = [(key[-1], line)
527
for key, line in annotator.annotate_flat(this_key)]
445
basis = self.basis_tree()
448
changes = self.iter_changes(basis, True, [self.id2path(file_id)],
449
require_versioned=True).next()
450
changed_content, kind = changes[2], changes[6]
451
if not changed_content:
452
return basis.annotate_iter(file_id)
456
if kind[0] != 'file':
459
old_lines = list(basis.annotate_iter(file_id))
461
for tree in self.branch.repository.revision_trees(
462
self.get_parent_ids()[1:]):
463
if file_id not in tree:
465
old.append(list(tree.annotate_iter(file_id)))
466
return annotate.reannotate(old, self.get_file(file_id).readlines(),
530
471
def _get_ancestors(self, default_revision):
531
472
ancestors = set([default_revision])
568
509
def clone(self, to_bzrdir, revision_id=None):
569
510
"""Duplicate this working tree into to_bzr, including all state.
571
512
Specifically modified files are kept as modified, but
572
513
ignored and unknown files are discarded.
574
515
If you want to make a new line of development, see bzrdir.sprout()
577
If not None, the cloned tree will have its last revision set to
578
revision, and difference between the source trees last revision
518
If not None, the cloned tree will have its last revision set to
519
revision, and and difference between the source trees last revision
579
520
and this one merged in.
581
522
# assumes the target bzr dir format is compatible.
582
result = to_bzrdir.create_workingtree()
523
result = self._format.initialize(to_bzrdir)
583
524
self.copy_content_into(result, revision_id)
765
704
kind = 'tree-reference'
766
705
return kind, None, None, None
767
706
elif kind == 'symlink':
768
target = osutils.readlink(abspath)
769
return ('symlink', None, None, target)
707
return ('symlink', None, None, os.readlink(abspath))
771
709
return (kind, None, None, None)
773
def _file_content_summary(self, path, stat_result):
774
size = stat_result.st_size
775
executable = self._is_executable_from_path_and_stat(path, stat_result)
776
# try for a stat cache lookup
777
return ('file', size, executable, self._sha_from_stat(
780
711
def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
781
712
"""Common ghost checking functionality from set_parent_*.
912
843
branch.last_revision().
914
845
from bzrlib.merge import Merger, Merge3Merger
915
merger = Merger(self.branch, this_tree=self)
916
# check that there are no local alterations
917
if not force and self.has_changes():
918
raise errors.UncommittedChanges(self)
919
if to_revision is None:
920
to_revision = _mod_revision.ensure_null(branch.last_revision())
921
merger.other_rev_id = to_revision
922
if _mod_revision.is_null(merger.other_rev_id):
923
raise errors.NoCommits(branch)
924
self.branch.fetch(branch, last_revision=merger.other_rev_id)
925
merger.other_basis = merger.other_rev_id
926
merger.other_tree = self.branch.repository.revision_tree(
928
merger.other_branch = branch
929
if from_revision is None:
932
merger.set_base_revision(from_revision, branch)
933
if merger.base_rev_id == merger.other_rev_id:
934
raise errors.PointlessMerge
935
merger.backup_files = False
936
if merge_type is None:
937
merger.merge_type = Merge3Merger
939
merger.merge_type = merge_type
940
merger.set_interesting_files(None)
941
merger.show_base = False
942
merger.reprocess = False
943
conflicts = merger.do_merge()
846
pb = bzrlib.ui.ui_factory.nested_progress_bar()
848
merger = Merger(self.branch, this_tree=self, pb=pb)
849
merger.pp = ProgressPhase("Merge phase", 5, pb)
850
merger.pp.next_phase()
851
# check that there are no
853
merger.check_basis(check_clean=True, require_commits=False)
854
if to_revision is None:
855
to_revision = _mod_revision.ensure_null(branch.last_revision())
856
merger.other_rev_id = to_revision
857
if _mod_revision.is_null(merger.other_rev_id):
858
raise errors.NoCommits(branch)
859
self.branch.fetch(branch, last_revision=merger.other_rev_id)
860
merger.other_basis = merger.other_rev_id
861
merger.other_tree = self.branch.repository.revision_tree(
863
merger.other_branch = branch
864
merger.pp.next_phase()
865
if from_revision is None:
868
merger.set_base_revision(from_revision, branch)
869
if merger.base_rev_id == merger.other_rev_id:
870
raise errors.PointlessMerge
871
merger.backup_files = False
872
if merge_type is None:
873
merger.merge_type = Merge3Merger
875
merger.merge_type = merge_type
876
merger.set_interesting_files(None)
877
merger.show_base = False
878
merger.reprocess = False
879
conflicts = merger.do_merge()
948
886
def merge_modified(self):
949
887
"""Return a dictionary of files modified by a merge.
951
The list is initialized by WorkingTree.set_merge_modified, which is
889
The list is initialized by WorkingTree.set_merge_modified, which is
952
890
typically called after we make some automatic updates to the tree
953
891
because of a merge.
959
897
hashfile = self._transport.get('merge-hashes')
960
898
except errors.NoSuchFile:
965
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
966
raise errors.MergeModifiedFormatError()
967
except StopIteration:
902
if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
968
903
raise errors.MergeModifiedFormatError()
969
for s in RioReader(hashfile):
970
# RioReader reads in Unicode, so convert file_ids back to utf8
971
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
972
if file_id not in self.inventory:
974
text_hash = s.get("hash")
975
if text_hash == self.get_file_sha1(file_id):
976
merge_hashes[file_id] = text_hash
904
except StopIteration:
905
raise errors.MergeModifiedFormatError()
906
for s in RioReader(hashfile):
907
# RioReader reads in Unicode, so convert file_ids back to utf8
908
file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
909
if file_id not in self.inventory:
911
text_hash = s.get("hash")
912
if text_hash == self.get_file_sha1(file_id):
913
merge_hashes[file_id] = text_hash
981
916
@needs_write_lock
982
917
def mkdir(self, path, file_id=None):
1125
1058
self._serialize(self._inventory, sio)
1127
1060
self._transport.put_file('inventory', sio,
1128
mode=self.bzrdir._get_file_mode())
1061
mode=self._control_files._file_mode)
1129
1062
self._inventory_is_modified = False
1131
1064
def _kind(self, relpath):
1132
1065
return osutils.file_kind(self.abspath(relpath))
1134
def list_files(self, include_root=False, from_dir=None, recursive=True):
1135
"""List all files as (path, class, kind, id, entry).
1067
def list_files(self, include_root=False):
1068
"""Recursively list all files as (path, class, kind, id, entry).
1137
1070
Lists, but does not descend into unversioned directories.
1138
1072
This does not include files that have been deleted in this
1139
tree. Skips the control directory.
1141
:param include_root: if True, do not return an entry for the root
1142
:param from_dir: start from this directory or None for the root
1143
:param recursive: whether to recurse into subdirectories or not
1075
Skips the control directory.
1145
1077
# list_files is an iterator, so @needs_read_lock doesn't work properly
1146
1078
# with it. So callers should be careful to always read_lock the tree.
1161
1093
fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
1163
1095
# directory file_id, relative path, absolute path, reverse sorted children
1164
if from_dir is not None:
1165
from_dir_id = inv.path2id(from_dir)
1166
if from_dir_id is None:
1167
# Directory not versioned
1169
from_dir_abspath = pathjoin(self.basedir, from_dir)
1171
from_dir_id = inv.root.file_id
1172
from_dir_abspath = self.basedir
1173
children = os.listdir(from_dir_abspath)
1096
children = os.listdir(self.basedir)
1174
1097
children.sort()
1175
# jam 20060527 The kernel sized tree seems equivalent whether we
1098
# jam 20060527 The kernel sized tree seems equivalent whether we
1176
1099
# use a deque and popleft to keep them sorted, or if we use a plain
1177
1100
# list and just reverse() them.
1178
1101
children = collections.deque(children)
1179
stack = [(from_dir_id, u'', from_dir_abspath, children)]
1102
stack = [(inv.root.file_id, u'', self.basedir, children)]
1181
1104
from_dir_id, from_dir_relpath, from_dir_abspath, children = stack[-1]
1236
1159
except KeyError:
1237
1160
yield fp[1:], c, fk, None, TreeEntry()
1240
1163
if fk != 'directory':
1243
# But do this child first if recursing down
1245
new_children = os.listdir(fap)
1247
new_children = collections.deque(new_children)
1248
stack.append((f_ie.file_id, fp, fap, new_children))
1249
# Break out of inner loop,
1250
# so that we start outer loop with child
1166
# But do this child first
1167
new_children = os.listdir(fap)
1169
new_children = collections.deque(new_children)
1170
stack.append((f_ie.file_id, fp, fap, new_children))
1171
# Break out of inner loop,
1172
# so that we start outer loop with child
1253
1175
# if we finished all children, pop it off the stack
1490
1411
from_tail = splitpath(from_rel)[-1]
1491
1412
from_id = inv.path2id(from_rel)
1492
1413
if from_id is None:
1493
# if file is missing in the inventory maybe it's in the basis_tree
1494
basis_tree = self.branch.basis_tree()
1495
from_id = basis_tree.path2id(from_rel)
1497
raise errors.BzrRenameFailedError(from_rel,to_rel,
1498
errors.NotVersionedError(path=str(from_rel)))
1499
# put entry back in the inventory so we can rename it
1500
from_entry = basis_tree.inventory[from_id].copy()
1503
from_entry = inv[from_id]
1414
raise errors.BzrRenameFailedError(from_rel,to_rel,
1415
errors.NotVersionedError(path=str(from_rel)))
1416
from_entry = inv[from_id]
1504
1417
from_parent_id = from_entry.parent_id
1505
1418
to_dir, to_tail = os.path.split(to_rel)
1506
1419
to_dir_id = inv.path2id(to_dir)
1568
1481
:raises: NoSuchId if any fileid is not currently versioned.
1570
1483
for file_id in file_ids:
1571
if file_id not in self._inventory:
1572
raise errors.NoSuchId(self, file_id)
1573
for file_id in file_ids:
1574
1484
if self._inventory.has_id(file_id):
1575
1485
self._inventory.remove_recursive_id(file_id)
1487
raise errors.NoSuchId(self, file_id)
1576
1488
if len(file_ids):
1577
# in the future this should just set a dirty bit to wait for the
1489
# in the future this should just set a dirty bit to wait for the
1578
1490
# final unlock. However, until all methods of workingtree start
1579
# with the current in -memory inventory rather than triggering
1491
# with the current in -memory inventory rather than triggering
1580
1492
# a read, it is more complex - we need to teach read_inventory
1581
1493
# to know when to read, and when to not read first... and possibly
1582
1494
# to save first when the in memory one may be corrupted.
1583
1495
# so for now, we just only write it if it is indeed dirty.
1584
1496
# - RBC 20060907
1585
1497
self._write_inventory(self._inventory)
1587
1499
def _iter_conflicts(self):
1588
1500
conflicted = set()
1589
1501
for info in self.list_files():
1598
1510
@needs_write_lock
1599
1511
def pull(self, source, overwrite=False, stop_revision=None,
1600
change_reporter=None, possible_transports=None, local=False):
1512
change_reporter=None, possible_transports=None):
1513
top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1601
1514
source.lock_read()
1516
pp = ProgressPhase("Pull phase", 2, top_pb)
1603
1518
old_revision_info = self.branch.last_revision_info()
1604
1519
basis_tree = self.basis_tree()
1605
1520
count = self.branch.pull(source, overwrite, stop_revision,
1606
possible_transports=possible_transports,
1521
possible_transports=possible_transports)
1608
1522
new_revision_info = self.branch.last_revision_info()
1609
1523
if new_revision_info != old_revision_info:
1610
1525
repository = self.branch.repository
1526
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1611
1527
basis_tree.lock_read()
1613
1529
new_basis_tree = self.branch.basis_tree()
1616
1532
new_basis_tree,
1618
1534
this_tree=self,
1620
1536
change_reporter=change_reporter)
1621
basis_root_id = basis_tree.get_root_id()
1622
new_root_id = new_basis_tree.get_root_id()
1623
if basis_root_id != new_root_id:
1624
self.set_root_id(new_root_id)
1537
if (basis_tree.inventory.root is None and
1538
new_basis_tree.inventory.root is not None):
1539
self.set_root_id(new_basis_tree.get_root_id())
1626
1542
basis_tree.unlock()
1627
1543
# TODO - dedup parents list with things merged by pull ?
1628
1544
# reuse the revisiontree we merged against to set the new
1630
1546
parent_trees = [(self.branch.last_revision(), new_basis_tree)]
1631
# we have to pull the merge trees out again, because
1632
# merge_inner has set the ids. - this corner is not yet
1547
# we have to pull the merge trees out again, because
1548
# merge_inner has set the ids. - this corner is not yet
1633
1549
# layered well enough to prevent double handling.
1634
1550
# XXX TODO: Fix the double handling: telling the tree about
1635
1551
# the already known parent data is wasteful.
1883
1794
# as commit already has that ready-to-use [while the format is the
1884
1795
# same, that is].
1886
# this double handles the inventory - unpack and repack -
1797
# this double handles the inventory - unpack and repack -
1887
1798
# but is easier to understand. We can/should put a conditional
1888
1799
# in here based on whether the inventory is in the latest format
1889
1800
# - perhaps we should repack all inventories on a repository
1891
1802
# the fast path is to copy the raw xml from the repository. If the
1892
# xml contains 'revision_id="', then we assume the right
1803
# xml contains 'revision_id="', then we assume the right
1893
1804
# revision_id is set. We must check for this full string, because a
1894
1805
# root node id can legitimately look like 'revision_id' but cannot
1895
1806
# contain a '"'.
1896
xml = self.branch.repository._get_inventory_xml(new_revision)
1807
xml = self.branch.repository.get_inventory_xml(new_revision)
1897
1808
firstline = xml.split('\n', 1)[0]
1898
if (not 'revision_id="' in firstline or
1809
if (not 'revision_id="' in firstline or
1899
1810
'format="7"' not in firstline):
1900
inv = self.branch.repository._serializer.read_inventory_from_string(
1811
inv = self.branch.repository.deserialise_inventory(
1902
1813
xml = self._create_basis_xml_from_inventory(new_revision, inv)
1903
1814
self._write_basis_inventory(xml)
1904
1815
except (errors.NoSuchRevision, errors.RevisionNotPresent):
1908
1819
"""Read the cached basis inventory."""
1909
1820
path = self._basis_inventory_name()
1910
1821
return self._transport.get_bytes(path)
1912
1823
@needs_read_lock
1913
1824
def read_working_inventory(self):
1914
1825
"""Read the working inventory.
1916
1827
:raises errors.InventoryModified: read_working_inventory will fail
1917
1828
when the current in memory inventory has been modified.
1919
# conceptually this should be an implementation detail of the tree.
1830
# conceptually this should be an implementation detail of the tree.
1920
1831
# XXX: Deprecate this.
1921
1832
# ElementTree does its own conversion from UTF-8, so open in
1923
1834
if self._inventory_is_modified:
1924
1835
raise errors.InventoryModified(self)
1925
f = self._transport.get('inventory')
1927
result = self._deserialize(f)
1836
result = self._deserialize(self._transport.get('inventory'))
1930
1837
self._set_inventory(result, dirty=False)
2175
2080
def unlock(self):
2176
2081
"""See Branch.unlock.
2178
2083
WorkingTree locking just uses the Branch locking facilities.
2179
2084
This is current because all working trees have an embedded branch
2180
2085
within them. IF in the future, we were to make branch data shareable
2181
between multiple working trees, i.e. via shared storage, then we
2086
between multiple working trees, i.e. via shared storage, then we
2182
2087
would probably want to lock both the local tree, and the branch.
2184
2089
raise NotImplementedError(self.unlock)
2188
def update(self, change_reporter=None, possible_transports=None,
2189
revision=None, old_tip=_marker):
2091
def update(self, change_reporter=None, possible_transports=None):
2190
2092
"""Update a working tree along its branch.
2192
2094
This will update the branch if its bound too, which means we have
2246
2141
# cant set that until we update the working trees last revision to be
2247
2142
# one from the new branch, because it will just get absorbed by the
2248
2143
# parent de-duplication logic.
2250
2145
# We MUST save it even if an error occurs, because otherwise the users
2251
2146
# local work is unreferenced and will appear to have been lost.
2255
2150
last_rev = self.get_parent_ids()[0]
2256
2151
except IndexError:
2257
2152
last_rev = _mod_revision.NULL_REVISION
2258
if revision is None:
2259
revision = self.branch.last_revision()
2261
if revision not in self.branch.revision_history():
2262
raise errors.NoSuchRevision(self.branch, 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()
2153
if last_rev != _mod_revision.ensure_null(self.branch.last_revision()):
2154
# merge tree state up to new branch tip.
2285
2155
basis = self.basis_tree()
2286
2156
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)
2158
to_tree = self.branch.basis_tree()
2159
if basis.inventory.root is None:
2160
self.set_root_id(to_tree.get_root_id())
2162
result += merge.merge_inner(
2167
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
2170
# TODO - dedup parents list with things merged by pull ?
2306
2171
# reuse the tree we've updated to to set the basis:
2307
parent_trees = [(revision, to_tree)]
2172
parent_trees = [(self.branch.last_revision(), to_tree)]
2308
2173
merges = self.get_parent_ids()[1:]
2309
2174
# Ideally we ask the tree for the trees here, that way the working
2310
# tree can decide whether to give us the entire tree or give us a
2175
# tree can decide whether to give us teh entire tree or give us a
2311
2176
# lazy initialised tree. dirstate for instance will have the trees
2312
2177
# in ram already, whereas a last-revision + basis-inventory tree
2313
2178
# will not, but also does not need them when setting parents.
2314
2179
for parent in merges:
2315
2180
parent_trees.append(
2316
2181
(parent, self.branch.repository.revision_tree(parent)))
2317
if not _mod_revision.is_null(old_tip):
2182
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2318
2183
parent_trees.append(
2319
2184
(old_tip, self.branch.repository.revision_tree(old_tip)))
2320
2185
self.set_parent_trees(parent_trees)
2321
2186
last_rev = parent_trees[0][0]
2188
# the working tree had the same last-revision as the master
2189
# branch did. We may still have pivot local work from the local
2190
# branch into old_tip:
2191
if (old_tip is not None and not _mod_revision.is_null(old_tip)):
2192
self.add_parent_tree_id(old_tip)
2193
if (old_tip is not None and not _mod_revision.is_null(old_tip)
2194
and old_tip != last_rev):
2195
# our last revision was not the prior branch last revision
2196
# and we have converted that last revision to a pending merge.
2197
# base is somewhere between the branch tip now
2198
# and the now pending merge
2200
# Since we just modified the working tree and inventory, flush out
2201
# the current state, before we modify it again.
2202
# TODO: jam 20070214 WorkingTree3 doesn't require this, dirstate
2203
# requires it only because TreeTransform directly munges the
2204
# inventory and calls tree._write_inventory(). Ultimately we
2205
# should be able to remove this extra flush.
2207
graph = self.branch.repository.get_graph()
2208
base_rev_id = graph.find_unique_lca(self.branch.last_revision(),
2210
base_tree = self.branch.repository.revision_tree(base_rev_id)
2211
other_tree = self.branch.repository.revision_tree(old_tip)
2212
result += merge.merge_inner(
2217
change_reporter=change_reporter)
2324
2220
def _write_hashcache_if_dirty(self):
2325
2221
"""Write out the hashcache if it is dirty."""
2848
2714
"""See WorkingTreeFormat.get_format_description()."""
2849
2715
return "Working tree format 2"
2851
def _stub_initialize_on_transport(self, transport, file_mode):
2852
"""Workaround: create control files for a remote working tree.
2717
def _stub_initialize_remote(self, branch):
2718
"""As a special workaround create critical control files for a remote working tree.
2854
2720
This ensures that it can later be updated and dealt with locally,
2855
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2721
since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
2856
2722
no working tree. (See bug #43064).
2858
2724
sio = StringIO()
2859
inv = inventory.Inventory()
2860
2726
xml5.serializer_v5.write_inventory(inv, sio, working=True)
2862
transport.put_file('inventory', sio, file_mode)
2863
transport.put_bytes('pending-merges', '', file_mode)
2728
branch._transport.put_file('inventory', sio,
2729
mode=branch.control_files._file_mode)
2730
branch._transport.put_bytes('pending-merges', '',
2731
mode=branch.control_files._file_mode)
2865
2734
def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
2866
2735
accelerator_tree=None, hardlink=False):
added
removed
bzrlib/workingtree.py
