~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Committer: Jelmer Vernooij
Date: 2006-06-10 00:21:11 UTC
mto: (1558.16.3 revert-missing)
mto: This revision was merged to the branch mainline in revision 1767.
Revision ID: jelmer@samba.org-20060610002111-ff582d7ee2090037

Fix some types (found using aspell).

Show diffs side-by-side

added added

removed removed

bzrlib/repository.py

174

self.control_files = control_files

175

self._revision_store = _revision_store

176

self.text_store = text_store

177

# backwards compatability

177

# backwards compatibility

178

self.weave_store = text_store

179

# not right yet - should be more semantically clear ?

180

362

363

# this code needs to read every new line in every inventory for the

364

# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line

365

# not pesent in one of those inventories is unnecessary but not

365

# not present in one of those inventories is unnecessary but not

366

# harmful because we are filtering by the revision id marker in the

367

# inventory lines : we only select file ids altered in one of those

368

# revisions. We dont need to see all lines in the inventory because

670

if ie.revision not in w:

671

text_parents = []

672

# FIXME: TODO: The following loop *may* be overlapping/duplicate

673

# with inventoryEntry.find_previous_heads(). if it is, then there

673

# with InventoryEntry.find_previous_heads(). if it is, then there

674

# is a latent bug here where the parents may have ancestors of each

675

# other. RBC, AB

676

for revision, tree in parent_trees.iteritems():

928

raise NotImplementedError(self.get_format_string)

929

930

def get_format_description(self):

931

"""Return the short desciption for this format."""

931

"""Return the short description for this format."""

932

raise NotImplementedError(self.get_format_description)

933

934

def _get_revision_store(self, repo_transport, control_files):

1095

- TextStores for texts, inventories,revisions.

1096

1097

This format is deprecated: it indexes texts using a text id which is

1098

removed in format 5; initializationa and write support for this format

1098

removed in format 5; initialization and write support for this format

1099

has been removed.

1100

"""

1101

1200

1201

1202

class MetaDirRepositoryFormat(RepositoryFormat):

1203

"""Common base class for the new repositories using the metadir layour."""

1203

"""Common base class for the new repositories using the metadir layout."""

1204

1205

def __init__(self):

1206

super(MetaDirRepositoryFormat, self).__init__()

1571

def is_compatible(source, target):

1572

"""Be compatible with known Weave formats.

1573

1574

We dont test for the stores being of specific types becase that

1574

We dont test for the stores being of specific types because that

1575

could lead to confusing results, and there is no need to be

1576

overly general.

1577

"""

1592

if basis is not None:

1593

# copy the basis in, then fetch remaining data.

1594

basis.copy_content_into(self.target, revision_id)

1595

# the basis copy_content_into could misset this.

1595

# the basis copy_content_into could missed this.

1596

try:

1597

self.target.set_make_working_trees(self.source.make_working_trees())

1598

except NotImplementedError:

1689

def is_compatible(source, target):

1690

"""Be compatible with known Knit formats.

1691

1692

We dont test for the stores being of specific types becase that

1692

We dont test for the stores being of specific types because that

1693

could lead to confusing results, and there is no need to be

1694

overly general.

1695

"""

Older »