extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 22:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace git current_branch to shadow-rs branch (#2935)

Browse Source 
* update to shadow-rs 0.4. use easy

* update shadow-rs to 0.5

* fix version not used

* update

* update Cargo.lock

* update Cargo.lock

* fix wasm build error when use dependence git2
fix error link:https://dev.azure.com/nushell/nushell/_build/results?buildId=4858&view=logs&j=1a745d4c-b027-5f34-06d8-d6f256bfe9f9&t=a0a335cb-fa1f-5bbf-be01-1a90d6899e54

* remove code not used; fix warning by RUSTFLAGS="-D warnings" build error

* upgrade shadow-rs 0.5.2

* upgrade shadow-rs 0.5.7

make nushell reduce dependence crates smaller and  build fast.

* upgrade shadow-rs 0.5.8

fix when use api 'strip_prefix()' method in less than rust1.45.0 build failed

* use shadow-rs branch replace with current_branch method;
remove and reduce git dependencies.

* upgrade shadow-rs 0.5.12-pre,test build error with wasm

* upgrade Cargo.lock

* upgarde shadow-rs depencdence

* fix build error in wasm

* add clippy warning
This commit is contained in:
Rust大闸蟹
2021-01-16 02:06:29 +08:00
committed by GitHub
parent f9b0b81eb2
commit 088e662285
10 changed files with 90 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
crates/nu-cli/Cargo.toml
View File

@ -11,67 +11,66 @@ version = "0.25.2"
doctest = false
[dependencies]
nu-command = {version = "0.25.2", path = "../nu-command"}
nu-data = {version = "0.25.2", path = "../nu-data"}
nu-engine = {version = "0.25.2", path = "../nu-engine"}
nu-errors = {version = "0.25.2", path = "../nu-errors"}
nu-json = {version = "0.25.2", path = "../nu-json"}
nu-parser = {version = "0.25.2", path = "../nu-parser"}
nu-plugin = {version = "0.25.2", path = "../nu-plugin"}
nu-protocol = {version = "0.25.2", path = "../nu-protocol"}
nu-source = {version = "0.25.2", path = "../nu-source"}
nu-stream = {version = "0.25.2", path = "../nu-stream"}
nu-table = {version = "0.25.2", path = "../nu-table"}
nu-test-support = {version = "0.25.2", path = "../nu-test-support"}
nu-value-ext = {version = "0.25.2", path = "../nu-value-ext"}
nu-command = { version = "0.25.2", path = "../nu-command" }
nu-data = { version = "0.25.2", path = "../nu-data" }
nu-engine = { version = "0.25.2", path = "../nu-engine" }
nu-errors = { version = "0.25.2", path = "../nu-errors" }
nu-json = { version = "0.25.2", path = "../nu-json" }
nu-parser = { version = "0.25.2", path = "../nu-parser" }
nu-plugin = { version = "0.25.2", path = "../nu-plugin" }
nu-protocol = { version = "0.25.2", path = "../nu-protocol" }
nu-source = { version = "0.25.2", path = "../nu-source" }
nu-stream = { version = "0.25.2", path = "../nu-stream" }
nu-table = { version = "0.25.2", path = "../nu-table" }
nu-test-support = { version = "0.25.2", path = "../nu-test-support" }
nu-value-ext = { version = "0.25.2", path = "../nu-value-ext" }
Inflector = "0.11"
ansi_term = "0.12.1"
arboard = {version = "1.1.0", optional = true}
arboard = { version = "1.1.0", optional = true }
async-recursion = "0.3.1"
async-trait = "0.1.40"
base64 = "0.13.0"
bigdecimal = {version = "0.2.0", features = ["serde"]}
bigdecimal = { version = "0.2.0", features = ["serde"] }
byte-unit = "4.0.9"
bytes = "0.5.6"
calamine = "0.16.1"
chrono = {version = "0.4.15", features = ["serde"]}
chrono = { version = "0.4.15", features = ["serde"] }
chrono-tz = "0.5.3"
clap = "2.33.3"
codespan-reporting = "0.11.0"
csv = "1.1.3"
ctrlc = {version = "3.1.6", optional = true}
ctrlc = { version = "3.1.6", optional = true }
derive-new = "0.5.8"
directories = {version = "3.0.1", optional = true}
dirs = {version = "3.0.1", optional = true}
directories = { version = "3.0.1", optional = true }
dirs = { version = "3.0.1", optional = true }
dtparse = "1.2.0"
dunce = "1.0.1"
eml-parser = "0.1.0"
encoding_rs = "0.8.24"
filesize = "0.2.0"
fs_extra = "1.2.0"
futures = {version = "0.3.5", features = ["compat", "io-compat"]}
futures = { version = "0.3.5", features = ["compat", "io-compat"] }
futures-util = "0.3.8"
futures_codec = "0.4.1"
getset = "0.1.1"
git2 = {version = "0.13.11", default_features = false, optional = true}
glob = "0.3.0"
heim = {version = "0.1.0-rc.1", optional = true}
heim = { version = "0.1.0-rc.1", optional = true }
htmlescape = "0.3.1"
ical = "0.7.0"
ichwh = {version = "0.3.4", optional = true}
indexmap = {version = "1.6.0", features = ["serde-1"]}
ichwh = { version = "0.3.4", optional = true }
indexmap = { version = "1.6.0", features = ["serde-1"] }
itertools = "0.10.0"
lazy_static = "1.*"
log = "0.4.11"
meval = "0.2.0"
num-bigint = {version = "0.3.0", features = ["serde"]}
num-format = {version = "0.4.0", features = ["with-num-bigint"]}
num-bigint = { version = "0.3.0", features = ["serde"] }
num-format = { version = "0.4.0", features = ["with-num-bigint"] }
num-traits = "0.2.12"
parking_lot = "0.11.0"
pin-utils = "0.1.0"
pretty-hex = "0.2.0"
ptree = {version = "0.3.0", optional = true}
ptree = { version = "0.3.0", optional = true }
query_interface = "0.3.5"
quick-xml = "0.20.0"
rand = "0.7.3"
@ -79,8 +78,8 @@ rayon = "1.4.0"
regex = "1.3.9"
roxmltree = "0.14.0"
rust-embed = "5.8.0"
rustyline = {version = "6.3.0", optional = true}
serde = {version = "1.0.115", features = ["derive"]}
rustyline = { version = "6.3.0", optional = true }
serde = { version = "1.0.115", features = ["derive"] }
serde_bytes = "0.11.5"
serde_ini = "0.2.0"
serde_json = "1.0.57"
@ -92,18 +91,19 @@ strip-ansi-escapes = "0.1.0"
sxd-document = "0.3.2"
sxd-xpath = "0.4.2"
tempfile = "3.1.0"
term = {version = "0.6.1", optional = true}
term = { version = "0.6.1", optional = true }
term_size = "0.3.2"
termcolor = "1.1.0"
titlecase = "1.0"
toml = "0.5.6"
trash = {version = "1.2.0", optional = true}
trash = { version = "1.2.0", optional = true }
unicode-segmentation = "1.6.0"
uom = {version = "0.30.0", features = ["f64", "try-from"]}
uom = { version = "0.30.0", features = ["f64", "try-from"] }
url = "2.1.1"
uuid_crate = {package = "uuid", version = "0.8.1", features = ["v4"], optional = true}
which = {version = "4.0.2", optional = true}
zip = {version = "0.5.7", optional = true}
uuid_crate = { package = "uuid", version = "0.8.1", features = ["v4"], optional = true }
which = { version = "4.0.2", optional = true }
zip = { version = "0.5.7", optional = true }
shadow-rs = { version = "0.5", default-features = false, optional = true }
[target.'cfg(unix)'.dependencies]
umask = "1.0.0"
@ -128,6 +128,7 @@ quickcheck = "0.9.2"
quickcheck_macros = "0.9.1"
[features]
default = ["shadow-rs"]
clipboard-cli = ["arboard"]
rich-benchmark = ["heim"]
rustyline-support = ["rustyline", "nu-engine/rustyline-support"]

38
crates/nu-cli/src/cli.rs
View File

@ -163,17 +163,9 @@ pub async fn cli(mut context: EvaluationContext) -> Result<(), Box<dyn Error>> {
let (prompt_block, err) = nu_parser::parse(&prompt_line, 0, &context.scope);
if err.is_some() {
use crate::git::current_branch;
context.scope.exit_scope();
format!(
"\x1b[32m{}{}\x1b[m> ",
cwd,
match current_branch() {
Some(s) => format!("({})", s),
None => "".to_string(),
}
)
format!("\x1b[32m{}{}\x1b[m> ", cwd, current_branch())
} else {
// let env = context.get_env();
@ -209,15 +201,7 @@ pub async fn cli(mut context: EvaluationContext) -> Result<(), Box<dyn Error>> {
}
}
} else {
use crate::git::current_branch;
format!(
"\x1b[32m{}{}\x1b[m> ",
cwd,
match current_branch() {
Some(s) => format!("({})", s),
None => "".to_string(),
}
)
format!("\x1b[32m{}{}\x1b[m> ", cwd, current_branch())
}
};
@ -371,7 +355,7 @@ async fn run_startup_commands(
_ => {
return Err(ShellError::untagged_runtime_error(
"expected a table of pipeline strings as startup commands",
))
));
}
}
}
@ -405,6 +389,22 @@ pub async fn parse_and_eval(line: &str, ctx: &EvaluationContext) -> Result<Strin
result?.collect_string(Tag::unknown()).await.map(|x| x.item)
}
#[allow(dead_code)]
fn current_branch() -> String {
#[cfg(feature = "shadow-rs")]
{
Some(shadow_rs::branch())
.map(|x| x.trim().to_string())
.filter(|x| !x.is_empty())
.map(|x| format!("({})", x))
.unwrap_or_default()
}
#[cfg(not(feature = "shadow-rs"))]
{
"".to_string()
}
}
#[cfg(test)]
mod tests {
use nu_engine::basic_evaluation_context;

26
crates/nu-cli/src/git.rs
View File

@ -1,26 +0,0 @@
pub fn current_branch() -> Option<String> {
#[cfg(feature = "git2")]
{
use git2::{Repository, RepositoryOpenFlags};
use std::ffi::OsString;
let v: Vec<OsString> = vec![];
match Repository::open_ext(".", RepositoryOpenFlags::empty(), v) {
Ok(repo) => {
let r = repo.head();
match r {
Ok(r) => match r.shorthand() {
Some(s) => Some(s.to_string()),
None => None,
},
_ => None,
}
}
_ => None,
}
}
#[cfg(not(feature = "git2"))]
{
None
}
}

2
crates/nu-cli/src/lib.rs
View File

@ -19,8 +19,6 @@ mod completion;
mod env;
mod format;
#[cfg(feature = "rustyline-support")]
mod git;
#[cfg(feature = "rustyline-support")]
mod keybinding;
mod line_editor;
mod shell;