~bzr-pqm/bzr/bzr.dev

Bring in bzr.dev 4761 which includes CHKMap and CHKInventory tweaks.
It also brings in StaticTuple concatenation, and ability to hold None, etc.

added added

removed removed

1921

raise errors.BzrError('Duplicate key in inventory: %r\n%r'

1922

% (key, bytes))

1923

info[key] = value

1924

revision_id = info['revision_id']

1925

root_id = info['root_id']

1926

search_key_name = info.get('search_key_name', 'plain')

1927

parent_id_basename_to_file_id = info.get(

1928

'parent_id_basename_to_file_id', None)

1924

revision_id = intern(info['revision_id'])

1925

root_id = intern(info['root_id'])

1926

search_key_name = intern(info.get('search_key_name', 'plain'))

1927

parent_id_basename_to_file_id = intern(info.get(

1928

'parent_id_basename_to_file_id', None))

1929

if not parent_id_basename_to_file_id.startswith('sha1:'):

1930

raise ValueError('parent_id_basename_to_file_id should be a sha1'

1931

' key not %r' % (parent_id_basename_to_file_id,))