Rev 5450: (gz) Correct some use of "it's" and "its" in bzrlib (Martin [gz]) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Sep 29 10:56:24 BST 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5450 [merge]
revision-id: pqm at pqm.ubuntu.com-20100929095623-hbeqc58mblx1or7v
parent: pqm at pqm.ubuntu.com-20100929082928-02ubdohahyx23qnf
parent: gzlist at googlemail.com-20100928185147-c07zkm6js2kbu0uu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-09-29 10:56:23 +0100
message:
(gz) Correct some use of "it's" and "its" in bzrlib (Martin [gz])
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/chk_map.py chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/crash.py crash.py-20090812083334-d6volool4lktdjcx-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
=== modified file 'NEWS'
--- a/NEWS 2010-09-28 16:28:45 +0000
+++ b/NEWS 2010-09-29 09:56:23 +0000
@@ -467,7 +467,7 @@
when ``bzr selftest --parallel=fork`` is used. (Martin [gz], #528730)
* Rearrange thread leak detection code to eliminate global state and make it
- possible to extend the reporting. (Marting [gz], #633462)
+ possible to extend the reporting. (Martin [gz], #633462)
* Suppress the "maximum recursion depth exceeded in __subclasscheck__"
warning on stderr emitted during ``test_dict_deepnested`` in
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2010-09-24 08:40:33 +0000
+++ b/bzrlib/branch.py 2010-09-28 18:51:47 +0000
@@ -1522,7 +1522,7 @@
* an open routine.
Formats are placed in an dict by their format string for reference
- during branch opening. Its not required that these be instances, they
+ during branch opening. It's not required that these be instances, they
can be classes themselves with class methods - it simply depends on
whether state is needed for a given format or not.
@@ -3480,7 +3480,7 @@
# push into the master from the source branch.
self.source._basic_push(master_branch, overwrite, stop_revision)
# and push into the target branch from the source. Note that we
- # push from the source branch again, because its considered the
+ # push from the source branch again, because it's considered the
# highest bandwidth repository.
result = self.source._basic_push(self.target, overwrite,
stop_revision)
=== modified file 'bzrlib/bundle/bundle_data.py'
--- a/bzrlib/bundle/bundle_data.py 2010-08-24 12:33:26 +0000
+++ b/bzrlib/bundle/bundle_data.py 2010-09-28 18:51:47 +0000
@@ -289,7 +289,7 @@
def _validate_revision(self, inventory, revision_id):
"""Make sure all revision entries match their checksum."""
- # This is a mapping from each revision id to it's sha hash
+ # This is a mapping from each revision id to its sha hash
rev_to_sha1 = {}
rev = self.get_revision(revision_id)
=== modified file 'bzrlib/chk_map.py'
--- a/bzrlib/chk_map.py 2010-07-21 09:58:42 +0000
+++ b/bzrlib/chk_map.py 2010-09-28 18:51:47 +0000
@@ -1369,7 +1369,7 @@
return self._search_prefix
def unmap(self, store, key, check_remap=True):
- """Remove key from this node and it's children."""
+ """Remove key from this node and its children."""
if not len(self._items):
raise AssertionError("can't unmap in an empty InternalNode.")
children = [node for node, _
=== modified file 'bzrlib/crash.py'
--- a/bzrlib/crash.py 2010-05-20 18:23:17 +0000
+++ b/bzrlib/crash.py 2010-09-28 18:51:47 +0000
@@ -20,7 +20,7 @@
A crash is an exception propagated up almost to the top level of Bazaar.
If we have apport <https://launchpad.net/apport/>, we store a report of the
-crash using apport into it's /var/crash spool directory, from where the user
+crash using apport into its /var/crash spool directory, from where the user
can either manually send it to Launchpad. In some cases (at least Ubuntu
development releases), Apport may pop up a window asking if they want
to send it.
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2010-09-13 06:36:59 +0000
+++ b/bzrlib/errors.py 2010-09-28 18:51:47 +0000
@@ -1395,7 +1395,7 @@
class WeaveInvalidChecksum(WeaveError):
- _fmt = "Text did not match it's checksum: %(msg)s"
+ _fmt = "Text did not match its checksum: %(msg)s"
class WeaveTextDiffers(WeaveError):
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py 2010-08-28 04:21:40 +0000
+++ b/bzrlib/help_topics/__init__.py 2010-09-28 18:51:47 +0000
@@ -512,7 +512,7 @@
checkout Create a working tree when a branch does not have one.
remove-tree Removes the working tree from a branch when it is safe to do so.
- update When a working tree is out of sync with it's associated branch
+ update When a working tree is out of sync with its associated branch
this will update the tree to match the branch.
"""
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2010-09-01 11:27:40 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2010-09-28 18:51:47 +0000
@@ -722,7 +722,7 @@
:return: A Pack object, or None if nothing was copied.
"""
# open a pack - using the same name as the last temporary file
- # - which has already been flushed, so its safe.
+ # - which has already been flushed, so it's safe.
# XXX: - duplicate code warning with start_write_group; fix before
# considering 'done'.
if self._pack_collection._new_pack is not None:
@@ -1292,7 +1292,7 @@
# reinserted, and if d3 has incorrect parents it will also be
# reinserted. If we insert d3 first, d2 is present (as it was bulk
# copied), so we will try to delta, but d2 is not currently able to be
- # extracted because it's basis d1 is not present. Topologically sorting
+ # extracted because its basis d1 is not present. Topologically sorting
# addresses this. The following generates a sort for all the texts that
# are being inserted without having to reference the entire text key
# space (we only topo sort the revisions, which is smaller).
@@ -1600,9 +1600,9 @@
pack_operations = [[0, []]]
# plan out what packs to keep, and what to reorganise
while len(existing_packs):
- # take the largest pack, and if its less than the head of the
+ # take the largest pack, and if it's less than the head of the
# distribution chart we will include its contents in the new pack
- # for that position. If its larger, we remove its size from the
+ # for that position. If it's larger, we remove its size from the
# distribution chart
next_pack_rev_count, next_pack = existing_packs.pop(0)
if next_pack_rev_count >= pack_distribution[0]:
@@ -1643,7 +1643,7 @@
:return: True if the disk names had not been previously read.
"""
- # NB: if you see an assertion error here, its probably access against
+ # NB: if you see an assertion error here, it's probably access against
# an unlocked repo. Naughty.
if not self.repo.is_locked():
raise errors.ObjectNotLocked(self.repo)
@@ -1946,7 +1946,7 @@
# disk index because the set values are the same, unless
# the only index shows up as deleted by the set difference
# - which it may. Until there is a specific test for this,
- # assume its broken. RBC 20071017.
+ # assume it's broken. RBC 20071017.
self._remove_pack_from_memory(self.get_pack_by_name(name))
self._names[name] = sizes
self.get_pack_by_name(name)
@@ -2017,9 +2017,9 @@
"""
# The ensure_loaded call is to handle the case where the first call
# made involving the collection was to reload_pack_names, where we
- # don't have a view of disk contents. Its a bit of a bandaid, and
- # causes two reads of pack-names, but its a rare corner case not struck
- # with regular push/pull etc.
+ # don't have a view of disk contents. It's a bit of a bandaid, and
+ # causes two reads of pack-names, but it's a rare corner case not
+ # struck with regular push/pull etc.
first_read = self.ensure_loaded()
if first_read:
return True
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2010-09-24 01:59:46 +0000
+++ b/bzrlib/repository.py 2010-09-28 18:51:47 +0000
@@ -434,7 +434,7 @@
else:
# we don't need to commit this, because the caller already
# determined that an existing revision of this file is
- # appropriate. If its not being considered for committing then
+ # appropriate. If it's not being considered for committing then
# it and all its parents to the root must be unaltered so
# no-change against the basis.
if ie.revision == self._new_revision_id:
@@ -756,7 +756,7 @@
# after iter_changes examines and decides it has changed,
# we will unconditionally record a new version even if some
# other process reverts it while commit is running (with
- # the revert happening after iter_changes did it's
+ # the revert happening after iter_changes did its
# examination).
if change[7][1]:
entry.executable = True
@@ -945,7 +945,7 @@
pointing to .bzr/repository.
"""
- # What class to use for a CommitBuilder. Often its simpler to change this
+ # What class to use for a CommitBuilder. Often it's simpler to change this
# in a Repository class subclass rather than to override
# get_commit_builder.
_commit_builder_class = CommitBuilder
@@ -2619,7 +2619,7 @@
types it should be a no-op that just returns.
This stub method does not require a lock, but subclasses should use
- @needs_write_lock as this is a long running call its reasonable to
+ @needs_write_lock as this is a long running call it's reasonable to
implicitly lock for the user.
:param hint: If not supplied, the whole repository is packed.
@@ -4065,7 +4065,7 @@
basis_id = first_rev.parent_ids[0]
# only valid as a basis if the target has it
self.target.get_revision(basis_id)
- # Try to get a basis tree - if its a ghost it will hit the
+ # Try to get a basis tree - if it's a ghost it will hit the
# NoSuchRevision case.
basis_tree = self.source.revision_tree(basis_id)
except (IndexError, errors.NoSuchRevision):
=== modified file 'bzrlib/transport/ssh.py'
--- a/bzrlib/transport/ssh.py 2010-09-17 07:40:08 +0000
+++ b/bzrlib/transport/ssh.py 2010-09-28 18:51:47 +0000
@@ -131,7 +131,7 @@
# is given in BZR_SSH. See https://bugs.launchpad.net/bugs/414743
elif 'plink' in version and progname == 'plink':
# Checking if "plink" was the executed argument as Windows
- # sometimes reports 'ssh -V' incorrectly with 'plink' in it's
+ # sometimes reports 'ssh -V' incorrectly with 'plink' in its
# version. See https://bugs.launchpad.net/bzr/+bug/107155
trace.mutter("ssh implementation is Putty's plink.")
vendor = PLinkSubprocessVendor()
More information about the bazaar-commits
mailing list