~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Committer: Jelmer Vernooij
Date: 2006-06-12 01:53:19 UTC
mto: (1558.16.3 revert-missing)
mto: This revision was merged to the branch mainline in revision 1767.
Revision ID: jelmer@samba.org-20060612015319-bed212cff7f6aaf9

Revert some of my spelling fixes and fix some typos after review by Aaron.

files modified:
bzrlib/branch.py

bzrlib/bzrdir.py

bzrlib/commit.py

bzrlib/fetch.py

bzrlib/graph.py

bzrlib/knit.py

bzrlib/osutils.py

bzrlib/reconcile.py

bzrlib/repository.py

bzrlib/transform.py

bzrlib/tree.py

bzrlib/tuned_gzip.py

bzrlib/versionedfile.py

Show diffs side-by-side

added added

removed removed

bzrlib/repository.py

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

368

# revisions. We don't need to see all lines in the inventory because

369

# only those added in an inventory in rev X can contain a revision=X

370

# line.

371

for line in w.iter_lines_added_or_present_in_versions(selected_revision_ids):

838

raise errors.NoSuchRevision(self, revision_id)

839

# a ghost

840

result.add_ghost(revision_id)

841

# mark it as done so we dont try for it again.

841

# mark it as done so we don't try for it again.

842

done.add(revision_id)

843

continue

844

parent_ids = vf.get_parents_with_ghosts(revision_id)

1043

files = [('inventory.weave', StringIO(empty_weave)),

1044

]

1045

1046

# FIXME: RBC 20060125 dont peek under the covers

1046

# FIXME: RBC 20060125 don't peek under the covers

1047

# NB: no need to escape relative paths that are url safe.

1048

control_files = LockableFiles(a_bzrdir.transport, 'branch-lock',

1049

TransportLock)

1208

1209

def _create_control_files(self, a_bzrdir):

1210

"""Create the required files and the initial control_files object."""

1211

# FIXME: RBC 20060125 dont peek under the covers

1211

# FIXME: RBC 20060125 don't peek under the covers

1212

# NB: no need to escape relative paths that are url safe.

1213

repository_transport = a_bzrdir.get_repository_transport(self)

1214

control_files = LockableFiles(repository_transport, 'lock', LockDir)

1474

# grab the basis available data

1475

if basis is not None:

1476

self.target.fetch(basis, revision_id=revision_id)

1477

# but dont bother fetching if we have the needed data now.

1477

# but don't bother fetching if we have the needed data now.

1478

if (revision_id not in (None, NULL_REVISION) and

1479

self.target.has_revision(revision_id)):

1480

return

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 because that

1574

We don't 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 missed this.

1595

# the basis copy_content_into could miss-set this.

1596

try:

1597

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

1598

except NotImplementedError:

1641

def missing_revision_ids(self, revision_id=None):

1642

"""See InterRepository.missing_revision_ids()."""

1643

# we want all revisions to satisfy revision_id in source.

1644

# but we dont want to stat every file here and there.

1644

# but we don't want to stat every file here and there.

1645

# we want then, all revisions other needs to satisfy revision_id

1646

# checked, but not those that we have locally.

1647

# so the first thing is to get a subset of the revisions to

1660

source_ids_set = set(source_ids)

1661

# source_ids is the worst possible case we may need to pull.

1662

# now we want to filter source_ids against what we actually

1663

# have in target, but dont try to check for existence where we know

1663

# have in target, but don't try to check for existence where we know

1664

# we do not have a revision as that would be pointless.

1665

target_ids = set(self.target._all_possible_ids())

1666

possibly_present_revisions = target_ids.intersection(source_ids_set)

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 because that

1692

We don't 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

"""

1723

source_ids_set = set(source_ids)

1724

# source_ids is the worst possible case we may need to pull.

1725

# now we want to filter source_ids against what we actually

1726

# have in target, but dont try to check for existence where we know

1726

# have in target, but don't try to check for existence where we know

1727

# we do not have a revision as that would be pointless.

1728

target_ids = set(self.target._all_possible_ids())

1729

possibly_present_revisions = target_ids.intersection(source_ids_set)

Older »