Merge lp:~jelmer/brz/compatibility-typos into lp:brz

[Jelmer Vernooij]

Fix a commonly typoed word: compatibility.

Fix a commonly typoed word: compatibility.

[Martin Packman (gz)]

Thanks. This is one of my common ones...

review: Approve

=== modified file 'breezy/bundle/bundle_data.py'
--- breezy/bundle/bundle_data.py	2019-01-01 21:23:40 +0000
+++ breezy/bundle/bundle_data.py	2019-02-11 21:54:25 +0000
@@ -769,7 +769,7 @@
                 return
         entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
         if inv.root is not None and not include_root and from_dir is None:
-            # skip the root for compatability with the current apis.
+            # skip the root for compatibility with the current apis.
             next(entries)
         for path, entry in entries:
             yield path, 'V', entry.kind, entry

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2018-11-22 03:51:03 +0000
+++ breezy/bzr/inventorytree.py	2019-02-11 21:54:25 +0000
@@ -755,7 +755,7 @@
                 return
         entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
         if inv.root is not None and not include_root and from_dir is None:
-            # skip the root for compatability with the current apis.
+            # skip the root for compatibility with the current apis.
             next(entries)
         for path, entry in entries:
             yield path, 'V', entry.kind, entry

=== modified file 'breezy/plugins/weave_fmt/test_workingtree.py'
--- breezy/plugins/weave_fmt/test_workingtree.py	2018-05-27 16:53:07 +0000
+++ breezy/plugins/weave_fmt/test_workingtree.py	2019-02-11 21:54:25 +0000
@@ -41,7 +41,7 @@
             url, format=BzrDirFormat6())
 
     def test_conflicts(self):
-        # test backwards compatability
+        # test backwards compatibility
         tree = self.create_format2_tree('.')
         self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
                           None)

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2018-11-20 08:21:11 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2019-02-11 21:54:25 +0000
@@ -943,7 +943,7 @@
         if tree.supports_setting_file_ids():
             tree.add(['foo'], [b'foo-id'])
             self.assertEqual(b'foo-id', tree.path2id('foo'))
-            # the next assertion is for backwards compatability with
+            # the next assertion is for backwards compatibility with
             # WorkingTree3, though its probably a bad idea, it makes things
             # work. Perhaps it should raise a deprecation warning?
             self.assertEqual(b'foo-id', tree.path2id('foo/'))

=== modified file 'breezy/tests/test_selftest.py'
--- breezy/tests/test_selftest.py	2019-02-02 15:13:30 +0000
+++ breezy/tests/test_selftest.py	2019-02-11 21:54:25 +0000
@@ -1603,7 +1603,7 @@
         self.assertEqual([], result.failures)
 
     def test_run_disabled_unittest_result(self):
-        """Test our compatability for disabled tests with unittest results."""
+        """Test our compatibility for disabled tests with unittest results."""
         test = SampleTestCase('_test_pass')
 
         class DisabledFeature(object):

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2019-01-01 21:56:21 +0000
+++ breezy/workingtree.py	2019-02-11 21:54:25 +0000
@@ -1082,7 +1082,7 @@
         if not self.supports_setting_file_ids():
             raise SettingFileIdUnsupported()
         with self.lock_tree_write():
-            # for compatability
+            # for compatibility
             if file_id is None:
                 raise ValueError(
                     'WorkingTree.set_root_id with fileid=None')

=== modified file 'doc/developers/development-repo.txt'
--- doc/developers/development-repo.txt	2018-11-18 13:43:04 +0000
+++ doc/developers/development-repo.txt	2019-02-11 21:54:25 +0000
@@ -44,10 +44,10 @@
    development version available before pulling in bzr.dev changes
    around release time, as that is when old format cleanups will occur.
 
-We cannot guarantee backwards compatability though, because some of the
+We cannot guarantee backwards compatibility though, because some of the
 planned work may be 'upgrade only'. Please see ``bzr help formats`` for
 the text of the 'development' format which will indicate its
-compatability with other formats if you need to interoperate with
+compatibility with other formats if you need to interoperate with
 users or services that do not have bzr.dev.
 
 Before converting to a development format

=== modified file 'doc/developers/plans/performance/planned-performance-changes.txt'
--- doc/developers/plans/performance/planned-performance-changes.txt	2017-11-11 12:51:45 +0000
+++ doc/developers/plans/performance/planned-performance-changes.txt	2019-02-11 21:54:25 +0000
@@ -17,7 +17,7 @@
 in widespread use at that time will be very important, otherwise the user base
 may be split in two - users that have upgraded and users that have not.
 
-The following changes are grouped according to their compatability impact:
+The following changes are grouped according to their compatibility impact:
 library only, disk format but interoperable, disk format interoperability
 unknown, and disk format, not interoperable.
 

=== modified file 'doc/en/release-notes/bzr-0.12.txt'
--- doc/en/release-notes/bzr-0.12.txt	2010-10-08 08:15:14 +0000
+++ doc/en/release-notes/bzr-0.12.txt	2019-02-11 21:54:25 +0000
@@ -46,7 +46,7 @@
   to allow modules to be loaded on request.
   (John Arbash Meinel, Adeodato Simó)
 
-API Incompatability
+API Incompatibility
 *******************
 
 * LogFormatter subclasses show now expect the 'revno' parameter to

=== modified file 'doc/en/release-notes/bzr-0.16.txt'
--- doc/en/release-notes/bzr-0.16.txt	2010-11-12 22:43:38 +0000
+++ doc/en/release-notes/bzr-0.16.txt	2019-02-11 21:54:25 +0000
@@ -183,7 +183,7 @@
 Internals
 *********
 
-* bzrlib API compatability with 0.8 has been dropped, cleaning up some
+* bzrlib API compatibility with 0.8 has been dropped, cleaning up some
   code paths. (Robert Collins)
 
 * Change the format of chroot URLS so that they can be safely manipulated