x
/
git-upstream
Code Issues Proposed changes

Update typos 

Change-Id: Ife36f10944269d94ba33ed04e00db1667d60fc49
This commit is contained in:
Swapnil Kulkarni (coolsvap) 2015-12-30 10:50:07 +05:30
parent 55dd553e9d
commit 0414e5fef5
15 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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.

0
contrib/jjb/scripts/mirror-upstream.bash Executable file → Normal file
View File

0
functional-tests/010-test_version_check.sh Executable file → Normal file
View File

0
functional-tests/020-test_help.sh Executable file → Normal file
View File

0
functional-tests/030-test_no_local_changes.sh Executable file → Normal file
View File

0
functional-tests/040-test_simple_rebase.sh Executable file → Normal file
View File

0
functional-tests/050-test_supersede.sh Executable file → Normal file
View File

0
functional-tests/060-test_drop.sh Executable file → Normal file
View File

2
functional-tests/README.md
View File

@ -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"

0
functional-tests/run_tests.sh Executable file → Normal file
View File

0
functional-tests/sample-test_name_here.sh Executable file → Normal file
View File

2
git_upstream/commands/__init__.py
View File

@ -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):

2
git_upstream/lib/searchers.py
View File

@ -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))

2
git_upstream/rebase_editor.py Executable file → Normal file
View File

@ -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

18
git_upstream/tests/test_import_cmd.py
View File

@ -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),