Fixes based on scopatz' feedback.

docs/envvars.rst

@@ -75,7 +75,7 @@ applicable.
       - Dictionary containing variables to be used when formatting PROMPT and TITLE 
         see `Customizing the Prompt <tutorial.html#customizing-the-prompt>`_.
     * - HISTCONTROL
-      - ``''``
+      - ``set([])``
       - A set of strings (comma-separated list in string form) of options that
         determine what commands are saved to the history list. By default all
         commands are saved. The option ``ignoredups`` will not save the command

tests/test_history.py

@@ -16,7 +16,7 @@ from xonsh.lazyjson import LazyJSON
 from xonsh.history import History
 from xonsh import history
 
-from tools import mock_xonsh_env
+from tests.tools import mock_xonsh_env
 
 HIST_TEST_KWARGS = dict(sessionid='SESSIONID', gc=False)
 
@@ -37,7 +37,7 @@ def test_hist_append():
     FNAME = 'xonsh-SESSIONID.json'
     FNAME += '.append'
     hist = History(filename=FNAME, here='yup', **HIST_TEST_KWARGS)
-    with mock_xonsh_env({}):
+    with mock_xonsh_env({'HISTCONTROL': set()}):
         hf = hist.append({'joco': 'still alive'})
     yield assert_is_none, hf
     yield assert_equal, 'still alive', hist.buffer[0]['joco']
@@ -51,7 +51,7 @@ def test_hist_flush():
     hist = History(filename=FNAME, here='yup', **HIST_TEST_KWARGS)
     hf = hist.flush()
     yield assert_is_none, hf
-    with mock_xonsh_env({}):
+    with mock_xonsh_env({'HISTCONTROL': set()}):
         hist.append({'joco': 'still alive'})
     hf = hist.flush()
     yield assert_is_not_none, hf
@@ -69,7 +69,7 @@ def test_cmd_field():
     FNAME += '.cmdfield'
     hist = History(filename=FNAME, here='yup', **HIST_TEST_KWARGS)
     # in-memory
-    with mock_xonsh_env({}):
+    with mock_xonsh_env({'HISTCONTROL': set()}):
         hf = hist.append({'rtn': 1})
     yield assert_is_none, hf
     yield assert_equal, 1, hist.rtns[0]
@@ -113,7 +113,7 @@ def test_show_cmd():
     saved_stdout = sys.stdout
     sys.stdout = stdout
 
-    with mock_xonsh_env({}):
+    with mock_xonsh_env({'HISTCONTROL': set()}):
         for cmd in cmds:  # populate the shell history
             hist.append({'inp': cmd, 'rtn': 0})
 

xonsh/history.py

@@ -290,9 +290,9 @@ class History(object):
         hf : HistoryFlusher or None
             The thread that was spawned to flush history
         """
-        opts = builtins.__xonsh_env__.get('HISTCONTROL', set())
-        if ('ignoredups' in opts and len(self.buffer)
-                and cmd['inp'] == self.buffer[-1]['inp']):
+        opts = builtins.__xonsh_env__.get('HISTCONTROL')
+        if ('ignoredups' in opts and len(self) > 0
+                and cmd['inp'] == self.inps[-1]):
             # Skipping dup cmd
             return None
         elif 'ignoreerr' in opts and cmd['rtn'] != 0: