1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repl: limit persistent history correctly on load

Browse Source 
Previously the wrong end of the history was limited on load.

PR-URL: https://github.com/nodejs/node/pull/2356
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed By: Evan Lucas <evanlucas@me.com>
This commit is contained in:
Jeremiah Senkpiel 2015-10-06 23:01:28 -07:00
parent 286ef1daca
commit 73b7e052c0
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/internal/repl.js
View File

@ -110,7 +110,7 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
} }
if (data) { if (data) {
repl.history = data.split(/[\n\r]+/).slice(-repl.historySize); repl.history = data.split(/[\n\r]+/, repl.historySize);
} else if (oldHistoryPath) { } else if (oldHistoryPath) {
// Grab data from the older pre-v3.0 JSON NODE_REPL_HISTORY_FILE format. // Grab data from the older pre-v3.0 JSON NODE_REPL_HISTORY_FILE format.
repl._writeToOutput( repl._writeToOutput(
@ -123,7 +123,7 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
if (!Array.isArray(repl.history)) { if (!Array.isArray(repl.history)) {
throw new Error('Expected array, got ' + typeof repl.history); throw new Error('Expected array, got ' + typeof repl.history);
} }
repl.history = repl.history.slice(-repl.historySize); repl.history = repl.history.slice(0, repl.historySize);
} catch (err) { } catch (err) {
if (err.code !== 'ENOENT') { if (err.code !== 'ENOENT') {
return ready( return ready(

12
test/sequential/test-repl-persistent-history.js
View File

@ -135,6 +135,18 @@ const tests = [{
expected: [prompt, prompt + '\'42\'', prompt + '\'=^.^=\'', '\'=^.^=\'\n', expected: [prompt, prompt + '\'42\'', prompt + '\'=^.^=\'', '\'=^.^=\'\n',
prompt] prompt]
}, },
{
env: { NODE_REPL_HISTORY: historyPath,
NODE_REPL_HISTORY_SIZE: 1 },
test: [UP, UP, CLEAR],
expected: [prompt, prompt + '\'you look fabulous today\'', prompt]
},
{
env: { NODE_REPL_HISTORY_FILE: oldHistoryPath,
NODE_REPL_HISTORY_SIZE: 1 },
test: [UP, UP, UP, CLEAR],
expected: [prompt, convertMsg, prompt, prompt + '\'=^.^=\'', prompt]
},
{ // Make sure this is always the last test, since we change os.homedir() { // Make sure this is always the last test, since we change os.homedir()
before: function mockHomedirFailure() { before: function mockHomedirFailure() {
// Mock os.homedir() failure // Mock os.homedir() failure