mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

history show - add optional null-delimited output

Browse source
This commit is contained in:
David Strobach 2018-07-26 19:51:50 +02:00
parent d76d9b2b5e
commit cbf519b80f
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/test_history.py
View file

@ -251,7 +251,8 @@ def test_parser_show(args, exp):
'start_time': None,
'end_time': None,
'datetime_format': None,
'timestamp': False}
'timestamp': False,
'null_byte': False}
ns = _xh_parse_args(shlex.split(args))
assert ns.__dict__ == exp_ns

13
xonsh/history/main.py
View file

@ -184,18 +184,19 @@ def _xh_show_history(hist, ns, stdout=None, stderr=None):
for c in commands:
dt = datetime.datetime.fromtimestamp(c['ts'])
print('{}:({}) {}'.format(c['ind'], xt.format_datetime(dt), c['inp']),
file=stdout)
file=stdout, end='\n' if not ns.null_byte else '\0')
elif ns.numerate:
for c in commands:
print('{}: {}'.format(c['ind'], c['inp']), file=stdout)
print('{}: {}'.format(c['ind'], c['inp']), file=stdout,
end='\n' if not ns.null_byte else '\0')
elif ns.timestamp:
for c in commands:
dt = datetime.datetime.fromtimestamp(c['ts'])
print('({}) {}'.format(xt.format_datetime(dt), c['inp']),
file=stdout)
file=stdout, end='\n' if not ns.null_byte else '\0')
else:
for c in commands:
print(c['inp'], file=stdout)
print(c['inp'], file=stdout, end='\n' if not ns.null_byte else '\0')
@xla.lazyobject
@ -233,6 +234,10 @@ def _xh_create_parser():
show.add_argument('-f', dest='datetime_format', default=None,
help='the datetime format to be used for'
'filtering and printing')
show.add_argument('-0', dest='null_byte', default=False,
action='store_true',
help='separate commands by the null character for piping '
'history to external filters')
show.add_argument('session', nargs='?', choices=_XH_HISTORY_SESSIONS.keys(),
default='session',
metavar='session',