From 372e983459168e04fef0e9d419fb388caf752108 Mon Sep 17 00:00:00 2001
From: lovedboy <lovedboy.tk@qq.com>
Date: Thu, 22 Oct 2015 19:25:00 +0800
Subject: [PATCH 1/2] add THEFUCK_HISTORY_LIMIT, my machine is so slow

---
 README.md         |  3 ++-
 thefuck/conf.py   |  4 +++-
 thefuck/shells.py | 11 +++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 199f37b..9f3b216 100644
--- a/README.md
+++ b/README.md
@@ -302,7 +302,8 @@ Or via environment variables:
 * `THEFUCK_NO_COLORS` &ndash; disable colored output, `true/false`;
 * `THEFUCK_PRIORITY` &ndash; priority of the rules, like `no_command=9999:apt_get=100`,
 rule with lower `priority` will be matched first;
-* `THEFUCK_DEBUG` &ndash; enables debug output, `true/false`.
+* `THEFUCK_DEBUG` &ndash; enables debug output, `true/false`;
+* `THEFUCK_HISTORY_LIMIT` &ndash; how many history commands will be scanned, like `2000`.
 
 For example:
 
diff --git a/thefuck/conf.py b/thefuck/conf.py
index 3e6e55f..47eaf34 100644
--- a/thefuck/conf.py
+++ b/thefuck/conf.py
@@ -24,7 +24,8 @@ ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
                'THEFUCK_REQUIRE_CONFIRMATION': 'require_confirmation',
                'THEFUCK_NO_COLORS': 'no_colors',
                'THEFUCK_PRIORITY': 'priority',
-               'THEFUCK_DEBUG': 'debug'}
+               'THEFUCK_DEBUG': 'debug',
+               'THEFUCK_HISTORY_LIMIT': 'history_limit'}
 
 SETTINGS_HEADER = u"""# ~/.thefuck/settings.py: The Fuck settings file
 #
@@ -125,3 +126,4 @@ class Settings(dict):
 
 
 settings = Settings(DEFAULT_SETTINGS)
+settings.init()
diff --git a/thefuck/shells.py b/thefuck/shells.py
index 97d51a4..d82a88b 100644
--- a/thefuck/shells.py
+++ b/thefuck/shells.py
@@ -10,6 +10,7 @@ from time import time
 import io
 import os
 from .utils import DEVNULL, memoize, cache
+from .conf import settings
 
 
 class Generic(object):
@@ -59,10 +60,16 @@ class Generic(object):
 
     def get_history(self):
         """Returns list of history entries."""
+        tail_num = settings.get("history_limit", None)
         history_file_name = self._get_history_file_name()
         if os.path.isfile(history_file_name):
-            with io.open(history_file_name, 'r',
-                         encoding='utf-8', errors='ignore') as history:
+            if tail_num is not None:
+                _, f = os.popen2("tail -n {} {}".format(tail_num, history_file_name))
+                _.close()
+            else:
+                f = io.open(history_file_name, 'r',
+                         encoding='utf-8', errors='ignore')
+            with f as history:
                 for line in history:
                     prepared = self._script_from_history(line)\
                                    .strip()

From b3a19fe439c095e8116f76521e287a1d24af7829 Mon Sep 17 00:00:00 2001
From: lovedboy <lovedboy.tk@qq.com>
Date: Thu, 29 Oct 2015 10:14:34 +0800
Subject: [PATCH 2/2] history limit from settings

---
 README.md         | 1 +
 thefuck/conf.py   | 2 +-
 thefuck/shells.py | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9f3b216..082a1f3 100644
--- a/README.md
+++ b/README.md
@@ -314,6 +314,7 @@ export THEFUCK_REQUIRE_CONFIRMATION='true'
 export THEFUCK_WAIT_COMMAND=10
 export THEFUCK_NO_COLORS='false'
 export THEFUCK_PRIORITY='no_command=9999:apt_get=100'
+export THEFUCK_HISTORY_LIMIT='2000'
 ```
 
 ## Developing
diff --git a/thefuck/conf.py b/thefuck/conf.py
index 47eaf34..21a1775 100644
--- a/thefuck/conf.py
+++ b/thefuck/conf.py
@@ -16,6 +16,7 @@ DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                     'no_colors': False,
                     'debug': False,
                     'priority': {},
+                    'history_limit': None,
                     'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}}
 
 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
@@ -126,4 +127,3 @@ class Settings(dict):
 
 
 settings = Settings(DEFAULT_SETTINGS)
-settings.init()
diff --git a/thefuck/shells.py b/thefuck/shells.py
index d82a88b..a703780 100644
--- a/thefuck/shells.py
+++ b/thefuck/shells.py
@@ -60,10 +60,10 @@ class Generic(object):
 
     def get_history(self):
         """Returns list of history entries."""
-        tail_num = settings.get("history_limit", None)
+        tail_num = settings.history_limit
         history_file_name = self._get_history_file_name()
         if os.path.isfile(history_file_name):
-            if tail_num is not None:
+            if tail_num is not None and tail_num.isdigit():
                 _, f = os.popen2("tail -n {} {}".format(tail_num, history_file_name))
                 _.close()
             else: