repl: dont throw ENOENT on NODE_REPL_HISTORY_FILE

toddself · rvagg · commit 7f02443a9a39 · 2015-08-21T20:31:10.000+10:00
If you have no history file written to disk, but the environment variable set, `fs.readFileSync` will throw an ENOENT error, but there's nothing to convert. The converter should ignore ENOENT on that `fs.readFileSync` call. Fixes: #2449 PR-URL: #2451 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
diff --git a/lib/internal/repl.js b/lib/internal/repl.js
@@ -122,8 +122,10 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
 }
 repl.history = repl.history.slice(-repl.historySize);
 } catch (err) {
- return ready(
+ if (err.code !== 'ENOENT') {
+ return ready(
 new Error(`Could not parse history data in ${oldHistoryPath}.`));
+ }
 }
 }
 
diff --git a/test/sequential/test-repl-persistent-history.js b/test/sequential/test-repl-persistent-history.js
@@ -69,13 +69,20 @@ const fixtures = path.join(common.testDir, 'fixtures');
 const historyFixturePath = path.join(fixtures, '.node_repl_history');
 const historyPath = path.join(common.tmpDir, '.fixture_copy_repl_history');
 const oldHistoryPath = path.join(fixtures, 'old-repl-history-file.json');
+const enoentHistoryPath = path.join(fixtures, 'enoent-repl-history-file.json');
 
 
 const tests = [{
 env: { NODE_REPL_HISTORY: '' },
 test: [UP],
 expected: [prompt, replDisabled, prompt]
 },
+{
+ env: { NODE_REPL_HISTORY: '',
+ NODE_REPL_HISTORY_FILE: enoentHistoryPath },
+ test: [UP],
+ expected: [prompt, replDisabled, prompt]
+},
 {
 env: { NODE_REPL_HISTORY: '',
 NODE_REPL_HISTORY_FILE: oldHistoryPath },

Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,10 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {`
`122`	`122`	`}`
`123`	`123`	`repl.history=repl.history.slice(-repl.historySize);`
`124`	`124`	`}catch(err){`
`125`		`-returnready(`
	`125`	`+if(err.code!=='ENOENT'){`
	`126`	`+returnready(`
`126`	`127`	newError(`Could not parse history data in ${oldHistoryPath}.`));
	`128`	`+}`
`127`	`129`	`}`
`128`	`130`	`}`
`129`	`131`
-Original file line number
+Diff line change
 consthistoryFixturePath=path.join(fixtures,'.node_repl_history');
 consthistoryPath=path.join(common.tmpDir,'.fixture_copy_repl_history');
 constoldHistoryPath=path.join(fixtures,'old-repl-history-file.json');
 +constenoentHistoryPath=path.join(fixtures,'enoent-repl-history-file.json');
 consttests=[{
 env: {NODE_REPL_HISTORY: ''},
 test: [UP],
 expected: [prompt,replDisabled,prompt]
 },
 +{
 +env: {NODE_REPL_HISTORY: '',
 +NODE_REPL_HISTORY_FILE: enoentHistoryPath},
 +test: [UP],
 +expected: [prompt,replDisabled,prompt]
 +},
+{
 env: {NODE_REPL_HISTORY: '',
 NODE_REPL_HISTORY_FILE: oldHistoryPath},