MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-03-20 01:28:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #345 from mcarton/slow

Browse Source 
Fix slowness problems
This commit is contained in:
Vladimir Iakovlev 2015-08-24 11:19:48 +03:00
commit ee610032b8
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/rules/test_mercurial.py
View File

@ -2,7 +2,7 @@ import pytest
from tests.utils import Command from tests.utils import Command
from thefuck.rules.mercurial import ( from thefuck.rules.mercurial import (
extract_possisiblities, match, get_new_command extract_possibilities, match, get_new_command
) )
@ -96,8 +96,8 @@ def test_not_match(command):
'\n rebase recover remove rename resolve revert' '\n rebase recover remove rename resolve revert'
)), ['rebase', 'recover', 'remove', 'rename', 'resolve', 'revert']), )), ['rebase', 'recover', 'remove', 'rename', 'resolve', 'revert']),
]) ])
def test_extract_possisiblities(command, possibilities): def test_extract_possibilities(command, possibilities):
assert extract_possisiblities(command) == possibilities assert extract_possibilities(command) == possibilities
@pytest.mark.parametrize('command, new_command', [ @pytest.mark.parametrize('command, new_command', [

4
thefuck/rules/dirty_untar.py
View File

@ -13,12 +13,12 @@ def _is_tar_extract(cmd):
def _tar_file(cmd): def _tar_file(cmd):
tar_extentions = ('.tar', '.tar.Z', '.tar.bz2', '.tar.gz', '.tar.lz', tar_extensions = ('.tar', '.tar.Z', '.tar.bz2', '.tar.gz', '.tar.lz',
'.tar.lzma', '.tar.xz', '.taz', '.tb2', '.tbz', '.tbz2', '.tar.lzma', '.tar.xz', '.taz', '.tb2', '.tbz', '.tbz2',
'.tgz', '.tlz', '.txz', '.tz') '.tgz', '.tlz', '.txz', '.tz')
for c in cmd.split(): for c in cmd.split():
for ext in tar_extentions: for ext in tar_extensions:
if c.endswith(ext): if c.endswith(ext):
return (c, c[0:len(c)-len(ext)]) return (c, c[0:len(c)-len(ext)])

6
thefuck/rules/mercurial.py
View File

@ -2,7 +2,7 @@ import re
from thefuck.utils import get_closest from thefuck.utils import get_closest
def extract_possisiblities(command): def extract_possibilities(command):
possib = re.findall(r'\n\(did you mean one of ([^\?]+)\?\)', command.stderr) possib = re.findall(r'\n\(did you mean one of ([^\?]+)\?\)', command.stderr)
if possib: if possib:
return possib[0].split(', ') return possib[0].split(', ')
@ -24,6 +24,6 @@ def match(command, settings):
def get_new_command(command, settings): def get_new_command(command, settings):
script = command.script.split(' ') script = command.script.split(' ')
possisiblities = extract_possisiblities(command) possibilities = extract_possibilities(command)
script[1] = get_closest(script[1], possisiblities) script[1] = get_closest(script[1], possibilities)
return ' '.join(script) return ' '.join(script)

11
thefuck/shells.py
View File

@ -84,6 +84,7 @@ class Bash(Generic):
value = value[1:-1] value = value[1:-1]
return name, value return name, value
@memoize
def get_aliases(self): def get_aliases(self):
proc = Popen('bash -ic alias', stdout=PIPE, stderr=DEVNULL, proc = Popen('bash -ic alias', stdout=PIPE, stderr=DEVNULL,
shell=True) shell=True)
@ -118,15 +119,16 @@ class Fish(Generic):
" set -l exit_code $status\n" " set -l exit_code $status\n"
" set -l eval_script" " set -l eval_script"
" (mktemp 2>/dev/null ; or mktemp -t 'thefuck')\n" " (mktemp 2>/dev/null ; or mktemp -t 'thefuck')\n"
" set -l fucked_up_commandd $history[1]\n" " set -l fucked_up_command $history[1]\n"
" thefuck $fucked_up_commandd > $eval_script\n" " thefuck $fucked_up_command > $eval_script\n"
" . $eval_script\n" " . $eval_script\n"
" rm $eval_script\n" " rm $eval_script\n"
" if test $exit_code -ne 0\n" " if test $exit_code -ne 0\n"
" history --delete $fucked_up_commandd\n" " history --delete $fucked_up_command\n"
" end\n" " end\n"
"end").format(fuck) "end").format(fuck)
@memoize
def get_aliases(self): def get_aliases(self):
overridden = self._get_overridden_aliases() overridden = self._get_overridden_aliases()
proc = Popen('fish -ic functions', stdout=PIPE, stderr=DEVNULL, proc = Popen('fish -ic functions', stdout=PIPE, stderr=DEVNULL,
@ -168,6 +170,7 @@ class Zsh(Generic):
value = value[1:-1] value = value[1:-1]
return name, value return name, value
@memoize
def get_aliases(self): def get_aliases(self):
proc = Popen('zsh -ic alias', stdout=PIPE, stderr=DEVNULL, proc = Popen('zsh -ic alias', stdout=PIPE, stderr=DEVNULL,
shell=True) shell=True)
@ -200,6 +203,7 @@ class Tcsh(Generic):
name, value = alias.split("\t", 1) name, value = alias.split("\t", 1)
return name, value return name, value
@memoize
def get_aliases(self): def get_aliases(self):
proc = Popen('tcsh -ic alias', stdout=PIPE, stderr=DEVNULL, proc = Popen('tcsh -ic alias', stdout=PIPE, stderr=DEVNULL,
shell=True) shell=True)
@ -257,7 +261,6 @@ def and_(*commands):
return _get_shell().and_(*commands) return _get_shell().and_(*commands)
@memoize
def get_aliases(): def get_aliases():
return list(_get_shell().get_aliases().keys()) return list(_get_shell().get_aliases().keys())