From 0414e5fef55ee89439c469d2fc0c7efae88db5d3 Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Wed, 30 Dec 2015 10:50:07 +0530 Subject: [PATCH] Update typos Change-Id: Ife36f10944269d94ba33ed04e00db1667d60fc49 --- README.md | 2 +- contrib/jjb/scripts/mirror-upstream.bash | 0 functional-tests/010-test_version_check.sh | 0 functional-tests/020-test_help.sh | 0 functional-tests/030-test_no_local_changes.sh | 0 functional-tests/040-test_simple_rebase.sh | 0 functional-tests/050-test_supersede.sh | 0 functional-tests/060-test_drop.sh | 0 functional-tests/README.md | 2 +- functional-tests/run_tests.sh | 0 functional-tests/sample-test_name_here.sh | 0 git_upstream/commands/__init__.py | 2 +- git_upstream/lib/searchers.py | 2 +- git_upstream/rebase_editor.py | 2 +- git_upstream/tests/test_import_cmd.py | 18 +++++++++--------- 15 files changed, 14 insertions(+), 14 deletions(-) mode change 100755 => 100644 contrib/jjb/scripts/mirror-upstream.bash mode change 100755 => 100644 functional-tests/010-test_version_check.sh mode change 100755 => 100644 functional-tests/020-test_help.sh mode change 100755 => 100644 functional-tests/030-test_no_local_changes.sh mode change 100755 => 100644 functional-tests/040-test_simple_rebase.sh mode change 100755 => 100644 functional-tests/050-test_supersede.sh mode change 100755 => 100644 functional-tests/060-test_drop.sh mode change 100755 => 100644 functional-tests/run_tests.sh mode change 100755 => 100644 functional-tests/sample-test_name_here.sh mode change 100755 => 100644 git_upstream/rebase_editor.py diff --git a/README.md b/README.md index 56d78d3..7335e1d 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ Import code from specified upstream branch. Creates an import branch from the specified upstream branch, and optionally merges additional branches given as arguments. Current branch, unless overridden by the `--into` option, is used as the target branch from which a list of changes to apply onto the new import is -constructed based on the the specified strategy. Once complete it will merge +constructed based on the specified strategy. Once complete it will merge and replace the contents of the target branch with those from the import branch, unless `--no-merge` is specified. diff --git a/contrib/jjb/scripts/mirror-upstream.bash b/contrib/jjb/scripts/mirror-upstream.bash old mode 100755 new mode 100644 diff --git a/functional-tests/010-test_version_check.sh b/functional-tests/010-test_version_check.sh old mode 100755 new mode 100644 diff --git a/functional-tests/020-test_help.sh b/functional-tests/020-test_help.sh old mode 100755 new mode 100644 diff --git a/functional-tests/030-test_no_local_changes.sh b/functional-tests/030-test_no_local_changes.sh old mode 100755 new mode 100644 diff --git a/functional-tests/040-test_simple_rebase.sh b/functional-tests/040-test_simple_rebase.sh old mode 100755 new mode 100644 diff --git a/functional-tests/050-test_supersede.sh b/functional-tests/050-test_supersede.sh old mode 100755 new mode 100644 diff --git a/functional-tests/060-test_drop.sh b/functional-tests/060-test_drop.sh old mode 100755 new mode 100644 diff --git a/functional-tests/README.md b/functional-tests/README.md index c0e8425..31721b7 100644 --- a/functional-tests/README.md +++ b/functional-tests/README.md @@ -26,7 +26,7 @@ Copy the following file giving it a name that matches the aforementioned regexp. -Then edit the file definig a function that performs the actual test +Then edit the file defining a function that performs the actual test function test_name1() { log DEBUG "Starting $TEST_NAME::$FUNCNAME" diff --git a/functional-tests/run_tests.sh b/functional-tests/run_tests.sh old mode 100755 new mode 100644 diff --git a/functional-tests/sample-test_name_here.sh b/functional-tests/sample-test_name_here.sh old mode 100755 new mode 100644 diff --git a/git_upstream/commands/__init__.py b/git_upstream/commands/__init__.py index afc641c..f70e1ee 100644 --- a/git_upstream/commands/__init__.py +++ b/git_upstream/commands/__init__.py @@ -23,7 +23,7 @@ import textwrap class AppendReplaceAction(argparse._AppendAction): - """Allows setting of a default value which is overriden by the first use + """Allows setting of a default value which is overridden by the first use of the option, while subsequent calls will then append. """ def __init__(self, *args, **kwargs): diff --git a/git_upstream/lib/searchers.py b/git_upstream/lib/searchers.py index 4a0b320..dc86864 100644 --- a/git_upstream/lib/searchers.py +++ b/git_upstream/lib/searchers.py @@ -689,5 +689,5 @@ class ReverseCommitFilter(LogDedentMixin, CommitFilter): """ def filter(self, commit_iter): - self.log.debug("Comsuming generators to reverse commit list") + self.log.debug("Consuming generators to reverse commit list") return reversed(list(commit_iter)) diff --git a/git_upstream/rebase_editor.py b/git_upstream/rebase_editor.py old mode 100755 new mode 100644 index 6bae45d..ab46bd0 --- a/git_upstream/rebase_editor.py +++ b/git_upstream/rebase_editor.py @@ -21,7 +21,7 @@ Command line editor for modifying git rebase instructions file through use of the interactive mode. Will in turn launch an editor in turn if the user wished to use the interactive mode of git-rebase. -Script will replace all occurances of 'pick' or any other instruction entry +Script will replace all occurrences of 'pick' or any other instruction entry with a list of instructions read from the given input file. Avoid use of stdin for passing such information as many editors have problems diff --git a/git_upstream/tests/test_import_cmd.py b/git_upstream/tests/test_import_cmd.py index 7c4a426..056e5ba 100644 --- a/git_upstream/tests/test_import_cmd.py +++ b/git_upstream/tests/test_import_cmd.py @@ -75,7 +75,7 @@ class TestImportCommand(BaseTestCase): self.git.tag(inspect.currentframe().f_code.co_name, 'upstream/master') args = self.parser.parse_args(['-q', 'import', 'upstream/master']) self.assertThat(args.cmd.run(args), Equals(True), - "import command failed to complete succesfully") + "import command failed to complete successfully") def test_basic_additional(self): """Test that default behaviour and options work @@ -112,7 +112,7 @@ class TestImportCommand(BaseTestCase): args = self.parser.parse_args(['-q', 'import', 'upstream/master', 'packaging/master']) self.assertThat(args.cmd.run(args), Equals(True), - "import command failed to complete succesfully") + "import command failed to complete successfully") def test_basic_additional_missed(self): """Test that forgetting an additional branch that was previously @@ -151,7 +151,7 @@ class TestImportCommand(BaseTestCase): with mock.patch.object(args.cmd.log, 'warning') as mock_logger: self.assertThat(args.cmd.run(args), Equals(True), - "import command failed to complete succesfully") + "import command failed to complete successfully") mock_logger.assert_called_with( SubstringMatcher( @@ -205,7 +205,7 @@ class TestImportCommand(BaseTestCase): self.git.tag(inspect.currentframe().f_code.co_name, 'upstream/master') args = self.parser.parse_args(['-q', 'import']) self.assertThat(args.cmd.run(args), Equals(True), - "import command failed to complete succesfully") + "import command failed to complete successfully") changes = list(Commit.iter_items( self.repo, 'upstream/master..master^2')) self.assertThat(len(changes), Equals(2), @@ -260,7 +260,7 @@ class TestImportCommand(BaseTestCase): ('H', ['G']) ] - # use 'custom/*' to ensure defaults are overriden correctly + # use 'custom/*' to ensure defaults are overridden correctly branches = { 'head': ('master', 'F'), 'upstream': ('custom/master', 'H'), @@ -273,7 +273,7 @@ class TestImportCommand(BaseTestCase): args = self.parser.parse_args(['-q', 'import', '--into=master', 'custom/master']) self.assertThat(args.cmd.run(args), Equals(True), - "import command failed to complete succesfully") + "import command failed to complete successfully") changes = list(Commit.iter_items( self.repo, 'custom/master..master^2')) local_rebased = ['F', 'E', 'D', 'C'] @@ -328,7 +328,7 @@ class TestImportCommand(BaseTestCase): ('H', ['G']) ] - # use 'custom/*' to ensure defaults are overriden correctly + # use 'custom/*' to ensure defaults are overridden correctly branches = { 'head': ('master', 'F'), 'upstream': ('custom/master', 'H'), @@ -342,7 +342,7 @@ class TestImportCommand(BaseTestCase): '--search-refs=custom-d/*', '--into=master', 'custom/master']) self.assertThat(args.cmd.run(args), Equals(True), - "import command failed to complete succesfully") + "import command failed to complete successfully") changes = list(Commit.iter_items( self.repo, 'custom/master..master^2')) self.assertThat(len(changes), Equals(2), @@ -408,7 +408,7 @@ class TestImportCommand(BaseTestCase): '--import-branch=import/F', '--into=master', 'upstream/master']) self.assertThat(args.cmd.run(args), Equals(True), - "import command failed to complete succesfully") + "import command failed to complete successfully") changes = list(Commit.iter_items( self.repo, 'upstream/master..master^2')) self.assertThat(len(changes), Equals(2),