holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt for improved history isolation in reedline (#10402)

Browse Source 
Depends on https://github.com/nushell/reedline/pull/634

---------

Co-authored-by: WindSoilder <WindSoilder@outlook.com>
This commit is contained in:
Hofer-Julian 2023-09-18 07:49:26 +02:00 committed by GitHub
parent bc7736bc99
commit f0a265dbee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -4293,7 +4293,7 @@ dependencies = [
[[package]] [[package]]
name = "reedline" name = "reedline"
version = "0.23.0" version = "0.23.0"
source = "git+https://github.com/nushell/reedline.git?branch=main#31257a4c5413d4a262912359f515907b8295db5c" source = "git+https://github.com/nushell/reedline.git?branch=main#f9939396905a81841645da30b411f3a255c7a037"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossterm 0.27.0", "crossterm 0.27.0",

6
crates/nu-cli/src/commands/history.rs
View File

@ -70,12 +70,14 @@ impl Command for History {
} else { } else {
let history_reader: Option<Box<dyn ReedlineHistory>> = let history_reader: Option<Box<dyn ReedlineHistory>> =
match engine_state.config.history_file_format { match engine_state.config.history_file_format {
HistoryFileFormat::Sqlite => SqliteBackedHistory::with_file(history_path) HistoryFileFormat::Sqlite => {
SqliteBackedHistory::with_file(history_path, None, None)
.map(|inner| { .map(|inner| {
let boxed: Box<dyn ReedlineHistory> = Box::new(inner); let boxed: Box<dyn ReedlineHistory> = Box::new(inner);
boxed boxed
}) })
.ok(), .ok()
}
HistoryFileFormat::PlainText => FileBackedHistory::with_file( HistoryFileFormat::PlainText => FileBackedHistory::with_file(
engine_state.config.max_history_size as usize, engine_state.config.max_history_size as usize,

11
crates/nu-cli/src/repl.rs
View File

@ -730,9 +730,14 @@ fn update_line_editor_history(
) )
.into_diagnostic()?, .into_diagnostic()?,
), ),
HistoryFileFormat::Sqlite => { HistoryFileFormat::Sqlite => Box::new(
Box::new(SqliteBackedHistory::with_file(history_path.to_path_buf()).into_diagnostic()?) SqliteBackedHistory::with_file(
} history_path.to_path_buf(),
history_session_id,
Some(chrono::Utc::now()),
)
.into_diagnostic()?,
),
}; };
let line_editor = line_editor let line_editor = line_editor
.with_history_session_id(history_session_id) .with_history_session_id(history_session_id)