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
716
687
from_entry = self._get_entry(path=from_rel)
717
688
if from_entry == (None, None):
718
689
raise errors.BzrMoveFailedError(from_rel,to_dir,
719
errors.NotVersionedError(path=str(from_rel)))
690
errors.NotVersionedError(path=from_rel))
721
692
from_id = from_entry[0][2]
722
693
to_rel = pathjoin(to_dir, from_tail)
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 "
1224
1195
# just forget the whole block.
1225
1196
entry_index = 0
1226
1197
while entry_index < len(block[1]):
1227
# Mark this file id as having been removed
1228
1198
entry = block[1][entry_index]
1229
ids_to_unversion.discard(entry[0][2])
1230
if (entry[1][0][0] in 'ar' # don't remove absent or renamed
1232
or not state._make_absent(entry)):
1199
if entry[1][0][0] in 'ar':
1200
# don't remove absent or renamed entries
1233
1201
entry_index += 1
1203
# Mark this file id as having been removed
1204
ids_to_unversion.discard(entry[0][2])
1205
if not state._make_absent(entry):
1206
# The block has not shrunk.
1234
1208
# go to the next block. (At the moment we dont delete empty
1236
1210
block_index += 1
1403
1377
wt.lock_tree_write()
1405
1379
self._init_custom_control_files(wt)
1406
if revision_id in (None, NULL_REVISION):
1380
if revision_id in (None, _mod_revision.NULL_REVISION):
1407
1381
if branch.repository.supports_rich_root():
1408
1382
wt._set_root_id(generate_ids.gen_root_id())
1421
1395
if basis is None:
1422
1396
basis = branch.repository.revision_tree(revision_id)
1423
if revision_id == NULL_REVISION:
1397
if revision_id == _mod_revision.NULL_REVISION:
1424
1398
parents_list = []
1426
1400
parents_list = [(revision_id, basis)]
2016
1990
require_versioned, want_unversioned=want_unversioned)
2017
1991
parent_ids = self.target.get_parent_ids()
2018
1992
if not (self.source._revision_id in parent_ids
2019
or self.source._revision_id == NULL_REVISION):
1993
or self.source._revision_id == _mod_revision.NULL_REVISION):
2020
1994
raise AssertionError(
2021
1995
"revision {%s} is not stored in {%s}, but %s "
2022
1996
"can only be used for trees stored in the dirstate"
2023
1997
% (self.source._revision_id, self.target, self.iter_changes))
2024
1998
target_index = 0
2025
if self.source._revision_id == NULL_REVISION:
1999
if self.source._revision_id == _mod_revision.NULL_REVISION:
2026
2000
source_index = None
2027
2001
indices = (target_index,)
2049
2023
state._read_dirblocks_if_needed()
2050
2024
if require_versioned:
2051
2025
# -- check all supplied paths are versioned in a search tree. --
2052
all_versioned = True
2053
2027
for path in specific_files:
2054
2028
path_entries = state._entries_for_path(path)
2055
2029
if not path_entries:
2056
2030
# this specified path is not present at all: error
2057
all_versioned = False
2031
not_versioned.append(path)
2059
2033
found_versioned = False
2060
2034
# for each id at this path
2061
2035
for entry in path_entries:
2068
2042
if not found_versioned:
2069
2043
# none of the indexes was not 'absent' at all ids for this
2071
all_versioned = False
2073
if not all_versioned:
2074
raise errors.PathsNotVersionedError(specific_files)
2045
not_versioned.append(path)
2046
if len(not_versioned) > 0:
2047
raise errors.PathsNotVersionedError(not_versioned)
2075
2048
# -- remove redundancy in supplied specific_files to prevent over-scanning --
2076
2049
search_specific_files = osutils.minimum_path_selection(specific_files)
2091
2064
(revisiontree.RevisionTree, DirStateRevisionTree)):
2093
2066
# the source revid must be in the target dirstate
2094
if not (source._revision_id == NULL_REVISION or
2067
if not (source._revision_id == _mod_revision.NULL_REVISION or
2095
2068
source._revision_id in target.get_parent_ids()):
2096
2069
# TODO: what about ghosts? it may well need to
2097
2070
# check for them explicitly.
added
removed
bzrlib/workingtree_4.py
