[BUNDLE] Fix typos
Jelmer Vernooij
jelmer at samba.org
Mon Jun 12 02:59:04 BST 2006
On Sun, Jun 11, 2006 at 09:32:56PM -0400, Aaron Bentley wrote:
> > The attached bundle fixes a couple of typos in the bzr source code found
> > by simply running 'aspell' on the Python files.
> Thanks for doing this. How'd you avoid false positives from variable
> names, etc?
Simply added them to the dictionary. Most of the variable names don't
match misspelled words.
> It would be amusing to combine aspell output with annotate, to determine
> bzr's best and worst spellers.
I guess it'd depend on which language you would use - both US
(Canadian?) and UK English seem to be used.
> > - This could memoise the branch, but if thats done
> > + This could memorize the branch, but if thats done
> This isn't a typo. See here:
> http://en.wikipedia.org/wiki/Memoization
Ah! That typo seemed to be very common, but that explains it I guess
:-)
> > === modified file bzrlib/tree.py
> > --- bzrlib/tree.py
> > +++ bzrlib/tree.py
> > @@ -150,6 +150,7 @@
> > def get_file_lines(self, file_id):
> > ie = self._inventory[file_id]
> > weave = self.get_weave(file_id)
> > + assert ie.revision
> > return weave.get_lines(ie.revision)
> > def get_file_text(self, file_id):
> This doesn't look like a spelling fix :-)
Oops, that must've slipped thru when I was looking at the diff. Fixed.
Updated bundle attached.
Cheers,
Jelmer
-------------- next part --------------
# Bazaar revision bundle v0.7
#
# message:
# Revert some of my spelling fixes and fix some typos after review by Aaron.
#
# committer: Jelmer Vernooij <jelmer at samba.org>
# date: Mon 2006-06-12 02:53:19.857388020 +0100
=== modified file bzrlib/add.py // last-changed:jelmer at samba.org-20060610002111
... -ff582d7ee2090037
--- bzrlib/add.py
+++ bzrlib/add.py
@@ -164,7 +164,7 @@
# find the kind of the path being added. This is not
# currently determined when we list directories
# recursively, but in theory we can determine while
- # doing the directory listing on *some* platformans.
+ # doing the directory listing on *some* platforms.
# TODO: a safe, portable, clean interface which will
# be faster than os.listdir() + stat. Specifically,
# readdir - dirent.d_type supplies the file type when
=== modified file bzrlib/branch.py
--- bzrlib/branch.py
+++ bzrlib/branch.py
@@ -477,7 +477,7 @@
revision_id: if not None, the revision history in the new branch will
be truncated to end with revision_id.
"""
- # for API compatability, until 0.8 releases we provide the old api:
+ # for API compatibility, until 0.8 releases we provide the old api:
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
# after 0.8 releases, the *args and **kwargs should be changed:
# def clone(self, to_bzrdir, revision_id=None):
@@ -485,7 +485,7 @@
kwargs.get('revision', None) or
kwargs.get('basis_branch', None) or
(len(args) and isinstance(args[0], basestring))):
- # backwards compatability api:
+ # backwards compatibility api:
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
# get basis_branch
@@ -609,7 +609,7 @@
def initialize(self, a_bzrdir):
"""Create a branch of this format in a_bzrdir."""
- raise NotImplementedError(self.initialized)
+ raise NotImplementedError(self.initialize)
def is_supported(self):
"""Is this format supported?
@@ -1241,7 +1241,7 @@
This could memoise the branch, but if thats done
it must be revalidated on each new lock.
- So for now we just dont memoise it.
+ So for now we just don't memoise it.
# RBC 20060304 review this decision.
"""
bound_loc = self.get_bound_location()
@@ -1293,7 +1293,7 @@
# There may be a different check you could do here
# rather than actually trying to install revisions remotely.
# TODO: capture an exception which indicates the remote branch
- # is not writeable.
+ # is not writable.
# If it is up-to-date, this probably should not be a failure
# lock other for write so the revision-history syncing cannot race
=== modified file bzrlib/builtins.py // last-changed:jelmer at samba.org-200606100
... 02111-ff582d7ee2090037
--- bzrlib/builtins.py
+++ bzrlib/builtins.py
@@ -266,7 +266,7 @@
Adding a file whose parent directory is not versioned will
implicitly add the parent, and so on up to the root. This means
- you should never need to explictly add a directory, they'll just
+ you should never need to explicitly add a directory, they'll just
get added when you add a file in the directory.
--dry-run will show which files would be added, but not actually
@@ -2567,7 +2567,7 @@
"""
# TODO: jam 20060108 Add an option to allow uncommit to remove
- # unreferenced information in 'branch-as-repostory' branches.
+ # unreferenced information in 'branch-as-repository' branches.
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
# information in shared branches as well.
takes_options = ['verbose', 'revision',
=== modified file bzrlib/bzrdir.py
--- bzrlib/bzrdir.py
+++ bzrlib/bzrdir.py
@@ -373,7 +373,7 @@
Note that bzr dirs that do not support format strings will raise
IncompatibleFormat if the branch format they are given has
- a format string, and vice verca.
+ a format string, and vice versa.
If branch_format is None, the transport is returned with no
checking. if it is not None, then the returned transport is
@@ -386,7 +386,7 @@
Note that bzr dirs that do not support format strings will raise
IncompatibleFormat if the repository format they are given has
- a format string, and vice verca.
+ a format string, and vice versa.
If repository_format is None, the transport is returned with no
checking. if it is not None, then the returned transport is
@@ -399,7 +399,7 @@
Note that bzr dirs that do not support format strings will raise
IncompatibleFormat if the workingtree format they are given has
- a format string, and vice verca.
+ a format string, and vice versa.
If workingtree_format is None, the transport is returned with no
checking. if it is not None, then the returned transport is
@@ -434,7 +434,7 @@
# this might be better on the BzrDirFormat class because it refers to
# all the possible bzrdir disk formats.
# This method is tested via the workingtree is_control_filename tests-
- # it was extractd from WorkingTree.is_control_filename. If the methods
+ # it was extracted from WorkingTree.is_control_filename. If the methods
# contract is extended beyond the current trivial implementation please
# add new tests for it to the appropriate place.
return filename == '.bzr' or filename.startswith('.bzr/')
@@ -607,7 +607,7 @@
result.create_repository()
elif source_repository is not None and result_repo is None:
# have source, and want to make a new target repo
- # we dont clone the repo because that preserves attributes
+ # we don't clone the repo because that preserves attributes
# like is_shared(), and we have not yet implemented a
# repository sprout().
result_repo = result.create_repository()
@@ -980,10 +980,10 @@
This returns a bzrlib.bzrdir.Converter object.
This should return the best upgrader to step this format towards the
- current default format. In the case of plugins we can/shouold provide
+ current default format. In the case of plugins we can/should provide
some means for them to extend the range of returnable converters.
- :param format: Optional format to override the default foramt of the
+ :param format: Optional format to override the default format of the
library.
"""
raise NotImplementedError(self.get_converter)
@@ -998,11 +998,11 @@
def initialize_on_transport(self, transport):
"""Initialize a new bzrdir in the base directory of a Transport."""
- # Since we don'transport have a .bzr directory, inherit the
+ # Since we don't have a .bzr directory, inherit the
# mode from the root directory
temp_control = LockableFiles(transport, '', TransportLock)
temp_control._transport.mkdir('.bzr',
- # FIXME: RBC 20060121 dont peek under
+ # FIXME: RBC 20060121 don't peek under
# the covers
mode=temp_control._dir_mode)
file_mode = temp_control._file_mode
=== modified file bzrlib/commit.py
--- bzrlib/commit.py
+++ bzrlib/commit.py
@@ -316,7 +316,7 @@
# revision data is in the local branch now.
# upload revision data to the master.
- # this will propogate merged revisions too if needed.
+ # this will propagate merged revisions too if needed.
if self.bound_branch:
self.master_branch.repository.fetch(self.branch.repository,
revision_id=self.rev_id)
@@ -411,7 +411,7 @@
except Exception, e:
found_exception = e
if found_exception is not None:
- # dont do a plan raise, because the last exception may have been
+ # don't do a plan raise, because the last exception may have been
# trashed, e is our sure-to-work exception even though it loses the
# full traceback. XXX: RBC 20060421 perhaps we could check the
# exc_info and if its the same one do a plain raise otherwise
@@ -532,7 +532,7 @@
self.builder.record_entry_contents(ie, self.parent_invs,
path, self.work_tree)
- # describe the nature of the change that has occured relative to
+ # describe the nature of the change that has occurred relative to
# the basis inventory.
if (self.basis_inv.has_id(ie.file_id)):
basis_ie = self.basis_inv[ie.file_id]
=== modified file bzrlib/config.py // last-changed:jelmer at samba.org-20060610002
... 111-ff582d7ee2090037
--- bzrlib/config.py
+++ bzrlib/config.py
@@ -31,12 +31,12 @@
in branches.conf, you specify the url of a branch and options for it.
Wildcards may be used - * and ? as normal in shell completion. Options
-set in both bazaar.conf and branches.conf are overriden by the branches.conf
+set in both bazaar.conf and branches.conf are overridden by the branches.conf
setting.
[/home/robertc/source]
recurse=False|True(default)
email= as above
-check_signatures= as abive
+check_signatures= as above
create_signatures= as above.
explanation of options
=== modified file bzrlib/errors.py // last-changed:jelmer at samba.org-20060610002
... 111-ff582d7ee2090037
--- bzrlib/errors.py
+++ bzrlib/errors.py
@@ -166,7 +166,7 @@
class BzrCommandError(BzrError):
# Error from malformed user command
# This is being misused as a generic exception
- # pleae subclass. RBC 20051030
+ # please subclass. RBC 20051030
#
# I think it's a waste of effort to differentiate between errors that
# are not intended to be caught anyway. UI code need not subclass
@@ -511,7 +511,7 @@
def __init__(self, bases):
warn("BzrError AmbiguousBase has been deprecated as of bzrlib 0.8.",
DeprecationWarning)
- msg = "The correct base is unclear, becase %s are all equally close" %\
+ msg = "The correct base is unclear, because %s are all equally close" %\
", ".join(bases)
BzrError.__init__(self, msg)
self.bases = bases
=== modified file bzrlib/fetch.py
--- bzrlib/fetch.py
+++ bzrlib/fetch.py
@@ -170,7 +170,7 @@
# we fetch all the texts, because texts do
# not reference anything, and its cheap enough
to_weave.join(from_weave, version_ids=required_versions)
- # we dont need *all* of this data anymore, but we dont know
+ # we don't need *all* of this data anymore, but we dont know
# what we do. This cache clearing will result in a new read
# of the knit data when we do the checkout, but probably we
# want to emit the needed data on the fly rather than at the
@@ -191,7 +191,7 @@
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
try:
- # just merge, this is optimisable and its means we dont
+ # just merge, this is optimisable and its means we don't
# copy unreferenced data such as not-needed inventories.
pb.update("fetch inventory", 1, 3)
from_weave = self.from_repository.get_inventory_weave()
@@ -273,7 +273,7 @@
class Fetcher(object):
- """Backwards compatability glue for branch.fetch()."""
+ """Backwards compatibility glue for branch.fetch()."""
@deprecated_method(zero_eight)
def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
=== modified file bzrlib/inventory.py // last-changed:jelmer at samba.org-20060610
... 002111-ff582d7ee2090037
--- bzrlib/inventory.py
+++ bzrlib/inventory.py
@@ -160,7 +160,7 @@
versioned_file_store,
transaction,
entry_vf=None):
- """Return the revisions and entries that directly preceed this.
+ """Return the revisions and entries that directly precede this.
Returned as a map from revision to inventory entry.
@@ -471,7 +471,7 @@
def _unchanged(self, previous_ie):
"""Has this entry changed relative to previous_ie.
- This method should be overriden in child classes.
+ This method should be overridden in child classes.
"""
compatible = True
# different inv parent
=== modified file bzrlib/knit.py
--- bzrlib/knit.py
+++ bzrlib/knit.py
@@ -89,7 +89,7 @@
# TODO: Can we put in some kind of value to check that the index and data
# files belong together?
-# TODO: accomodate binaries, perhaps by storing a byte count
+# TODO: accommodate binaries, perhaps by storing a byte count
# TODO: function to check whole file
@@ -172,7 +172,7 @@
intstart intend intcount
1..count lines:
revid(utf8) newline\n
- internal represnetation is
+ internal representation is
(start, end, count, [1..count tuples (revid, newline)])
"""
result = []
@@ -362,7 +362,7 @@
:param records: A list of tuples(version_id, options, parents, size).
:param data: The data for the records. When it is written, the records
are adjusted to have pos pointing into data by the sum of
- the preceeding records sizes.
+ the preceding records sizes.
"""
# write all the data
pos = self._data.add_raw_record(data)
@@ -728,7 +728,7 @@
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
if version_ids is None:
version_ids = self.versions()
- # we dont care about inclusions, the caller cares.
+ # we don't care about inclusions, the caller cares.
# but we need to setup a list of records to visit.
# we need version_id, position, length
version_id_records = []
@@ -932,7 +932,7 @@
The index file on disc contains a header, followed by one line per knit
record. The same revision can be present in an index file more than once.
- The first occurence gets assigned a sequence number starting from 0.
+ The first occurrence gets assigned a sequence number starting from 0.
The format of a single line is
REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
@@ -954,7 +954,7 @@
the end of the file, then the record that is missing it will be ignored by
the parser.
- When writing new records to the index file, the data is preceeded by '\n'
+ When writing new records to the index file, the data is preceded by '\n'
to ensure that records always start on new lines even if the last write was
interrupted. As a result its normal for the last line in the index to be
missing a trailing newline. One can be added with no harmful effects.
@@ -991,7 +991,7 @@
self._cache = {}
# position in _history is the 'official' index for a revision
# but the values may have come from a newer entry.
- # so - wc -l of a knit index is != the number of uniqe names
+ # so - wc -l of a knit index is != the number of unique names
# in the weave.
self._history = []
pb = bzrlib.ui.ui_factory.nested_progress_bar()
@@ -1213,7 +1213,7 @@
if parent in self._cache]
def get_parents_with_ghosts(self, version_id):
- """Return parents of specified version wth ghosts."""
+ """Return parents of specified version with ghosts."""
return self._cache[version_id][4]
def check_versions_present(self, version_ids):
@@ -1374,7 +1374,7 @@
if len(needed_records):
# We take it that the transport optimizes the fetching as good
- # as possible (ie, reads continous ranges.)
+ # as possible (ie, reads continuous ranges.)
response = self._transport.readv(self._filename,
[(pos, size) for version_id, pos, size in needed_records])
@@ -1469,7 +1469,7 @@
# if source has the parent, we must :
# * already have it or
# * have it scheduled already
- # otherwise we dont care
+ # otherwise we don't care
assert (self.target.has_version(parent) or
parent in copy_set or
not self.source.has_version(parent))
@@ -1680,7 +1680,7 @@
j2lenget = j2len.get
newj2len = {}
- # changing b2j.get(a[i], nothing) to a try:Keyerror pair produced the
+ # changing b2j.get(a[i], nothing) to a try:KeyError pair produced the
# following improvement
# 704 0 4650.5320 2620.7410 bzrlib.knit:1336(find_longest_match)
# +326674 0 1655.1210 1655.1210 +<method 'get' of 'dict' objects>
=== modified file bzrlib/lockdir.py // last-changed:jelmer at samba.org-2006061000
... 2111-ff582d7ee2090037
--- bzrlib/lockdir.py
+++ bzrlib/lockdir.py
@@ -373,7 +373,7 @@
self.attempt_lock()
def lock_read(self):
- """Compatability-mode shared lock.
+ """Compatibility-mode shared lock.
LockDir doesn't support shared read-only locks, so this
just pretends that the lock is taken but really does nothing.
=== modified file bzrlib/log.py // last-changed:jelmer at samba.org-20060610002111
... -ff582d7ee2090037
--- bzrlib/log.py
+++ bzrlib/log.py
@@ -491,7 +491,7 @@
raise BzrCommandError("unknown log formatter: %r" % name)
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
- # deprecated; for compatability
+ # deprecated; for compatibility
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
lf.show(revno, rev, delta)
=== modified file bzrlib/merge.py // last-changed:jelmer at samba.org-200606100021
... 11-ff582d7ee2090037
--- bzrlib/merge.py
+++ bzrlib/merge.py
@@ -792,7 +792,7 @@
pb=pb, pp=pp, reprocess=reprocess)
def _get_revision_tree(self, tree):
- """Return a revision tree releated to this tree.
+ """Return a revision tree related to this tree.
If the tree is a WorkingTree, the basis will be returned.
"""
if getattr(tree, 'get_weave', False) is False:
=== modified file bzrlib/missing.py // last-changed:jelmer at samba.org-2006061000
... 2111-ff582d7ee2090037
--- bzrlib/missing.py
+++ bzrlib/missing.py
@@ -1,4 +1,4 @@
-"""Display what revisions are missing in 'other' from 'this' and vice verca."""
+"""Display what revisions are missing in 'other' from 'this' and vice versa."""
import bzrlib.ui as ui
=== modified file bzrlib/option.py // last-changed:jelmer at samba.org-20060610002
... 111-ff582d7ee2090037
--- bzrlib/option.py
+++ bzrlib/option.py
@@ -135,7 +135,7 @@
argname -- name of option argument, if any
"""
# TODO: perhaps a subclass that automatically does
- # --option, --no-option for reversable booleans
+ # --option, --no-option for reversible booleans
self.name = name
self.help = help
self.type = type
=== modified file bzrlib/patches.py // last-changed:jelmer at samba.org-2006061000
... 2111-ff582d7ee2090037
--- bzrlib/patches.py
+++ bzrlib/patches.py
@@ -354,7 +354,7 @@
def difference_index(atext, btext):
- """Find the indext of the first character that differs betweeen two texts
+ """Find the indext of the first character that differs between two texts
:param atext: The first text
:type atext: str
=== modified file bzrlib/reconcile.py
--- bzrlib/reconcile.py
+++ bzrlib/reconcile.py
@@ -222,7 +222,7 @@
def _parents_are_inconsistent(self, rev_id, parents):
"""Return True if the parents list of rev_id does not match the weave.
- This detect inconsistences based on the self.thorough value:
+ This detects inconsistencies based on the self.thorough value:
if thorough is on, the first parent value is checked as well as ghost
differences.
Otherwise only the ghost differences are evaluated.
=== modified file bzrlib/repository.py
--- bzrlib/repository.py
+++ bzrlib/repository.py
@@ -174,7 +174,7 @@
self.control_files = control_files
self._revision_store = _revision_store
self.text_store = text_store
- # backwards compatability
+ # backwards compatibility
self.weave_store = text_store
# not right yet - should be more semantically clear ?
#
@@ -362,10 +362,10 @@
# this code needs to read every new line in every inventory for the
# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
- # not pesent in one of those inventories is unnecessary but not
+ # not present in one of those inventories is unnecessary but not
# harmful because we are filtering by the revision id marker in the
# inventory lines : we only select file ids altered in one of those
- # revisions. We dont need to see all lines in the inventory because
+ # revisions. We don't need to see all lines in the inventory because
# only those added in an inventory in rev X can contain a revision=X
# line.
for line in w.iter_lines_added_or_present_in_versions(selected_revision_ids):
@@ -670,7 +670,7 @@
if ie.revision not in w:
text_parents = []
# FIXME: TODO: The following loop *may* be overlapping/duplicate
- # with inventoryEntry.find_previous_heads(). if it is, then there
+ # with InventoryEntry.find_previous_heads(). if it is, then there
# is a latent bug here where the parents may have ancestors of each
# other. RBC, AB
for revision, tree in parent_trees.iteritems():
@@ -838,7 +838,7 @@
raise errors.NoSuchRevision(self, revision_id)
# a ghost
result.add_ghost(revision_id)
- # mark it as done so we dont try for it again.
+ # mark it as done so we don't try for it again.
done.add(revision_id)
continue
parent_ids = vf.get_parents_with_ghosts(revision_id)
@@ -928,7 +928,7 @@
raise NotImplementedError(self.get_format_string)
def get_format_description(self):
- """Return the short desciption for this format."""
+ """Return the short description for this format."""
raise NotImplementedError(self.get_format_description)
def _get_revision_store(self, repo_transport, control_files):
@@ -1043,7 +1043,7 @@
files = [('inventory.weave', StringIO(empty_weave)),
]
- # FIXME: RBC 20060125 dont peek under the covers
+ # FIXME: RBC 20060125 don't peek under the covers
# NB: no need to escape relative paths that are url safe.
control_files = LockableFiles(a_bzrdir.transport, 'branch-lock',
TransportLock)
@@ -1095,7 +1095,7 @@
- TextStores for texts, inventories,revisions.
This format is deprecated: it indexes texts using a text id which is
- removed in format 5; initializationa and write support for this format
+ removed in format 5; initialization and write support for this format
has been removed.
"""
@@ -1200,7 +1200,7 @@
class MetaDirRepositoryFormat(RepositoryFormat):
- """Common base class for the new repositories using the metadir layour."""
+ """Common base class for the new repositories using the metadir layout."""
def __init__(self):
super(MetaDirRepositoryFormat, self).__init__()
@@ -1208,7 +1208,7 @@
def _create_control_files(self, a_bzrdir):
"""Create the required files and the initial control_files object."""
- # FIXME: RBC 20060125 dont peek under the covers
+ # FIXME: RBC 20060125 don't peek under the covers
# NB: no need to escape relative paths that are url safe.
repository_transport = a_bzrdir.get_repository_transport(self)
control_files = LockableFiles(repository_transport, 'lock', LockDir)
@@ -1474,7 +1474,7 @@
# grab the basis available data
if basis is not None:
self.target.fetch(basis, revision_id=revision_id)
- # but dont bother fetching if we have the needed data now.
+ # but don't bother fetching if we have the needed data now.
if (revision_id not in (None, NULL_REVISION) and
self.target.has_revision(revision_id)):
return
@@ -1571,7 +1571,7 @@
def is_compatible(source, target):
"""Be compatible with known Weave formats.
- We dont test for the stores being of specific types becase that
+ We don't test for the stores being of specific types because that
could lead to confusing results, and there is no need to be
overly general.
"""
@@ -1592,7 +1592,7 @@
if basis is not None:
# copy the basis in, then fetch remaining data.
basis.copy_content_into(self.target, revision_id)
- # the basis copy_content_into could misset this.
+ # the basis copy_content_into could miss-set this.
try:
self.target.set_make_working_trees(self.source.make_working_trees())
except NotImplementedError:
@@ -1641,7 +1641,7 @@
def missing_revision_ids(self, revision_id=None):
"""See InterRepository.missing_revision_ids()."""
# we want all revisions to satisfy revision_id in source.
- # but we dont want to stat every file here and there.
+ # but we don't want to stat every file here and there.
# we want then, all revisions other needs to satisfy revision_id
# checked, but not those that we have locally.
# so the first thing is to get a subset of the revisions to
@@ -1660,7 +1660,7 @@
source_ids_set = set(source_ids)
# source_ids is the worst possible case we may need to pull.
# now we want to filter source_ids against what we actually
- # have in target, but dont try to check for existence where we know
+ # have in target, but don't try to check for existence where we know
# we do not have a revision as that would be pointless.
target_ids = set(self.target._all_possible_ids())
possibly_present_revisions = target_ids.intersection(source_ids_set)
@@ -1689,7 +1689,7 @@
def is_compatible(source, target):
"""Be compatible with known Knit formats.
- We dont test for the stores being of specific types becase that
+ We don't test for the stores being of specific types because that
could lead to confusing results, and there is no need to be
overly general.
"""
@@ -1723,7 +1723,7 @@
source_ids_set = set(source_ids)
# source_ids is the worst possible case we may need to pull.
# now we want to filter source_ids against what we actually
- # have in target, but dont try to check for existence where we know
+ # have in target, but don't try to check for existence where we know
# we do not have a revision as that would be pointless.
target_ids = set(self.target._all_possible_ids())
possibly_present_revisions = target_ids.intersection(source_ids_set)
=== modified file bzrlib/trace.py // last-changed:jelmer at samba.org-200606100021
... 11-ff582d7ee2090037
--- bzrlib/trace.py
+++ bzrlib/trace.py
@@ -27,7 +27,7 @@
Exceptions are reported in a brief form to stderr so as not to look scary.
BzrErrors are required to be able to format themselves into a properly
-explanatory message. This is not true for builtin excexceptions such as
+explanatory message. This is not true for builtin exceptions such as
KeyError, which typically just str to "0". They're printed in a different
form.
"""
@@ -57,11 +57,11 @@
class QuietFormatter(logging.Formatter):
- """Formatter that supresses the details of errors.
+ """Formatter that suppresses the details of errors.
This is used by default on stderr so as not to scare the user.
"""
- # At first I tried overriding formatException to suppress the
+ # At first I tried overriding FormatException to suppress the
# exception details, but that has global effect: no loggers
# can get the exception details is we suppress them here.
=== modified file bzrlib/tuned_gzip.py
--- bzrlib/tuned_gzip.py
+++ bzrlib/tuned_gzip.py
@@ -139,7 +139,7 @@
4168 in 200
"""
# We've read to the end of the file, so we should have 8 bytes of
- # unused data in the decompressor. If we dont, there is a corrupt file.
+ # unused data in the decompressor. If we don't, there is a corrupt file.
# We use these 8 bytes to calculate the CRC and the recorded file size.
# We then check the that the computed CRC and size of the
# uncompressed data matches the stored values. Note that the size
=== modified file bzrlib/versionedfile.py
--- bzrlib/versionedfile.py
+++ bzrlib/versionedfile.py
@@ -287,7 +287,7 @@
Ghosts are not listed or referenced in the graph.
:param version_ids: Versions to select.
- None means retreive all versions.
+ None means retrieve all versions.
"""
result = {}
if version_ids is None:
@@ -388,7 +388,7 @@
specific version marker at this point. The api may be changed
during development to include the version that the versioned file
thinks is relevant, but given that such hints are just guesses,
- its better not to have it if we dont need it.
+ its better not to have it if we don't need it.
NOTES: Lines are normalised: they will all have \n terminators.
Lines are returned in arbitrary order.
@@ -483,7 +483,7 @@
# We previously considered either 'unchanged' or 'killed-both' lines
# to be possible places to resynchronize. However, assuming agreement
- # on killed-both lines may be too agressive. -- mbp 20060324
+ # on killed-both lines may be too aggressive. -- mbp 20060324
for state, line in self.plan:
if state == 'unchanged':
# resync and flush queued conflicts changes if any
@@ -638,7 +638,7 @@
class InterVersionedFileTestProviderAdapter(object):
"""A tool to generate a suite testing multiple inter versioned-file classes.
- This is done by copying the test once for each interversionedfile provider
+ This is done by copying the test once for each InterVersionedFile provider
and injecting the transport_server, transport_readonly_server,
versionedfile_factory and versionedfile_factory_to classes into each copy.
Each copy is also given a new id() to make it easy to identify.
=== modified file bzrlib/weave.py // last-changed:jelmer at samba.org-200606100021
... 11-ff582d7ee2090037
--- bzrlib/weave.py
+++ bzrlib/weave.py
@@ -27,7 +27,7 @@
# property.
# TODO: Nothing here so far assumes the lines are really \n newlines,
-# rather than being split up in some other way. We could accomodate
+# rather than being split up in some other way. We could accommodate
# binaries, perhaps by naively splitting on \n or perhaps using
# something like a rolling checksum.
@@ -231,7 +231,7 @@
@deprecated_method(zero_eight)
def lookup(self, name):
- """Backwards compatability thunk:
+ """Backwards compatibility thunk:
Return name, as name is valid in the api now, and spew deprecation
warnings everywhere.
@@ -522,7 +522,7 @@
if lines == basis_lines:
return new_version
- # add a sentinal, because we can also match against the final line
+ # add a sentinel, because we can also match against the final line
basis_lineno.append(len(self._weave))
# XXX: which line of the weave should we really consider
@@ -1069,7 +1069,7 @@
@deprecated_method(zero_eight)
def reweave(self, other, pb=None, msg=None):
- """reweave has been superceded by plain use of join."""
+ """reweave has been superseded by plain use of join."""
return self.join(other, pb, msg)
def _reweave(self, other, pb, msg):
=== modified file bzrlib/workingtree.py // last-changed:jelmer at samba.org-200606
... 10002111-ff582d7ee2090037
--- bzrlib/workingtree.py
+++ bzrlib/workingtree.py
@@ -149,7 +149,7 @@
class TreeEntry(object):
- """An entry that implements the minium interface used by commands.
+ """An entry that implements the minimum interface used by commands.
This needs further inspection, it may be better to have
InventoryEntries without ids - though that seems wrong. For now,
@@ -1348,8 +1348,8 @@
# of a nasty hack; probably it's better to have a transaction object,
# which can do some finalization when it's either successfully or
# unsuccessfully completed. (Denys's original patch did that.)
- # RBC 20060206 hookinhg into transaction will couple lock and transaction
- # wrongly. Hookinh into unllock on the control files object is fine though.
+ # RBC 20060206 hooking into transaction will couple lock and transaction
+ # wrongly. Hooking into unlock on the control files object is fine though.
# TODO: split this per format so there is no ugly if block
if self._hashcache.needs_write and (
@@ -1401,7 +1401,7 @@
this_tree=self)
self.set_last_revision(self.branch.last_revision())
if old_tip and old_tip != self.last_revision():
- # our last revision was not the prior branch last reivison
+ # our last revision was not the prior branch last revision
# and we have converted that last revision to a pending merge.
# base is somewhere between the branch tip now
# and the now pending merge
@@ -1723,7 +1723,7 @@
def initialize(self, a_bzrdir, revision_id=None):
"""See WorkingTreeFormat.initialize().
- revision_id allows creating a working tree at a differnet
+ revision_id allows creating a working tree at a different
revision than the branch is at.
"""
if not isinstance(a_bzrdir.transport, LocalTransport):
=== modified file bzrlib/xml4.py // last-changed:jelmer at samba.org-2006061000211
... 1-ff582d7ee2090037
--- bzrlib/xml4.py
+++ bzrlib/xml4.py
@@ -27,7 +27,7 @@
class _Serializer_v4(Serializer):
"""Version 0.0.4 serializer
- You should use the serialzer_v4 singleton."""
+ You should use the serializer_v4 singleton."""
__slots__ = []
=== modified file bzrlib/xml_serializer.py // last-changed:jelmer at samba.org-200
... 60610002111-ff582d7ee2090037
--- bzrlib/xml_serializer.py
+++ bzrlib/xml_serializer.py
@@ -75,7 +75,7 @@
# performance tuning for elementree's serialiser. THis should be
# sent upstream - RBC 20060523.
-# the functions here are patched into elementree at runtime.
+# the functions here are patched into elementtree at runtime.
import elementtree.ElementTree
import re
escape_re = re.compile("[&'\"<>]")
=== modified file bzrlib/graph.py // last-changed:jelmer at samba.org-200606120153
... 19-bed212cff7f6aaf9
=== modified file bzrlib/osutils.py // last-changed:jelmer at samba.org-2006061201
... 5319-bed212cff7f6aaf9
=== modified file bzrlib/transform.py // last-changed:jelmer at samba.org-20060612
... 015319-bed212cff7f6aaf9
=== modified file bzrlib/tree.py // last-changed:jelmer at samba.org-2006061201531
... 9-bed212cff7f6aaf9
# revision id: jelmer at samba.org-20060612015319-bed212cff7f6aaf9
# sha1: 88d2b80be36d1e51036a9edba95ace42fdd0eb84
# inventory sha1: d88c52ee631ddb5afb415afc13d637bbee07c516
# parent ids:
# jelmer at samba.org-20060610002111-ff582d7ee2090037
# base id: pqm at pqm.ubuntu.com-20060609120703-138338a5b4465968
# properties:
# branch-nick: integration
# message:
# Fix some types (found using aspell).
#
# committer: Jelmer Vernooij <jelmer at samba.org>
# date: Sat 2006-06-10 01:21:11.459487915 +0100
=== modified file bzrlib/add.py
--- bzrlib/add.py
+++ bzrlib/add.py
@@ -164,7 +164,7 @@
# find the kind of the path being added. This is not
# currently determined when we list directories
# recursively, but in theory we can determine while
- # doing the directory listing on *some* platformans.
+ # doing the directory listing on *some* platforms.
# TODO: a safe, portable, clean interface which will
# be faster than os.listdir() + stat. Specifically,
# readdir - dirent.d_type supplies the file type when
=== modified file bzrlib/branch.py
--- bzrlib/branch.py
+++ bzrlib/branch.py
@@ -477,7 +477,7 @@
revision_id: if not None, the revision history in the new branch will
be truncated to end with revision_id.
"""
- # for API compatability, until 0.8 releases we provide the old api:
+ # for API compatibility, until 0.8 releases we provide the old api:
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
# after 0.8 releases, the *args and **kwargs should be changed:
# def clone(self, to_bzrdir, revision_id=None):
@@ -485,7 +485,7 @@
kwargs.get('revision', None) or
kwargs.get('basis_branch', None) or
(len(args) and isinstance(args[0], basestring))):
- # backwards compatability api:
+ # backwards compatibility api:
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
# get basis_branch
@@ -609,7 +609,7 @@
def initialize(self, a_bzrdir):
"""Create a branch of this format in a_bzrdir."""
- raise NotImplementedError(self.initialized)
+ raise NotImplementedError(self.initialize)
def is_supported(self):
"""Is this format supported?
@@ -1239,9 +1239,9 @@
:return: Either a Branch, or None
- This could memoise the branch, but if thats done
+ This could memorize the branch, but if thats done
it must be revalidated on each new lock.
- So for now we just dont memoise it.
+ So for now we just dont memorize it.
# RBC 20060304 review this decision.
"""
bound_loc = self.get_bound_location()
@@ -1293,7 +1293,7 @@
# There may be a different check you could do here
# rather than actually trying to install revisions remotely.
# TODO: capture an exception which indicates the remote branch
- # is not writeable.
+ # is not writable.
# If it is up-to-date, this probably should not be a failure
# lock other for write so the revision-history syncing cannot race
=== modified file bzrlib/builtins.py
--- bzrlib/builtins.py
+++ bzrlib/builtins.py
@@ -266,7 +266,7 @@
Adding a file whose parent directory is not versioned will
implicitly add the parent, and so on up to the root. This means
- you should never need to explictly add a directory, they'll just
+ you should never need to explicitly add a directory, they'll just
get added when you add a file in the directory.
--dry-run will show which files would be added, but not actually
@@ -2567,7 +2567,7 @@
"""
# TODO: jam 20060108 Add an option to allow uncommit to remove
- # unreferenced information in 'branch-as-repostory' branches.
+ # unreferenced information in 'branch-as-repository' branches.
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
# information in shared branches as well.
takes_options = ['verbose', 'revision',
=== modified file bzrlib/bzrdir.py
--- bzrlib/bzrdir.py
+++ bzrlib/bzrdir.py
@@ -373,7 +373,7 @@
Note that bzr dirs that do not support format strings will raise
IncompatibleFormat if the branch format they are given has
- a format string, and vice verca.
+ a format string, and vice versa.
If branch_format is None, the transport is returned with no
checking. if it is not None, then the returned transport is
@@ -386,7 +386,7 @@
Note that bzr dirs that do not support format strings will raise
IncompatibleFormat if the repository format they are given has
- a format string, and vice verca.
+ a format string, and vice versa.
If repository_format is None, the transport is returned with no
checking. if it is not None, then the returned transport is
@@ -399,7 +399,7 @@
Note that bzr dirs that do not support format strings will raise
IncompatibleFormat if the workingtree format they are given has
- a format string, and vice verca.
+ a format string, and vice versa.
If workingtree_format is None, the transport is returned with no
checking. if it is not None, then the returned transport is
@@ -434,7 +434,7 @@
# this might be better on the BzrDirFormat class because it refers to
# all the possible bzrdir disk formats.
# This method is tested via the workingtree is_control_filename tests-
- # it was extractd from WorkingTree.is_control_filename. If the methods
+ # it was extracted from WorkingTree.is_control_filename. If the methods
# contract is extended beyond the current trivial implementation please
# add new tests for it to the appropriate place.
return filename == '.bzr' or filename.startswith('.bzr/')
@@ -980,10 +980,10 @@
This returns a bzrlib.bzrdir.Converter object.
This should return the best upgrader to step this format towards the
- current default format. In the case of plugins we can/shouold provide
+ current default format. In the case of plugins we can/should provide
some means for them to extend the range of returnable converters.
- :param format: Optional format to override the default foramt of the
+ :param format: Optional format to override the default format of the
library.
"""
raise NotImplementedError(self.get_converter)
@@ -998,7 +998,7 @@
def initialize_on_transport(self, transport):
"""Initialize a new bzrdir in the base directory of a Transport."""
- # Since we don'transport have a .bzr directory, inherit the
+ # Since we don't have a .bzr directory, inherit the
# mode from the root directory
temp_control = LockableFiles(transport, '', TransportLock)
temp_control._transport.mkdir('.bzr',
=== modified file bzrlib/commit.py
--- bzrlib/commit.py
+++ bzrlib/commit.py
@@ -316,7 +316,7 @@
# revision data is in the local branch now.
# upload revision data to the master.
- # this will propogate merged revisions too if needed.
+ # this will propagate merged revisions too if needed.
if self.bound_branch:
self.master_branch.repository.fetch(self.branch.repository,
revision_id=self.rev_id)
@@ -532,7 +532,7 @@
self.builder.record_entry_contents(ie, self.parent_invs,
path, self.work_tree)
- # describe the nature of the change that has occured relative to
+ # describe the nature of the change that has occurred relative to
# the basis inventory.
if (self.basis_inv.has_id(ie.file_id)):
basis_ie = self.basis_inv[ie.file_id]
=== modified file bzrlib/config.py
--- bzrlib/config.py
+++ bzrlib/config.py
@@ -31,12 +31,12 @@
in branches.conf, you specify the url of a branch and options for it.
Wildcards may be used - * and ? as normal in shell completion. Options
-set in both bazaar.conf and branches.conf are overriden by the branches.conf
+set in both bazaar.conf and branches.conf are overridden by the branches.conf
setting.
[/home/robertc/source]
recurse=False|True(default)
email= as above
-check_signatures= as abive
+check_signatures= as above
create_signatures= as above.
explanation of options
=== modified file bzrlib/errors.py
--- bzrlib/errors.py
+++ bzrlib/errors.py
@@ -166,7 +166,7 @@
class BzrCommandError(BzrError):
# Error from malformed user command
# This is being misused as a generic exception
- # pleae subclass. RBC 20051030
+ # please subclass. RBC 20051030
#
# I think it's a waste of effort to differentiate between errors that
# are not intended to be caught anyway. UI code need not subclass
@@ -511,7 +511,7 @@
def __init__(self, bases):
warn("BzrError AmbiguousBase has been deprecated as of bzrlib 0.8.",
DeprecationWarning)
- msg = "The correct base is unclear, becase %s are all equally close" %\
+ msg = "The correct base is unclear, because %s are all equally close" %\
", ".join(bases)
BzrError.__init__(self, msg)
self.bases = bases
=== modified file bzrlib/fetch.py
--- bzrlib/fetch.py
+++ bzrlib/fetch.py
@@ -273,7 +273,7 @@
class Fetcher(object):
- """Backwards compatability glue for branch.fetch()."""
+ """Backwards compatibility glue for branch.fetch()."""
@deprecated_method(zero_eight)
def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
=== modified file bzrlib/graph.py
--- bzrlib/graph.py
+++ bzrlib/graph.py
@@ -109,7 +109,7 @@
class Graph(object):
- """A graph object which can memoise and cache results for performance."""
+ """A graph object which can memorize and cache results for performance."""
def __init__(self):
super(Graph, self).__init__()
=== modified file bzrlib/inventory.py
--- bzrlib/inventory.py
+++ bzrlib/inventory.py
@@ -160,7 +160,7 @@
versioned_file_store,
transaction,
entry_vf=None):
- """Return the revisions and entries that directly preceed this.
+ """Return the revisions and entries that directly precede this.
Returned as a map from revision to inventory entry.
@@ -471,7 +471,7 @@
def _unchanged(self, previous_ie):
"""Has this entry changed relative to previous_ie.
- This method should be overriden in child classes.
+ This method should be overridden in child classes.
"""
compatible = True
# different inv parent
=== modified file bzrlib/knit.py
--- bzrlib/knit.py
+++ bzrlib/knit.py
@@ -89,7 +89,7 @@
# TODO: Can we put in some kind of value to check that the index and data
# files belong together?
-# TODO: accomodate binaries, perhaps by storing a byte count
+# TODO: accommodate binaries, perhaps by storing a byte count
# TODO: function to check whole file
@@ -172,7 +172,7 @@
intstart intend intcount
1..count lines:
revid(utf8) newline\n
- internal represnetation is
+ internal representation is
(start, end, count, [1..count tuples (revid, newline)])
"""
result = []
@@ -362,7 +362,7 @@
:param records: A list of tuples(version_id, options, parents, size).
:param data: The data for the records. When it is written, the records
are adjusted to have pos pointing into data by the sum of
- the preceeding records sizes.
+ the preceding records sizes.
"""
# write all the data
pos = self._data.add_raw_record(data)
@@ -453,7 +453,7 @@
# maybe we have it
if self.has_version(version_id):
return False
- # optimisable if needed by memoising the _ghosts set.
+ # optimisable if needed by memorizing the _ghosts set.
items = self._index.get_graph()
for node, parents in items:
for parent in parents:
@@ -932,7 +932,7 @@
The index file on disc contains a header, followed by one line per knit
record. The same revision can be present in an index file more than once.
- The first occurence gets assigned a sequence number starting from 0.
+ The first occurrence gets assigned a sequence number starting from 0.
The format of a single line is
REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
@@ -954,7 +954,7 @@
the end of the file, then the record that is missing it will be ignored by
the parser.
- When writing new records to the index file, the data is preceeded by '\n'
+ When writing new records to the index file, the data is preceded by '\n'
to ensure that records always start on new lines even if the last write was
interrupted. As a result its normal for the last line in the index to be
missing a trailing newline. One can be added with no harmful effects.
@@ -991,7 +991,7 @@
self._cache = {}
# position in _history is the 'official' index for a revision
# but the values may have come from a newer entry.
- # so - wc -l of a knit index is != the number of uniqe names
+ # so - wc -l of a knit index is != the number of unique names
# in the weave.
self._history = []
pb = bzrlib.ui.ui_factory.nested_progress_bar()
@@ -1213,7 +1213,7 @@
if parent in self._cache]
def get_parents_with_ghosts(self, version_id):
- """Return parents of specified version wth ghosts."""
+ """Return parents of specified version with ghosts."""
return self._cache[version_id][4]
def check_versions_present(self, version_ids):
@@ -1374,7 +1374,7 @@
if len(needed_records):
# We take it that the transport optimizes the fetching as good
- # as possible (ie, reads continous ranges.)
+ # as possible (ie, reads continuous ranges.)
response = self._transport.readv(self._filename,
[(pos, size) for version_id, pos, size in needed_records])
@@ -1680,7 +1680,7 @@
j2lenget = j2len.get
newj2len = {}
- # changing b2j.get(a[i], nothing) to a try:Keyerror pair produced the
+ # changing b2j.get(a[i], nothing) to a try:KeyError pair produced the
# following improvement
# 704 0 4650.5320 2620.7410 bzrlib.knit:1336(find_longest_match)
# +326674 0 1655.1210 1655.1210 +<method 'get' of 'dict' objects>
=== modified file bzrlib/lockdir.py
--- bzrlib/lockdir.py
+++ bzrlib/lockdir.py
@@ -373,7 +373,7 @@
self.attempt_lock()
def lock_read(self):
- """Compatability-mode shared lock.
+ """Compatibility-mode shared lock.
LockDir doesn't support shared read-only locks, so this
just pretends that the lock is taken but really does nothing.
=== modified file bzrlib/log.py
--- bzrlib/log.py
+++ bzrlib/log.py
@@ -491,7 +491,7 @@
raise BzrCommandError("unknown log formatter: %r" % name)
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):
- # deprecated; for compatability
+ # deprecated; for compatibility
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)
lf.show(revno, rev, delta)
=== modified file bzrlib/merge.py
--- bzrlib/merge.py
+++ bzrlib/merge.py
@@ -792,7 +792,7 @@
pb=pb, pp=pp, reprocess=reprocess)
def _get_revision_tree(self, tree):
- """Return a revision tree releated to this tree.
+ """Return a revision tree related to this tree.
If the tree is a WorkingTree, the basis will be returned.
"""
if getattr(tree, 'get_weave', False) is False:
=== modified file bzrlib/missing.py
--- bzrlib/missing.py
+++ bzrlib/missing.py
@@ -1,4 +1,4 @@
-"""Display what revisions are missing in 'other' from 'this' and vice verca."""
+"""Display what revisions are missing in 'other' from 'this' and vice versa."""
import bzrlib.ui as ui
=== modified file bzrlib/option.py
--- bzrlib/option.py
+++ bzrlib/option.py
@@ -135,7 +135,7 @@
argname -- name of option argument, if any
"""
# TODO: perhaps a subclass that automatically does
- # --option, --no-option for reversable booleans
+ # --option, --no-option for reversible booleans
self.name = name
self.help = help
self.type = type
=== modified file bzrlib/osutils.py
--- bzrlib/osutils.py
+++ bzrlib/osutils.py
@@ -553,7 +553,7 @@
## TODO: We could later have path objects that remember their list
-## decomposition (might be too tricksy though.)
+## decomposition (might be too tricky though.)
def splitpath(p):
"""Turn string into list of parts.
=== modified file bzrlib/patches.py
--- bzrlib/patches.py
+++ bzrlib/patches.py
@@ -354,7 +354,7 @@
def difference_index(atext, btext):
- """Find the indext of the first character that differs betweeen two texts
+ """Find the indext of the first character that differs between two texts
:param atext: The first text
:type atext: str
=== modified file bzrlib/reconcile.py
--- bzrlib/reconcile.py
+++ bzrlib/reconcile.py
@@ -222,7 +222,7 @@
def _parents_are_inconsistent(self, rev_id, parents):
"""Return True if the parents list of rev_id does not match the weave.
- This detect inconsistences based on the self.thorough value:
+ This detect inconsistencies based on the self.thorough value:
if thorough is on, the first parent value is checked as well as ghost
differences.
Otherwise only the ghost differences are evaluated.
=== modified file bzrlib/repository.py
--- bzrlib/repository.py
+++ bzrlib/repository.py
@@ -174,7 +174,7 @@
self.control_files = control_files
self._revision_store = _revision_store
self.text_store = text_store
- # backwards compatability
+ # backwards compatibility
self.weave_store = text_store
# not right yet - should be more semantically clear ?
#
@@ -362,7 +362,7 @@
# this code needs to read every new line in every inventory for the
# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
- # not pesent in one of those inventories is unnecessary but not
+ # not present in one of those inventories is unnecessary but not
# harmful because we are filtering by the revision id marker in the
# inventory lines : we only select file ids altered in one of those
# revisions. We dont need to see all lines in the inventory because
@@ -670,7 +670,7 @@
if ie.revision not in w:
text_parents = []
# FIXME: TODO: The following loop *may* be overlapping/duplicate
- # with inventoryEntry.find_previous_heads(). if it is, then there
+ # with InventoryEntry.find_previous_heads(). if it is, then there
# is a latent bug here where the parents may have ancestors of each
# other. RBC, AB
for revision, tree in parent_trees.iteritems():
@@ -928,7 +928,7 @@
raise NotImplementedError(self.get_format_string)
def get_format_description(self):
- """Return the short desciption for this format."""
+ """Return the short description for this format."""
raise NotImplementedError(self.get_format_description)
def _get_revision_store(self, repo_transport, control_files):
@@ -1095,7 +1095,7 @@
- TextStores for texts, inventories,revisions.
This format is deprecated: it indexes texts using a text id which is
- removed in format 5; initializationa and write support for this format
+ removed in format 5; initialization and write support for this format
has been removed.
"""
@@ -1200,7 +1200,7 @@
class MetaDirRepositoryFormat(RepositoryFormat):
- """Common base class for the new repositories using the metadir layour."""
+ """Common base class for the new repositories using the metadir layout."""
def __init__(self):
super(MetaDirRepositoryFormat, self).__init__()
@@ -1571,7 +1571,7 @@
def is_compatible(source, target):
"""Be compatible with known Weave formats.
- We dont test for the stores being of specific types becase that
+ We dont test for the stores being of specific types because that
could lead to confusing results, and there is no need to be
overly general.
"""
@@ -1592,7 +1592,7 @@
if basis is not None:
# copy the basis in, then fetch remaining data.
basis.copy_content_into(self.target, revision_id)
- # the basis copy_content_into could misset this.
+ # the basis copy_content_into could missed this.
try:
self.target.set_make_working_trees(self.source.make_working_trees())
except NotImplementedError:
@@ -1689,7 +1689,7 @@
def is_compatible(source, target):
"""Be compatible with known Knit formats.
- We dont test for the stores being of specific types becase that
+ We dont test for the stores being of specific types because that
could lead to confusing results, and there is no need to be
overly general.
"""
=== modified file bzrlib/trace.py
--- bzrlib/trace.py
+++ bzrlib/trace.py
@@ -27,7 +27,7 @@
Exceptions are reported in a brief form to stderr so as not to look scary.
BzrErrors are required to be able to format themselves into a properly
-explanatory message. This is not true for builtin excexceptions such as
+explanatory message. This is not true for builtin exceptions such as
KeyError, which typically just str to "0". They're printed in a different
form.
"""
@@ -57,11 +57,11 @@
class QuietFormatter(logging.Formatter):
- """Formatter that supresses the details of errors.
+ """Formatter that suppresses the details of errors.
This is used by default on stderr so as not to scare the user.
"""
- # At first I tried overriding formatException to suppress the
+ # At first I tried overriding FormatException to suppress the
# exception details, but that has global effect: no loggers
# can get the exception details is we suppress them here.
=== modified file bzrlib/transform.py
--- bzrlib/transform.py
+++ bzrlib/transform.py
@@ -891,7 +891,7 @@
class FinalPaths(object):
- """Make path calculation cheap by memoizing paths.
+ """Make path calculation cheap by memorizing paths.
The underlying tree must not be manipulated between calls, or else
the results will likely be incorrect.
=== modified file bzrlib/tree.py
--- bzrlib/tree.py
+++ bzrlib/tree.py
@@ -150,6 +150,7 @@
def get_file_lines(self, file_id):
ie = self._inventory[file_id]
weave = self.get_weave(file_id)
+ assert ie.revision
return weave.get_lines(ie.revision)
def get_file_text(self, file_id):
=== modified file bzrlib/versionedfile.py
--- bzrlib/versionedfile.py
+++ bzrlib/versionedfile.py
@@ -287,7 +287,7 @@
Ghosts are not listed or referenced in the graph.
:param version_ids: Versions to select.
- None means retreive all versions.
+ None means retrieve all versions.
"""
result = {}
if version_ids is None:
@@ -483,7 +483,7 @@
# We previously considered either 'unchanged' or 'killed-both' lines
# to be possible places to resynchronize. However, assuming agreement
- # on killed-both lines may be too agressive. -- mbp 20060324
+ # on killed-both lines may be too aggressive. -- mbp 20060324
for state, line in self.plan:
if state == 'unchanged':
# resync and flush queued conflicts changes if any
@@ -638,7 +638,7 @@
class InterVersionedFileTestProviderAdapter(object):
"""A tool to generate a suite testing multiple inter versioned-file classes.
- This is done by copying the test once for each interversionedfile provider
+ This is done by copying the test once for each InterVersionedFile provider
and injecting the transport_server, transport_readonly_server,
versionedfile_factory and versionedfile_factory_to classes into each copy.
Each copy is also given a new id() to make it easy to identify.
=== modified file bzrlib/weave.py
--- bzrlib/weave.py
+++ bzrlib/weave.py
@@ -27,7 +27,7 @@
# property.
# TODO: Nothing here so far assumes the lines are really \n newlines,
-# rather than being split up in some other way. We could accomodate
+# rather than being split up in some other way. We could accommodate
# binaries, perhaps by naively splitting on \n or perhaps using
# something like a rolling checksum.
@@ -231,7 +231,7 @@
@deprecated_method(zero_eight)
def lookup(self, name):
- """Backwards compatability thunk:
+ """Backwards compatibility thunk:
Return name, as name is valid in the api now, and spew deprecation
warnings everywhere.
@@ -522,7 +522,7 @@
if lines == basis_lines:
return new_version
- # add a sentinal, because we can also match against the final line
+ # add a sentinel, because we can also match against the final line
basis_lineno.append(len(self._weave))
# XXX: which line of the weave should we really consider
@@ -1069,7 +1069,7 @@
@deprecated_method(zero_eight)
def reweave(self, other, pb=None, msg=None):
- """reweave has been superceded by plain use of join."""
+ """reweave has been superseded by plain use of join."""
return self.join(other, pb, msg)
def _reweave(self, other, pb, msg):
=== modified file bzrlib/workingtree.py
--- bzrlib/workingtree.py
+++ bzrlib/workingtree.py
@@ -149,7 +149,7 @@
class TreeEntry(object):
- """An entry that implements the minium interface used by commands.
+ """An entry that implements the minimum interface used by commands.
This needs further inspection, it may be better to have
InventoryEntries without ids - though that seems wrong. For now,
@@ -1348,8 +1348,8 @@
# of a nasty hack; probably it's better to have a transaction object,
# which can do some finalization when it's either successfully or
# unsuccessfully completed. (Denys's original patch did that.)
- # RBC 20060206 hookinhg into transaction will couple lock and transaction
- # wrongly. Hookinh into unllock on the control files object is fine though.
+ # RBC 20060206 hooking into transaction will couple lock and transaction
+ # wrongly. Hooking into unlock on the control files object is fine though.
# TODO: split this per format so there is no ugly if block
if self._hashcache.needs_write and (
@@ -1401,7 +1401,7 @@
this_tree=self)
self.set_last_revision(self.branch.last_revision())
if old_tip and old_tip != self.last_revision():
- # our last revision was not the prior branch last reivison
+ # our last revision was not the prior branch last revision
# and we have converted that last revision to a pending merge.
# base is somewhere between the branch tip now
# and the now pending merge
@@ -1723,7 +1723,7 @@
def initialize(self, a_bzrdir, revision_id=None):
"""See WorkingTreeFormat.initialize().
- revision_id allows creating a working tree at a differnet
+ revision_id allows creating a working tree at a different
revision than the branch is at.
"""
if not isinstance(a_bzrdir.transport, LocalTransport):
=== modified file bzrlib/xml4.py
--- bzrlib/xml4.py
+++ bzrlib/xml4.py
@@ -27,7 +27,7 @@
class _Serializer_v4(Serializer):
"""Version 0.0.4 serializer
- You should use the serialzer_v4 singleton."""
+ You should use the serializer_v4 singleton."""
__slots__ = []
=== modified file bzrlib/xml_serializer.py
--- bzrlib/xml_serializer.py
+++ bzrlib/xml_serializer.py
@@ -75,7 +75,7 @@
# performance tuning for elementree's serialiser. THis should be
# sent upstream - RBC 20060523.
-# the functions here are patched into elementree at runtime.
+# the functions here are patched into elementtree at runtime.
import elementtree.ElementTree
import re
escape_re = re.compile("[&'\"<>]")
# revision id: jelmer at samba.org-20060610002111-ff582d7ee2090037
# sha1: e650f62c24a0b9d7b92ce2724ff9fd18905e6070
# inventory sha1: 2e2547052b200501acb3c2e11e65166efef17d6b
# parent ids:
# pqm at pqm.ubuntu.com-20060609120703-138338a5b4465968
# properties:
# branch-nick: integration
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060612/541a8560/attachment.pgp
More information about the bazaar
mailing list