MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-03-19 17:18:42 +00:00
Code Issues Releases Wiki Activity

Escape single quote in branch names

Browse Source
This commit is contained in:
David 2018-01-02 23:17:19 +00:00
parent 045c8ae76c
commit 85e240e7d1
2 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tests/rules/test_git_push.py
View File

@ -4,38 +4,51 @@ from thefuck.types import Command
@pytest.fixture @pytest.fixture
def output(): def output(branch):
return '''fatal: The current branch master has no upstream branch. return '''fatal: The current branch {} has no upstream branch.
To push the current branch and set the remote as upstream, use To push the current branch and set the remote as upstream, use
git push --set-upstream origin master git push --set-upstream origin {}
''' '''.format(branch, branch)
def test_match(output): @pytest.mark.parametrize('command', [
assert match(Command('git push', output)) Command('git push', output('master')),
assert match(Command('git push master', output)) Command('git push master', output('master'))])
assert not match(Command('git push master', '')) def test_match(command):
assert not match(Command('ls', output)) assert match(command)
def test_get_new_command(output): @pytest.mark.parametrize('command', [
assert get_new_command(Command('git push', output))\ Command('git push master', ''),
== "git push --set-upstream origin master" Command('ls', output('master'))])
assert get_new_command(Command('git push master', output))\ def test_not_match(command):
== "git push --set-upstream origin master" assert not match(command)
assert get_new_command(Command('git push -u', output))\
== "git push --set-upstream origin master"
assert get_new_command(Command('git push -u origin', output))\ @pytest.mark.parametrize('command, new_command', [
== "git push --set-upstream origin master" (Command('git push master', output('master')),
assert get_new_command(Command('git push origin', output))\ 'git push --set-upstream origin master'),
== "git push --set-upstream origin master" (Command('git push master', output('master')),
assert get_new_command(Command('git push --set-upstream origin', output))\ 'git push --set-upstream origin master'),
== "git push --set-upstream origin master" (Command('git push master', output('master')),
assert get_new_command(Command('git push --quiet', output))\ 'git push --set-upstream origin master'),
== "git push --set-upstream origin master --quiet" (Command('git push -u', output('master')),
assert get_new_command(Command('git push --quiet origin', output))\ 'git push --set-upstream origin master'),
== "git push --set-upstream origin master --quiet" (Command('git push -u origin', output('master')),
assert get_new_command(Command('git -c test=test push --quiet origin', output))\ 'git push --set-upstream origin master'),
== "git -c test=test push --set-upstream origin master --quiet" (Command('git push origin', output('master')),
'git push --set-upstream origin master'),
(Command('git push --set-upstream origin', output('master')),
'git push --set-upstream origin master'),
(Command('git push --quiet', output('master')),
'git push --set-upstream origin master --quiet'),
(Command('git push --quiet origin', output('master')),
'git push --set-upstream origin master --quiet'),
(Command('git -c test=test push --quiet origin', output('master')),
'git -c test=test push --set-upstream origin master --quiet'),
(Command('git push', output("test's")),
"git push --set-upstream origin test\\'s")])
def test_get_new_command(command, new_command):
assert get_new_command(command) == new_command

2
thefuck/rules/git_push.py
View File

@ -39,6 +39,6 @@ def get_new_command(command):
while len(command_parts) > push_idx and command_parts[len(command_parts) - 1][0] != '-': while len(command_parts) > push_idx and command_parts[len(command_parts) - 1][0] != '-':
command_parts.pop(len(command_parts) - 1) command_parts.pop(len(command_parts) - 1)
arguments = re.findall(r'git push (.*)', command.output)[0].strip() arguments = re.findall(r'git push (.*)', command.output)[0].replace("'", r"\'").strip()
return replace_argument(" ".join(command_parts), 'push', return replace_argument(" ".join(command_parts), 'push',
'push {}'.format(arguments)) 'push {}'.format(arguments))