Add option to get_history to determine whether to retrieve the current session or the entire history. Qt console on startup requests entire history.

IPython/core/history.py

@@ -186,7 +186,7 b' class HistoryManager(object):'
             if self.shell.has_readline:
                 self.populate_readline_history()
         
-    def get_history(self, index=None, raw=False, output=True):
+    def get_history(self, index=None, raw=False, output=True,this_session=True):
         """Get the history list.
 
         Get the input and output history.
@@ -201,6 +201,9 b' class HistoryManager(object):'
             If True, return the raw input.
         output : bool
             If True, then return the output as well.
+        this_session : bool
+            If True, indexing is from 1 at the start of this session.
+            If False, indexing is from 1 at the start of the whole history.
 
         Returns
         -------
@@ -214,9 +217,13 b' class HistoryManager(object):'
             input_hist = self.input_hist_parsed
         if output:
             output_hist = self.output_hist
+        
+        if this_session:
+            offset = self.session_offset
+        else:
+            offset = -1
             
         n = len(input_hist)
-        offset = self.session_offset
         if index is None:
             start=offset+1; stop=n
         elif isinstance(index, int):

IPython/core/interactiveshell.py

@@ -1277,8 +1277,8 b' class InteractiveShell(Configurable, Magic):'
                 self.reload_history()
         return wrapper
     
-    def get_history(self, index=None, raw=False, output=True):
-        return self.history_manager.get_history(index, raw, output)
+    def get_history(self, index=None, raw=False, output=True,this_session=True):
+        return self.history_manager.get_history(index, raw, output,this_session)
     
 
     #-------------------------------------------------------------------------

IPython/frontend/qt/console/ipython_widget.py

@@ -213,7 +213,8 b' class IPythonWidget(FrontendWidget):'
         """ Reimplemented to make a history request.
         """
         super(IPythonWidget, self)._started_channels()
-        self.kernel_manager.xreq_channel.history(raw=True, output=False)
+        self.kernel_manager.xreq_channel.history(raw=True, output=False,
+                                                            this_session=False)
 
     #---------------------------------------------------------------------------
     # 'ConsoleWidget' public interface

IPython/zmq/ipkernel.py

@@ -309,10 +309,9 b' class Kernel(Configurable):'
         logger.debug(msg)
 
     def history_request(self, ident, parent):
-        output = parent['content']['output']
-        index = parent['content']['index']
-        raw = parent['content']['raw']
-        hist = self.shell.get_history(index=index, raw=raw, output=output)
+        # parent['content'] should contain keys "index", "raw", "output" and
+        # "this_session".
+        hist = self.shell.get_history(**parent['content'])
         content = {'history' : hist}
         msg = self.session.send(self.reply_socket, 'history_reply',
                                 content, parent, ident)

IPython/zmq/kernelmanager.py

@@ -282,7 +282,7 b' class XReqSocketChannel(ZmqSocketChannel):'
         self._queue_request(msg)
         return msg['header']['msg_id']
 
-    def history(self, index=None, raw=False, output=True):
+    def history(self, index=None, raw=False, output=True, this_session=True):
         """Get the history list.
 
         Parameters
@@ -295,12 +295,16 b' class XReqSocketChannel(ZmqSocketChannel):'
             If True, return the raw input.
         output : bool
             If True, then return the output as well.
+        this_session : bool
+            If True, returns only history from the current session. Otherwise,
+            includes reloaded history from previous sessions.
 
         Returns
         -------
         The msg_id of the message sent.
         """
-        content = dict(index=index, raw=raw, output=output)
+        content = dict(index=index, raw=raw, output=output, 
+                                                    this_session=this_session)
         msg = self.session.msg('history_request', content)
         self._queue_request(msg)
         return msg['header']['msg_id']