/brz/remove-bazaar : revision 6679

130

"""See MutableTree._add."""

131

state = self.current_dirstate()

132

for f, file_id, kind in zip(files, ids, kinds):

133

f = f.strip('/')

133

f = f.strip(b'/')

134

if self.path2id(f):

135

# special case tree root handling.

136

if f == '' and self.path2id(f) == ROOT_ID:

137

state.set_path_id('', generate_ids.gen_file_id(f))

136

if f == b'' and self.path2id(f) == ROOT_ID:

137

state.set_path_id(b'', generate_ids.gen_file_id(f))

138

continue

139

if file_id is None:

140

file_id = generate_ids.gen_file_id(f)

141

# deliberately add the file with no cached stat or sha1

142

# - on the first access it will be gathered, and we can

143

# always change this once tests are all passing.

144

state.add(f, file_id, kind, None, '')

144

state.add(f, file_id, kind, None, b'')

145

self._make_dirty(reset_inventory=True)

146

147

def _get_check_refs(self):

312

state._read_dirblocks_if_needed()

313

root_key, current_entry = self._get_entry(path='')

314

current_id = root_key[2]

315

if not (current_entry[0][0] == 'd'): # directory

315

if not (current_entry[0][0] == b'd'): # directory

316

raise AssertionError(current_entry)

317

inv = Inventory(root_id=current_id)

318

# Turn some things into local variables

332

continue

333

for key, entry in block[1]:

334

minikind, link_or_sha1, size, executable, stat = entry[0]

335

if minikind in ('a', 'r'): # absent, relocated

335

if minikind in (b'a', b'r'): # absent, relocated

336

# a parent tree only entry

337

continue

338

name = key[1]

350

#inv_entry.text_sha1 = sha1

351

elif kind == 'directory':

352

# add this entry to the parent map.

353

parent_ies[(dirname + '/' + name).strip('/')] = inv_entry

353

parent_ies[(dirname + b'/' + name).strip(b'/')] = inv_entry

354

elif kind == 'tree-reference':

355

if not self._repo_supports_tree_reference:

356

raise errors.UnsupportedOperation(

408

raise

409

link_or_sha1 = dirstate.update_entry(state, entry, file_abspath,

410

stat_value=stat_value)

411

if entry[1][0][0] == 'f':

411

if entry[1][0][0] == b'f':

412

if link_or_sha1 is None:

413

file_obj, statvalue = self.get_file_with_stat(file_id, path)

414

try:

509

self._must_be_locked()

510

result = set()

511

for key, tree_details in self.current_dirstate()._iter_entries():

512

if tree_details[0][0] in ('a', 'r'): # relocated

512

if tree_details[0][0] in (b'a', b'r'): # relocated

513

continue

514

result.add(key[2])

515

return result

523

"""

524

result = []

525

for key, tree_details in self.current_dirstate()._iter_entries():

526

if tree_details[0][0] in ('a', 'r'): # absent, relocated

526

if tree_details[0][0] in (b'a', b'r'): # absent, relocated

527

# not relevant to the working tree

528

continue

529

path = pathjoin(self.basedir, key[0].decode('utf8'), key[1].decode('utf8'))

537

# return

538

return

539

for key, tree_details in self.current_dirstate()._iter_entries():

540

if tree_details[0][0] in ('a', 'r'): # absent, relocated

540

if tree_details[0][0] in (b'a', b'r'): # absent, relocated

541

# not relevant to the working tree

542

continue

543

if not key[1]:

577

if (self._repo_supports_tree_reference and kind == 'directory'):

578

entry = self._get_entry(path=relpath)

579

if entry[1] is not None:

580

if entry[1][0][0] == 't':

580

if entry[1][0][0] == b't':

581

kind = 'tree-reference'

582

return kind

583

804

to_key=to_key,

805

to_path_utf8=to_rel_utf8)

806

807

if minikind == 'd':

807

if minikind == b'd':

808

def update_dirblock(from_dir, to_key, to_dir_utf8):

809

"""Recursively update all entries in this dirblock."""

810

if from_dir == '':

810

if from_dir == b'':

811

raise AssertionError("renaming root not supported")

812

from_key = (from_dir, '')

813

from_block_idx, present = \

834

from_path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])

835

to_path_utf8 = osutils.pathjoin(to_dir_utf8, entry[0][1])

836

minikind = cur_details[0]

837

if minikind in 'ar':

837

if minikind in (b'a', b'r'):

838

# Deleted children of a renamed directory

839

# Do not need to be updated.

840

# Children that have been renamed out of this

849

to_block=to_block,

850

to_key=to_key,

851

to_path_utf8=to_path_utf8)

852

if minikind == 'd':

852

if minikind == b'd':

853

# We need to move all the children of this

854

# entry

855

update_dirblock(from_path_utf8, to_key,

909

# -- get the state object and prepare it.

910

state = self.current_dirstate()

911

if False and (state._dirblock_state == dirstate.DirState.NOT_IN_MEMORY

912

and '' not in paths):

912

and b'' not in paths):

913

paths2ids = self._paths2ids_using_bisect

914

else:

915

paths2ids = self._paths2ids_in_memory

924

"""Return a list with all the entries that match path for all ids.

925

"""

926

dirname, basename = os.path.split(path)

927

key = (dirname, basename, '')

927

key = (dirname, basename, b'')

928

block_index, present = state._find_block_index_from_key(key)

929

if not present:

930

# the block which should contain path is absent.

952

for entry in path_entries:

953

# for each tree.

954

for index in search_indexes:

955

if entry[1][index][0] != 'a': # absent

955

if entry[1][index][0] != b'a': # absent

956

found_versioned = True

957

# all good: found a versioned cell

958

break

981

nothing. Otherwise add the id to found_ids.

982

"""

983

for index in search_indexes:

984

if entry[1][index][0] == 'r': # relocated

984

if entry[1][index][0] == b'r': # relocated

985

if not osutils.is_inside_any(searched_paths, entry[1][index][1]):

986

search_paths.add(entry[1][index][1])

987

elif entry[1][index][0] != 'a': # absent

987

elif entry[1][index][0] != b'a': # absent

988

found_ids.add(entry[0][2])

989

while search_paths:

990

current_root = search_paths.pop()

997

continue

998

for entry in root_entries:

999

_process_entry(entry)

1000

initial_key = (current_root, '', '')

1000

initial_key = (current_root, b'', b'')

1001

block_index, _ = state._find_block_index_from_key(initial_key)

1002

while (block_index < len(state._dirblocks) and

1003

osutils.is_inside(current_root, state._dirblocks[block_index][0])):

1023

1024

for dir_name_id, trees_info in viewitems(found):

1025

for index in search_indexes:

1026

if trees_info[index][0] not in ('r', 'a'):

1026

if trees_info[index][0] not in (b'r', b'a'):

1027

found_ids.add(dir_name_id[2])

1028

return found_ids

1029

1157

def _set_root_id(self, file_id):

1158

"""See WorkingTree.set_root_id."""

1159

state = self.current_dirstate()

1160

state.set_path_id('', file_id)

1160

state.set_path_id(b'', file_id)

1161

if state._dirblock_state == dirstate.DirState.IN_MEMORY_MODIFIED:

1162

self._make_dirty(reset_inventory=True)

1163

1666

1667

def _init_custom_control_files(self, wt):

1668

"""Subclasses with custom control files should override this method."""

1669

wt._transport.put_bytes('views', '', mode=wt.bzrdir._get_file_mode())

1669

wt._transport.put_bytes('views', b'', mode=wt.bzrdir._get_file_mode())

1670

1671

def supports_content_filtering(self):

1672

return True

1794

# for the tree index use.

1795

root_key, current_entry = self._dirstate._get_entry(parent_index, path_utf8='')

1796

current_id = root_key[2]

1797

if current_entry[parent_index][0] != 'd':

1797

if current_entry[parent_index][0] != b'd':

1798

raise AssertionError()

1799

inv = Inventory(root_id=current_id, revision_id=self._revision_id)

1800

inv.root.revision = current_entry[parent_index][4]

1815

continue

1816

for key, entry in block[1]:

1817

minikind, fingerprint, size, executable, revid = entry[parent_index]

1818

if minikind in ('a', 'r'): # absent, relocated

1818

if minikind in (b'a', b'r'): # absent, relocated

1819

# not this tree

1820

continue

1821

name = key[1]

1830

inv_entry.text_size = size

1831

inv_entry.text_sha1 = fingerprint

1832

elif kind == 'directory':

1833

parent_ies[(dirname + '/' + name).strip('/')] = inv_entry

1833

parent_ies[(dirname + b'/' + name).strip(b'/')] = inv_entry

1834

elif kind == 'symlink':

1835

inv_entry.symlink_target = utf8_decode(fingerprint)[0]

1836

elif kind == 'tree-reference':

1870

entry = self._get_entry(file_id=file_id, path=path)

1871

parent_index = self._get_parent_index()

1872

parent_details = entry[1][parent_index]

1873

if parent_details[0] == 'f':

1873

if parent_details[0] == b'f':

1874

return parent_details[1]

1875

return None

1876

1922

def get_symlink_target(self, file_id, path=None):

1923

entry = self._get_entry(file_id=file_id)

1924

parent_index = self._get_parent_index()

1925

if entry[1][parent_index][0] != 'l':

1925

if entry[1][parent_index][0] != b'l':

1926

return None

1927

else:

1928

target = entry[1][parent_index][1]

2188

specific_files_utf8.add(path.encode('utf8'))

2189

specific_files = specific_files_utf8

2190

else:

2191

specific_files = {''}

2191

specific_files = {b''}

2192

# -- specific_files is now a utf8 path set --

2193

2194

# -- get the state object and prepare it.

2208

for entry in path_entries:

2209

# for each tree.

2210

for index in indices:

2211

if entry[1][index][0] != 'a': # absent

2211

if entry[1][index][0] != b'a': # absent

2212

found_versioned = True

2213

# all good: found a versioned cell

2214

break

2334

2335

def init_custom_control_files(self, tree):

2336

"""Initialize custom control files."""

2337

tree._transport.put_bytes('views', '',

2337

tree._transport.put_bytes('views', b'',

2338

mode=tree.bzrdir._get_file_mode())

2339

2340

def update_format(self, tree):