diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-12 11:40:51 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-12 11:40:51 +0000 |
| commit | f4894d37cd96953707635ea1902a0a115741f4e3 (patch) | |
| tree | 90d9b3489f9abe6631e8968e56f9846c7b64b4de | |
| parent | 3853f1986ca04deee5d470f9f5f181556bcd29ed (diff) | |
| download | definitions-f4894d37cd96953707635ea1902a0a115741f4e3.tar.gz | |
Fix spelling mistakes
| -rw-r--r-- | morphlib/buildsystem_tests.py | 2 | ||||
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 6 | ||||
| -rw-r--r-- | morphlib/plugins/trebuchet_plugin.py | 2 | ||||
| -rwxr-xr-x | tests.branching/ambiguous-refs.script | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/morphlib/buildsystem_tests.py b/morphlib/buildsystem_tests.py index fa7f36f7..d1095037 100644 --- a/morphlib/buildsystem_tests.py +++ b/morphlib/buildsystem_tests.py @@ -106,7 +106,7 @@ class LookupBuildSystemTests(unittest.TestCase): return morphlib.buildsystem.lookup_build_system(name) def test_raises_keyerror_for_unknown_name(self): - self.assertRaises(KeyError, self.lookup, 'unkonwn') + self.assertRaises(KeyError, self.lookup, 'unknown') def test_looks_up_manual(self): self.assertEqual(type(self.lookup('manual')), diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 332cdfe9..21a5970c 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -712,7 +712,7 @@ class BranchAndMergePlugin(cliapp.Plugin): (stratum_name, chunk_name, system_branch)) self.print_changelog('The following changes were made but have not ' - 'been comitted') + 'been committed') def petrify(self, args): '''Convert all chunk refs in a system branch to be fixed SHA1s @@ -783,7 +783,7 @@ class BranchAndMergePlugin(cliapp.Plugin): self.save_morphology(repo_dir, morph, stratum) self.print_changelog('The following changes were made but have not ' - 'been comitted') + 'been committed') def unpetrify(self, args): '''Reverse the process of petrification''' @@ -823,7 +823,7 @@ class BranchAndMergePlugin(cliapp.Plugin): self.save_morphology(root_repo_dir, name, morphology) self.print_changelog('The following changes were made but have not ' - 'been comitted') + 'been committed') # When 'merge' is unset, git doesn't try to resolve conflicts itself in # those files. diff --git a/morphlib/plugins/trebuchet_plugin.py b/morphlib/plugins/trebuchet_plugin.py index 4fa25e91..2bdf4c3c 100644 --- a/morphlib/plugins/trebuchet_plugin.py +++ b/morphlib/plugins/trebuchet_plugin.py @@ -93,7 +93,7 @@ class TrebuchetPlugin(cliapp.Plugin): if len(args) != 7: raise cliapp.AppException('make-patch requires arguments: ' - 'name of output file plus two triplest') + 'name of output file plus two triplets') output = args[0] repo_name1, ref1, filename1 = args[1:4] diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script index 3321a310..92b80d4a 100755 --- a/tests.branching/ambiguous-refs.script +++ b/tests.branching/ambiguous-refs.script @@ -15,7 +15,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# 'git show-ref master' sorts its output alphebetically, so we can't rely on +# 'git show-ref master' sorts its output alphabetically, so we can't rely on # it to resolve 'master': we might get 'alpha/master' instead. set -eu |