D8252: rust: add logging utils
Closed by commit rHG82f51ab7a2dd: rust: add logging utils (authored by Alphare).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs
Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8252?vs=20709=20733
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8252/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8252
AFFECTED FILES
rust/Cargo.lock
rust/hg-core/Cargo.toml
rust/hg-cpython/Cargo.toml
rust/hg-cpython/src/dirstate.rs
CHANGE DETAILS
diff --git a/rust/hg-cpython/src/dirstate.rs b/rust/hg-cpython/src/dirstate.rs
--- a/rust/hg-cpython/src/dirstate.rs
+++ b/rust/hg-cpython/src/dirstate.rs
@@ -107,6 +107,8 @@
let dotted_name = !("{}.dirstate", package);
let m = PyModule::new(py, dotted_name)?;
+simple_logger::init_by_env();
+
m.add(py, "__package__", package)?;
m.add(py, "__doc__", "Dirstate - Rust implementation")?;
diff --git a/rust/hg-cpython/Cargo.toml b/rust/hg-cpython/Cargo.toml
--- a/rust/hg-cpython/Cargo.toml
+++ b/rust/hg-cpython/Cargo.toml
@@ -24,6 +24,7 @@
[dependencies]
hg-core = { path = "../hg-core"}
libc = '*'
+simple_logger = "1.6.0"
[dependencies.cpython]
version = "0.4"
diff --git a/rust/hg-core/Cargo.toml b/rust/hg-core/Cargo.toml
--- a/rust/hg-core/Cargo.toml
+++ b/rust/hg-core/Cargo.toml
@@ -22,6 +22,7 @@
twox-hash = "1.5.0"
same-file = "1.0.6"
crossbeam = "0.7.3"
+log = "0.4.8"
[dev-dependencies]
clap = "*"
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2,10 +2,10 @@
# It is not intended for manual editing.
[[package]]
name = "aho-corasick"
-version = "0.7.8"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -21,8 +21,8 @@
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -43,18 +43,10 @@
[[package]]
name = "byteorder"
-version = "1.3.2"
+version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index;
[[package]]
-name = "c2-chacha"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index;
-dependencies = [
- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "cc"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index;
@@ -65,6 +57,16 @@
source = "registry+https://github.com/rust-lang/crates.io-index;
[[package]]
+name = "chrono"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index;
+dependencies = [
+ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "clap"
version = "2.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index;
@@ -87,11 +89,21 @@
]
[[package]]
+name = "colored"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index;
+dependencies = [
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "cpython"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"python27-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"python3-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -104,10 +116,10 @@
dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.4.2
(registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.7.2
(registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-epoch 0.8.0
(registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.7.3
(registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.8.2
D8252: rust: add logging utils
Alphare updated this revision to Diff 20709.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8252?vs=20566=20709
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8252/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8252
AFFECTED FILES
rust/Cargo.lock
rust/hg-core/Cargo.toml
rust/hg-cpython/Cargo.toml
rust/hg-cpython/src/dirstate.rs
CHANGE DETAILS
diff --git a/rust/hg-cpython/src/dirstate.rs b/rust/hg-cpython/src/dirstate.rs
--- a/rust/hg-cpython/src/dirstate.rs
+++ b/rust/hg-cpython/src/dirstate.rs
@@ -107,6 +107,8 @@
let dotted_name = !("{}.dirstate", package);
let m = PyModule::new(py, dotted_name)?;
+simple_logger::init_by_env();
+
m.add(py, "__package__", package)?;
m.add(py, "__doc__", "Dirstate - Rust implementation")?;
diff --git a/rust/hg-cpython/Cargo.toml b/rust/hg-cpython/Cargo.toml
--- a/rust/hg-cpython/Cargo.toml
+++ b/rust/hg-cpython/Cargo.toml
@@ -24,6 +24,7 @@
[dependencies]
hg-core = { path = "../hg-core"}
libc = '*'
+simple_logger = "1.6.0"
[dependencies.cpython]
version = "0.4"
diff --git a/rust/hg-core/Cargo.toml b/rust/hg-core/Cargo.toml
--- a/rust/hg-core/Cargo.toml
+++ b/rust/hg-core/Cargo.toml
@@ -22,6 +22,7 @@
twox-hash = "1.5.0"
same-file = "1.0.6"
crossbeam = "0.7.3"
+log = "0.4.8"
[dev-dependencies]
clap = "*"
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2,10 +2,10 @@
# It is not intended for manual editing.
[[package]]
name = "aho-corasick"
-version = "0.7.8"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -21,8 +21,8 @@
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -43,18 +43,10 @@
[[package]]
name = "byteorder"
-version = "1.3.2"
+version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index;
[[package]]
-name = "c2-chacha"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index;
-dependencies = [
- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "cc"
version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index;
@@ -65,6 +57,16 @@
source = "registry+https://github.com/rust-lang/crates.io-index;
[[package]]
+name = "chrono"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index;
+dependencies = [
+ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "clap"
version = "2.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index;
@@ -87,11 +89,21 @@
]
[[package]]
+name = "colored"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index;
+dependencies = [
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "cpython"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"python27-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"python3-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -104,10 +116,10 @@
dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.4.2
(registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.7.2
(registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-epoch 0.8.0
(registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.7.3
(registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.8.2
(registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-queue 0.2.1
(registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.0
D8252: rust: add logging utils
Alphare created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This change adds the `log` crate, the community-approved logging facade backed
by Rust core developers as well as the logging-consumer crate `simple_logger`
to build a foundation for logging from Rust.
Using this setup allows us to choose how to log depending on the way `hg-core`
is used: if it's within the context of `hg-cpython`, we might not want to use
it the same way as with a direct cli for example.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8252
AFFECTED FILES
rust/Cargo.lock
rust/hg-core/Cargo.toml
rust/hg-cpython/Cargo.toml
rust/hg-cpython/src/dirstate.rs
CHANGE DETAILS
diff --git a/rust/hg-cpython/src/dirstate.rs b/rust/hg-cpython/src/dirstate.rs
--- a/rust/hg-cpython/src/dirstate.rs
+++ b/rust/hg-cpython/src/dirstate.rs
@@ -107,6 +107,8 @@
let dotted_name = !("{}.dirstate", package);
let m = PyModule::new(py, dotted_name)?;
+simple_logger::init_by_env();
+
m.add(py, "__package__", package)?;
m.add(py, "__doc__", "Dirstate - Rust implementation")?;
diff --git a/rust/hg-cpython/Cargo.toml b/rust/hg-cpython/Cargo.toml
--- a/rust/hg-cpython/Cargo.toml
+++ b/rust/hg-cpython/Cargo.toml
@@ -24,6 +24,7 @@
[dependencies]
hg-core = { path = "../hg-core"}
libc = '*'
+simple_logger = "1.6.0"
[dependencies.cpython]
version = "0.4"
diff --git a/rust/hg-core/Cargo.toml b/rust/hg-core/Cargo.toml
--- a/rust/hg-core/Cargo.toml
+++ b/rust/hg-core/Cargo.toml
@@ -22,6 +22,7 @@
twox-hash = "1.5.0"
same-file = "1.0.6"
crossbeam = "0.7.3"
+log = "0.4.8"
[dev-dependencies]
clap = "*"
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2,10 +2,10 @@
# It is not intended for manual editing.
[[package]]
name = "aho-corasick"
-version = "0.7.8"
+version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -21,8 +21,8 @@
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -43,7 +43,7 @@
[[package]]
name = "byteorder"
-version = "1.3.2"
+version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index;
[[package]]
@@ -65,6 +65,16 @@
source = "registry+https://github.com/rust-lang/crates.io-index;
[[package]]
+name = "chrono"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index;
+dependencies = [
+ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "clap"
version = "2.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index;
@@ -87,11 +97,21 @@
]
[[package]]
+name = "colored"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index;
+dependencies = [
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "cpython"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index;
dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"python27-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"python3-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -104,10 +124,10 @@
dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.4.2
(registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.7.2
(registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-epoch 0.8.0
(registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.7.3
(registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.8.2
(registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-queue 0.2.1
