29
29
from bzrlib.lazy_import import lazy_import
30
30
lazy_import(globals(), """
31
from bisect import bisect_left
33
from copy import deepcopy
42
35
from bzrlib import (
45
conflicts as _mod_conflicts,
55
43
revision as _mod_revision,
65
49
import bzrlib.branch
66
from bzrlib.transport import get_transport
70
from bzrlib import symbol_versioning
71
53
from bzrlib.decorators import needs_read_lock, needs_write_lock
72
54
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
73
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, entry_factory
55
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
74
56
import bzrlib.mutabletree
75
57
from bzrlib.mutabletree import needs_tree_write_lock
76
58
from bzrlib.osutils import (
86
from bzrlib.trace import mutter, note
65
from bzrlib.trace import mutter
87
66
from bzrlib.transport.local import LocalTransport
88
67
from bzrlib.tree import InterTree
89
from bzrlib.progress import DummyProgress, ProgressPhase
90
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
91
from bzrlib.rio import RioReader, rio_file, Stanza
92
from bzrlib.symbol_versioning import (deprecated_passed,
97
68
from bzrlib.tree import Tree
98
69
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
1051
1022
def set_last_revision(self, new_revision):
1052
1023
"""Change the last revision in the working tree."""
1053
1024
parents = self.get_parent_ids()
1054
if new_revision in (NULL_REVISION, None):
1025
if new_revision in (_mod_revision.NULL_REVISION, None):
1055
1026
if len(parents) >= 2:
1056
1027
raise AssertionError(
1057
1028
"setting the last parent to none with a pending merge is "
1403
1374
wt.lock_tree_write()
1405
1376
self._init_custom_control_files(wt)
1406
if revision_id in (None, NULL_REVISION):
1377
if revision_id in (None, _mod_revision.NULL_REVISION):
1407
1378
if branch.repository.supports_rich_root():
1408
1379
wt._set_root_id(generate_ids.gen_root_id())
1421
1392
if basis is None:
1422
1393
basis = branch.repository.revision_tree(revision_id)
1423
if revision_id == NULL_REVISION:
1394
if revision_id == _mod_revision.NULL_REVISION:
1424
1395
parents_list = []
1426
1397
parents_list = [(revision_id, basis)]
2016
1987
require_versioned, want_unversioned=want_unversioned)
2017
1988
parent_ids = self.target.get_parent_ids()
2018
1989
if not (self.source._revision_id in parent_ids
2019
or self.source._revision_id == NULL_REVISION):
1990
or self.source._revision_id == _mod_revision.NULL_REVISION):
2020
1991
raise AssertionError(
2021
1992
"revision {%s} is not stored in {%s}, but %s "
2022
1993
"can only be used for trees stored in the dirstate"
2023
1994
% (self.source._revision_id, self.target, self.iter_changes))
2024
1995
target_index = 0
2025
if self.source._revision_id == NULL_REVISION:
1996
if self.source._revision_id == _mod_revision.NULL_REVISION:
2026
1997
source_index = None
2027
1998
indices = (target_index,)
2090
2061
(revisiontree.RevisionTree, DirStateRevisionTree)):
2092
2063
# the source revid must be in the target dirstate
2093
if not (source._revision_id == NULL_REVISION or
2064
if not (source._revision_id == _mod_revision.NULL_REVISION or
2094
2065
source._revision_id in target.get_parent_ids()):
2095
2066
# TODO: what about ghosts? it may well need to
2096
2067
# check for them explicitly.