##// END OF EJS Templates
Make HistoryManager configurable.
Make HistoryManager configurable.

File last commit:

r3393:dc170c0a
r3393:dc170c0a
Show More
history.py
531 lines | 18.9 KiB | text/x-python | PythonLexer
vivainio
crlf normalization
r851 """ History related magics and functionality """
Fernando Perez
Created HistoryManager to better organize history control....
r3079 #-----------------------------------------------------------------------------
# Copyright (C) 2010 The IPython Development Team.
#
# Distributed under the terms of the BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
from __future__ import print_function
vivainio
crlf normalization
r851
fperez
Add -f flag to %history to direct output to file
r960 # Stdlib imports
Thomas Kluyver
Tidy up store_inputs
r3390 import fnmatch
fperez
Add -f flag to %history to direct output to file
r960 import os
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 import sqlite3
fperez
Add -f flag to %history to direct output to file
r960
Fernando Perez
Created HistoryManager to better organize history control....
r3079 # Our own packages
Thomas Kluyver
Make HistoryManager configurable.
r3393 from IPython.config.configurable import Configurable
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 import IPython.utils.io
Fernando Perez
Created HistoryManager to better organize history control....
r3079
Thomas Kluyver
Skip doctests where necessary.
r3341 from IPython.testing import decorators as testdec
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 from IPython.utils.io import ask_yes_no
Thomas Kluyver
Make HistoryManager configurable.
r3393 from IPython.utils.traitlets import Bool, Dict, Instance, Int, List, Unicode
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 from IPython.utils.warn import warn
Fernando Perez
Created HistoryManager to better organize history control....
r3079
#-----------------------------------------------------------------------------
# Classes and functions
#-----------------------------------------------------------------------------
Thomas Kluyver
Make HistoryManager configurable.
r3393 class HistoryManager(Configurable):
Fernando Perez
Created HistoryManager to better organize history control....
r3079 """A class to organize all history-related functionality in one place.
"""
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095 # Public interface
# An instance of the IPython shell we are attached to
Thomas Kluyver
Make HistoryManager configurable.
r3393 shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
# Lists to hold processed and raw history. These start with a blank entry
# so that we can index them starting from 1
input_hist_parsed = List([""])
input_hist_raw = List([""])
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095 # A list of directories visited during session
Thomas Kluyver
Make HistoryManager configurable.
r3393 dir_hist = List()
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095 # A dict of output history, keyed with ints from the shell's execution count
Thomas Kluyver
Make HistoryManager configurable.
r3393 output_hist = Dict()
# String holding the path to the history file
hist_file = Unicode()
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 # The SQLite database
Thomas Kluyver
Make HistoryManager configurable.
r3393 db = Instance(sqlite3.Connection)
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 # The number of the current session in the history database
Thomas Kluyver
Make HistoryManager configurable.
r3393 session_number = Int()
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 # Should we log output to the database? (default no)
Thomas Kluyver
Make HistoryManager configurable.
r3393 db_log_output = Bool(False, config=True)
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 # Write to database every x commands (higher values save disk access & power)
# Values of 1 or less effectively disable caching.
Thomas Kluyver
Make HistoryManager configurable.
r3393 db_cache_size = Int(0, config=True)
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 # The input and output caches
Thomas Kluyver
Make HistoryManager configurable.
r3393 db_input_cache = List()
db_output_cache = List()
Thomas Kluyver
Small changes as suggested by Fernando.
r3382
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095 # Private interface
# Variables used to store the three last inputs from the user. On each new
# history update, we populate the user's namespace with these, shifted as
# necessary.
_i00, _i, _ii, _iii = '','','',''
Fernando Perez
Small fix and cleanup for exit/quit command filtering.
r3246
# A set with all forms of the exit command, so that we don't store them in
# the history (it's annoying to rewind the first entry and land on an exit
# call).
_exit_commands = None
Fernando Perez
Document object interface to HistoryManger according to our conventions....
r3095
Thomas Kluyver
Make HistoryManager configurable.
r3393 def __init__(self, shell, config=None):
Fernando Perez
Created HistoryManager to better organize history control....
r3079 """Create a new history manager associated with a shell instance.
"""
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 # We need a pointer back to the shell for various tasks.
Thomas Kluyver
Make HistoryManager configurable.
r3393 super(HistoryManager, self).__init__(shell=shell, config=config)
Fernando Perez
Created HistoryManager to better organize history control....
r3079
# list of visited directories
try:
self.dir_hist = [os.getcwd()]
except OSError:
self.dir_hist = []
# Now the history file
if shell.profile:
histfname = 'history-%s' % shell.profile
else:
histfname = 'history'
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 self.hist_file = os.path.join(shell.ipython_dir, histfname + '.sqlite')
Thomas Kluyver
Make HistoryManager configurable.
r3393 self.init_db()
Fernando Perez
Created HistoryManager to better organize history control....
r3079
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 self._i00, self._i, self._ii, self._iii = '','','',''
Fernando Perez
Small fix and cleanup for exit/quit command filtering.
r3246 self._exit_commands = set(['Quit', 'quit', 'Exit', 'exit', '%Quit',
'%quit', '%Exit', '%exit'])
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 def init_db(self):
self.db = sqlite3.connect(self.hist_file)
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 self.db.execute("""CREATE TABLE IF NOT EXISTS history
(session integer, line integer, source text, source_raw text,
PRIMARY KEY (session, line))""")
# Output history is optional, but ensure the table's there so it can be
# enabled later.
self.db.execute("""CREATE TABLE IF NOT EXISTS output_history
(session integer, line integer, output text,
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 PRIMARY KEY (session, line))""")
cur = self.db.execute("""SELECT name FROM sqlite_master WHERE
type='table' AND name='singletons'""")
if not cur.fetchone():
self.db.execute("""CREATE TABLE singletons
(name text PRIMARY KEY, value)""")
self.db.execute("""INSERT INTO singletons VALUES
('session_number', 1)""")
self.db.commit()
cur = self.db.execute("""SELECT value FROM singletons WHERE
name='session_number'""")
self.session_number = cur.fetchone()[0]
Thomas Kluyver
Rework history autosave, so that the timer thread sets an event, and the save is performed in the main thread after executing a user command.
r3270
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 #Increment by one for next session.
self.db.execute("""UPDATE singletons SET value=? WHERE
name='session_number'""", (self.session_number+1,))
self.db.commit()
def get_db_history(self, session, start=1, stop=None, raw=True):
"""Retrieve input history from the database by session.
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 Parameters
----------
session : int
Session number to retrieve. If negative, counts back from current
session (so -1 is previous session).
start : int
First line to retrieve.
stop : int
Last line to retrieve. If None, retrieve to the end of the session.
raw : bool
If True, return raw input
Returns
-------
An iterator over the desired lines.
"""
toget = 'source_raw' if raw else 'source'
if session < 0:
session += self.session_number
Fernando Perez
Created HistoryManager to better organize history control....
r3079
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 if stop:
cur = self.db.execute("SELECT " + toget + """ FROM history WHERE
session==? AND line BETWEEN ? and ?""",
(session, start, stop))
Satrajit Ghosh
History refactored and saved to json file...
r3240 else:
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 cur = self.db.execute("SELECT " + toget + """ FROM history WHERE
session==? AND line>=?""", (session, start))
return (x[0] for x in cur)
def tail_db_history(self, n=10, raw=True):
"""Get the last n lines from the history database."""
toget = 'source_raw' if raw else 'source'
cur = self.db.execute("SELECT " + toget + """ FROM history ORDER BY
session DESC, line DESC LIMIT ?""", (n,))
return (x[0] for x in reversed(cur.fetchall()))
Satrajit Ghosh
History refactored and saved to json file...
r3240
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 def globsearch_db(self, pattern="*"):
"""Search the database using unix glob-style matching (wildcards * and
?, escape using \).
Returns
-------
An iterator over tuples: (session, line_number, command)
"""
return self.db.execute("""SELECT session, line, source_raw FROM history
WHERE source_raw GLOB ?""", (pattern,))
Satrajit Ghosh
History refactored and saved to json file...
r3240
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 def get_history(self, start=1, stop=None, raw=False, output=True):
Fernando Perez
Created HistoryManager to better organize history control....
r3079 """Get the history list.
Get the input and output history.
Parameters
----------
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 start : int
From (prompt number in the current session). Negative numbers count
back from the end.
stop : int
To (prompt number in the current session, exclusive). Negative
numbers count back from the end, and None goes to the end.
Fernando Perez
Created HistoryManager to better organize history control....
r3079 raw : bool
If True, return the raw input.
output : bool
If True, then return the output as well.
Thomas Kluyver
Add option to get_history to determine whether to retrieve the current session or the entire history. Qt console on startup requests entire history.
r3387 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.
Fernando Perez
Created HistoryManager to better organize history control....
r3079
Returns
-------
If output is True, then return a dict of tuples, keyed by the prompt
numbers and with values of (input, output). If output is False, then
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 a dict, keyed by the prompt number with the values of input.
Fernando Perez
Created HistoryManager to better organize history control....
r3079 """
if raw:
input_hist = self.input_hist_raw
else:
Satrajit Ghosh
History refactored and saved to json file...
r3240 input_hist = self.input_hist_parsed
Fernando Perez
Created HistoryManager to better organize history control....
r3079 if output:
output_hist = self.output_hist
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380
Fernando Perez
Created HistoryManager to better organize history control....
r3079 n = len(input_hist)
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 if start < 0:
start += n
if not stop:
stop = n
elif stop < 0:
stop += n
Fernando Perez
Created HistoryManager to better organize history control....
r3079 hist = {}
for i in range(start, stop):
if output:
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 hist[i] = (input_hist[i], output_hist.get(i))
Fernando Perez
Created HistoryManager to better organize history control....
r3079 else:
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 hist[i] = input_hist[i]
Fernando Perez
Created HistoryManager to better organize history control....
r3079 return hist
Thomas Kluyver
Tidy up store_inputs
r3390 def store_inputs(self, line_num, source, source_raw=None):
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 """Store source and raw input in history and create input cache
variables _i*.
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 Parameters
----------
Thomas Kluyver
Tidy up store_inputs
r3390 line_num : int
The prompt number of this input.
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 source : str
Python input.
source_raw : str, optional
If given, this is the raw input without any IPython transformations
applied to it. If not given, ``source`` is used.
"""
if source_raw is None:
source_raw = source
Fernando Perez
Small fix and cleanup for exit/quit command filtering.
r3246
# do not store exit/quit commands
if source_raw.strip() in self._exit_commands:
Satrajit Ghosh
removed quit/exit commands from history
r3243 return
Fernando Perez
Small fix and cleanup for exit/quit command filtering.
r3246
Satrajit Ghosh
strip trailing \n for history lines
r3245 self.input_hist_parsed.append(source.rstrip())
self.input_hist_raw.append(source_raw.rstrip())
Thomas Kluyver
Tidy up store_inputs
r3390
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 self.db_input_cache.append((self.session_number, line_num,
source, source_raw))
# Trigger to flush cache and write to DB.
if len(self.db_input_cache) >= self.db_cache_size:
self.writeout_cache()
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 # update the auto _i variables
self._iii = self._ii
self._ii = self._i
self._i = self._i00
self._i00 = source_raw
# hackish access to user namespace to create _i1,_i2... dynamically
Thomas Kluyver
Tidy up store_inputs
r3390 new_i = '_i%s' % line_num
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 to_main = {'_i': self._i,
'_ii': self._ii,
'_iii': self._iii,
new_i : self._i00 }
self.shell.user_ns.update(to_main)
Thomas Kluyver
Ability to cache commits before writing to disk, to save power.
r3389
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 def store_output(self, line_num, output):
if not self.db_log_output:
return
db_row = (self.session_number, line_num, output)
if self.db_cache_size > 1:
self.db_output_cache.append(db_row)
else:
with self.db:
self.db.execute("INSERT INTO output_history VALUES (?,?,?)", db_row)
Thomas Kluyver
Ability to cache commits before writing to disk, to save power.
r3389 def writeout_cache(self):
with self.db:
self.db.executemany("INSERT INTO history VALUES (?, ?, ?, ?)",
Thomas Kluyver
Implement optional logging of output as suggested by Robert Kern.
r3391 self.db_input_cache)
self.db.executemany("INSERT INTO output_history VALUES (?, ?, ?)",
self.db_output_cache)
self.db_input_cache = []
self.db_output_cache = []
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 def sync_inputs(self):
"""Ensure raw and translated histories have same length."""
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 lr = len(self.input_hist_raw)
lp = len(self.input_hist_parsed)
if lp < lr:
self.input_hist_raw[:lr-lp] = []
elif lr < lp:
self.input_hist_parsed[:lp-lr] = []
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080
def reset(self):
"""Clear all histories managed by this object."""
Satrajit Ghosh
History refactored and saved to json file...
r3240 self.input_hist_parsed[:] = []
Fernando Perez
Add support for accessing raw data to inputsplitter....
r3080 self.input_hist_raw[:] = []
self.output_hist.clear()
# The directory history can't be completely empty
self.dir_hist[:] = [os.getcwd()]
vivainio
crlf normalization
r851
Thomas Kluyver
Skip doctests where necessary.
r3341 @testdec.skip_doctest
vivainio
crlf normalization
r851 def magic_history(self, parameter_s = ''):
"""Print input history (_i<n> variables), with most recent last.
%history -> print at most 40 inputs (some may be multi-line)\\
%history n -> print at most n inputs\\
%history n1 n2 -> print inputs between n1 and n2 (n2 not included)\\
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 By default, input history is printed without line numbers so it can be
directly pasted into an editor.
With -n, each input's number <n> is shown, and is accessible as the
automatically generated variable _i<n> as well as In[<n>]. Multi-line
statements are printed starting at a new line for easy copy/paste.
vivainio
crlf normalization
r851
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 Options:
vivainio
crlf normalization
r851
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 -n: print line numbers for each input.
vivainio
crlf normalization
r851 This feature is only available if numbered prompts are in use.
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 -o: also print outputs for each input.
-p: print classic '>>>' python prompts before each input. This is useful
for making documentation, and in conjunction with -o, for producing
doctest-ready output.
Fernando Perez
Change %history to default to 'raw' history.
r2899 -r: (default) print the 'raw' history, i.e. the actual commands you typed.
vivainio
crlf normalization
r851
Fernando Perez
Change %history to default to 'raw' history.
r2899 -t: print the 'translated' history, as IPython understands it. IPython
filters your input and converts it all into valid Python source before
executing it (things like magics or aliases are turned into function
calls, for example). With this option, you'll see the native history
instead of the user-entered version: '%cd /' will be seen as
'get_ipython().magic("%cd /")' instead of '%cd /'.
vivainio
crlf normalization
r851
-g: treat the arg as a pattern to grep for in (full) history.
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 This includes the saved history (almost all commands ever written).
Use '%hist -g' to show full saved history (may be very long).
fperez
Forgot to commit docstring about this feature
r961
-f FILENAME: instead of printing the output to the screen, redirect it to
the given file. The file is always overwritten, though IPython asks for
confirmation first if it already exists.
Vishnu S G
Wrote example for %history...
r3326
Thomas Kluyver
Tweaks to RST formatting.
r3337 Examples
--------
Vishnu S G
Wrote example for %history...
r3326 ::
In [6]: %hist -n 4 6
4:a = 12
5:print a**2
vivainio
crlf normalization
r851 """
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 if not self.shell.displayhook.do_full_cache:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print('This feature is only available if numbered prompts are in use.')
vivainio
crlf normalization
r851 return
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 opts,args = self.parse_options(parameter_s,'gnoptsrf:',mode='list')
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380
# For brevity
history_manager = self.shell.history_manager
fperez
Add -f flag to %history to direct output to file
r960
# Check if output to specific file was requested.
try:
outfname = opts['f']
except KeyError:
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 outfile = IPython.utils.io.Term.cout # default
fperez
Add -f flag to %history to direct output to file
r960 # We don't want to close stdout at the end!
close_at_end = False
else:
if os.path.exists(outfname):
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 if not ask_yes_no("File %r exists. Overwrite?" % outfname):
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print('Aborting.')
fperez
Add -f flag to %history to direct output to file
r960 return
vivainio
crlf normalization
r851
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 outfile = open(outfname,'w')
close_at_end = True
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380
print_nums = 'n' in opts
print_outputs = 'o' in opts
pyprompts = 'p' in opts
# Raw history is the default
raw = not('t' in opts)
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762
vivainio
crlf normalization
r851 default_length = 40
pattern = None
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 if 'g' in opts:
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 start = 1; stop = None
Fernando Perez
Fix %history to stop printing last line....
r2474 parts = parameter_s.split(None, 1)
vivainio
crlf normalization
r851 if len(parts) == 1:
parts += '*'
head, pattern = parts
pattern = "*" + pattern + "*"
elif len(args) == 0:
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 start = 1; stop = None
vivainio
crlf normalization
r851 elif len(args) == 1:
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 start = -int(args[0]); stop=None
vivainio
crlf normalization
r851 elif len(args) == 2:
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 start = int(args[0]); stop = int(args[1])
vivainio
crlf normalization
r851 else:
warn('%hist takes 0, 1 or 2 arguments separated by spaces.')
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print(self.magic_hist.__doc__, file=IPython.utils.io.Term.cout)
vivainio
crlf normalization
r851 return
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 hist = history_manager.get_history(start, stop, raw, print_outputs)
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 width = len(str(max(hist.iterkeys())))
vivainio
crlf normalization
r851 line_sep = ['','\n']
found = False
if pattern is not None:
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 for session, line, s in history_manager.globsearch_db(pattern):
print("%d#%d: %s" %(session, line, s.expandtabs(4)), file=outfile)
found = True
vivainio
crlf normalization
r851
if found:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print("===", file=outfile)
Thomas Kluyver
Initial conversion of history to SQLite database.
r3388 print("shadow history ends, fetch by %rep session#line",
Fernando Perez
Created HistoryManager to better organize history control....
r3079 file=outfile)
print("=== start of normal history ===", file=outfile)
vivainio
crlf normalization
r851
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 for in_num, inline in sorted(hist.iteritems()):
Fernando Perez
Expand tabs to 4 spaces in %history.
r2970 # Print user history with tabs expanded to 4 spaces. The GUI clients
# use hard tabs for easier usability in auto-indented code, but we want
# to produce PEP-8 compliant history for safe pasting into an editor.
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 if print_outputs:
inline, output = inline
inline = inline.expandtabs(4).rstrip()
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993
vivainio
crlf normalization
r851 if pattern is not None and not fnmatch.fnmatch(inline, pattern):
continue
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 multiline = "\n" in inline
vivainio
crlf normalization
r851 if print_nums:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print('%s:%s' % (str(in_num).ljust(width), line_sep[multiline]),
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 file=outfile, end='')
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 if pyprompts:
Thomas Kluyver
Simplifying code in several places.
r3381 print(">>> ", end="", file=outfile)
Fernando Perez
Changed %hist to default to NOT printing numbers, added -p and -o options....
r2441 if multiline:
Thomas Kluyver
Simplifying code in several places.
r3381 inline = "\n... ".join(inline.splitlines()) + "\n..."
print(inline, file=outfile)
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 if print_outputs and output:
print(repr(output), file=outfile)
fperez
Add -f flag to %history to direct output to file
r960
if close_at_end:
outfile.close()
vivainio
crlf normalization
r851
Thomas Kluyver
Reworking magic %hist, %macro and %edit commands to work with new history system.
r3380 # %hist is an alternative name
magic_hist = magic_history
vivainio
crlf normalization
r851
def rep_f(self, arg):
r""" Repeat a command, or get command to input line for editing
- %rep (no arguments):
Place a string version of last computation result (stored in the special '_'
variable) to the next input prompt. Allows you to create elaborate command
lines without using copy-paste::
$ l = ["hei", "vaan"]
$ "".join(l)
==> heivaan
$ %rep
$ heivaan_ <== cursor blinking
%rep 45
Place history line 45 to next input prompt. Use %hist to find out the
number.
%rep 1-4 6-7 3
Repeat the specified lines immediately. Input slice syntax is the same as
in %macro and %save.
%rep foo
Place the most recent line that has the substring "foo" to next input.
Fernando Perez
Fix a number of bugs with %history, add proper tests....
r1762 (e.g. 'svn ci -m foobar').
vivainio
crlf normalization
r851 """
opts,args = self.parse_options(arg,'',mode='list')
if not args:
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 self.set_next_input(str(self.shell.user_ns["_"]))
vivainio
crlf normalization
r851 return
if len(args) == 1 and not '-' in args[0]:
arg = args[0]
if len(arg) > 1 and arg.startswith('0'):
# get from shadow hist
num = int(arg[1:])
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 line = self.shell.shadowhist.get(num)
Brian Granger
Continuing a massive refactor of everything.
r2205 self.set_next_input(str(line))
vivainio
crlf normalization
r851 return
try:
num = int(args[0])
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 self.set_next_input(str(self.shell.input_hist_raw[num]).rstrip())
vivainio
crlf normalization
r851 return
except ValueError:
pass
Fernando Perez
Fix off-by-one bug in history because we weren't correctly updating it....
r2993 for h in reversed(self.shell.input_hist_raw):
vivainio
crlf normalization
r851 if 'rep' in h:
continue
if fnmatch.fnmatch(h,'*' + arg + '*'):
Brian Granger
Continuing a massive refactor of everything.
r2205 self.set_next_input(str(h).rstrip())
vivainio
crlf normalization
r851 return
try:
lines = self.extract_input_slices(args, True)
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print("lines", lines)
Fernando Perez
Finish removing spurious calls to logger and runlines....
r3087 self.run_cell(lines)
vivainio
crlf normalization
r851 except ValueError:
Fernando Perez
Created HistoryManager to better organize history control....
r3079 print("Not found in recent history:", args)
vivainio
crlf normalization
r851
def init_ipython(ip):
Brian Granger
Continuing a massive refactor of everything.
r2205 ip.define_magic("rep",rep_f)
ip.define_magic("hist",magic_hist)
ip.define_magic("history",magic_history)
vivainio
crlf normalization
r851
Fernando Perez
Fix %history magics....
r2421 # XXX - ipy_completers are in quarantine, need to be updated to new apis
#import ipy_completers
Fernando Perez
Progress towards getting the test suite in shape again....
r2392 #ipy_completers.quick_completer('%hist' ,'-g -t -r -n')