npub1ng…ds4sg on Nostr: commit a86ba7878fd19457664fede9fb553f4ca1d48927 Author: randymcmillan ...

commit a86ba7878fd19457664fede9fb553f4ca1d48927
Author: randymcmillan <[email protected]>
Date: Fri May 17 20:26:43 2024 -0400

tui/Cargo.toml:git-tui config

diff --git a/.gitmodules b/.gitmodules
index 83f4c0cff..a412f9f1f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -107,11 +107,6 @@
url = https://github.com/gnostr-org/libcjson.git
branch = master
depth = shallow
-[submodule "gnostr-xq"]
- path = xq
- url = https://github.com/gnostr-org/gnostr-xq.git
- branch = master
- depth = shallow
[submodule "vendor/secp256k1-sys/depend/secp256k1"]
path = vendor/secp256k1-sys/depend/secp256k1
url = https://github.com/gnostr-org/secp256k1.git
diff --git a/Cargo.lock b/Cargo.lock
index ad26d7c70..7662ea34a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -478,6 +478,15 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"

+[[package]]
+name = "ascii-canvas"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
+dependencies = [
+ "term",
+]
+
[[package]]
name = "asn1-rs"
version = "0.3.1"
@@ -1472,6 +1481,15 @@ dependencies = [
"serde",
]

+[[package]]
+name = "bitmaps"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2"
+dependencies = [
+ "typenum",
+]
+
[[package]]
name = "blake2"
version = "0.10.6"
@@ -2143,7 +2161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
dependencies = [
"ciborium-io",
- "half",
+ "half 2.4.1",
]

[[package]]
@@ -2247,6 +2265,16 @@ dependencies = [
"clap 4.5.4",
]

+[[package]]
+name = "clap-verbosity-flag"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "bb9b20c0dd58e4c2e991c8d203bbeb76c11304d1011659686b5b644bc29aa478"
+dependencies = [
+ "clap 4.5.4",
+ "log 0.4.21",
+]
+
[[package]]
name = "clap_builder"
version = "4.5.2"
@@ -2430,6 +2458,18 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"

+[[package]]
+name = "colored_json"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "74cb9ce6b86f6e54bfa9518df2eeeef65d424ec7244d083ed97229185e366a91"
+dependencies = [
+ "is-terminal",
+ "serde",
+ "serde_json",
+ "yansi",
+]
+
[[package]]
name = "combine"
version = "4.6.7"
@@ -2538,6 +2578,15 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"

+[[package]]
+name = "content_inspector"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "convert_case"
version = "0.4.0"
@@ -2739,6 +2788,32 @@ dependencies = [
"cfg-if 1.0.0",
]

+[[package]]
+name = "criterion"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
+dependencies = [
+ "atty",
+ "cast",
+ "clap 2.34.0",
+ "criterion-plot 0.4.5",
+ "csv",
+ "itertools 0.10.5",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_cbor",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
[[package]]
name = "criterion"
version = "0.5.1"
@@ -2749,7 +2824,7 @@ dependencies = [
"cast",
"ciborium",
"clap 4.5.4",
- "criterion-plot",
+ "criterion-plot 0.5.0",
"is-terminal",
"itertools 0.10.5",
"num-traits",
@@ -2765,6 +2840,16 @@ dependencies = [
"walkdir",
]

+[[package]]
+name = "criterion-plot"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
+dependencies = [
+ "cast",
+ "itertools 0.10.5",
+]
+
[[package]]
name = "criterion-plot"
version = "0.5.0"
@@ -3056,6 +3141,27 @@ dependencies = [
"subtle",
]

+[[package]]
+name = "csv"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+dependencies = [
+ "csv-core",
+ "itoa 1.0.11",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "ctr"
version = "0.8.0"
@@ -3451,6 +3557,16 @@ dependencies = [
"dirs-sys 0.4.1",
]

+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
+]
+
[[package]]
name = "dirs-sys"
version = "0.3.7"
@@ -3535,7 +3651,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9"
dependencies = [
- "phf",
+ "phf 0.11.2",
]

[[package]]
@@ -3836,6 +3952,15 @@ version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0"

+[[package]]
+name = "ena"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
+dependencies = [
+ "log 0.4.21",
+]
+
[[package]]
name = "encode_unicode"
version = "0.3.6"
@@ -4089,7 +4214,7 @@ checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
dependencies = [
"bit_field",
"flume 0.11.0",
- "half",
+ "half 2.4.1",
"lebe",
"miniz_oxide 0.7.2",
"rayon-core",
@@ -4689,7 +4814,7 @@ version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "eb8adf61df288369c9d1c6bb142f61db30c18619a71f64915d64e916f23c8c37"
dependencies = [
- "phf",
+ "phf 0.11.2",
"regex",
]

@@ -6102,7 +6227,7 @@ dependencies = [
"scrypt",
"serde",
"serde_json",
- "serde_yaml",
+ "serde_yaml 0.9.34+deprecated",
"serial_test 2.0.0",
"test_utils",
"tokio 1.37.0",
@@ -6290,6 +6415,44 @@ dependencies = [
"zeroize",
]

+[[package]]
+name = "gnostr-xq"
+version = "0.0.40"
+dependencies = [
+ "anyhow",
+ "base64 0.13.1",
+ "cast",
+ "clap 4.5.4",
+ "clap-verbosity-flag",
+ "colored_json",
+ "criterion 0.3.6",
+ "derive_more",
+ "html-escape",
+ "imbl",
+ "is-terminal",
+ "itertools 0.10.5",
+ "log 0.4.21",
+ "num",
+ "num-derive",
+ "num-traits",
+ "onig",
+ "ordered-float",
+ "phf 0.10.1",
+ "serde",
+ "serde_json",
+ "serde_yaml 0.8.26",
+ "shell-escape",
+ "simplelog",
+ "sized-chunks",
+ "thiserror",
+ "time 0.3.36",
+ "time-fmt",
+ "time-tz",
+ "trycmd",
+ "urlencoding",
+ "xq-lang",
+]
+
[[package]]
name = "gnostrd"
version = "0.0.40"
@@ -6427,6 +6590,12 @@ dependencies = [
"tracing",
]

+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
[[package]]
name = "half"
version = "2.4.1"
@@ -6681,6 +6850,15 @@ dependencies = [
"winapi 0.3.9",
]

+[[package]]
+name = "html-escape"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
+dependencies = [
+ "utf8-width",
+]
+
[[package]]
name = "http"
version = "0.1.21"
@@ -6804,6 +6982,16 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

+[[package]]
+name = "humantime-serde"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
+dependencies = [
+ "humantime",
+ "serde",
+]
+
[[package]]
name = "hyper"
version = "0.10.16"
@@ -7167,13 +7355,26 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951"

+[[package]]
+name = "imbl"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "543682c9082b25e63d03b5acbd65ad111fd49dd93e70843e5175db4ff81d606b"
+dependencies = [
+ "bitmaps",
+ "rand_core 0.6.4",
+ "rand_xoshiro",
+ "sized-chunks",
+ "typenum",
+ "version_check 0.9.4",
+]
+
[[package]]
name = "include_dir"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
dependencies = [
- "glob",
"include_dir_macros",
]

@@ -7463,7 +7664,7 @@ dependencies = [
"clap_complete_nushell",
"clap_mangen",
"config",
- "criterion",
+ "criterion 0.5.1",
"crossterm 0.27.0",
"dashmap",
"dirs 5.0.1",
@@ -7553,7 +7754,7 @@ dependencies = [
"bytes 1.6.0",
"chrono",
"config",
- "criterion",
+ "criterion 0.5.1",
"digest 0.10.7",
"either",
"esl01-renderdag",
@@ -7790,6 +7991,37 @@ dependencies = [
"log 0.4.21",
]

+[[package]]
+name = "lalrpop"
+version = "0.19.12"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b"
+dependencies = [
+ "ascii-canvas",
+ "bit-set",
+ "diff",
+ "ena",
+ "is-terminal",
+ "itertools 0.10.5",
+ "lalrpop-util",
+ "petgraph",
+ "regex",
+ "regex-syntax 0.6.29",
+ "string_cache",
+ "term",
+ "tiny-keccak",
+ "unicode-xid 0.2.4",
+]
+
+[[package]]
+name = "lalrpop-util"
+version = "0.19.12"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed"
+dependencies = [
+ "regex",
+]
+
[[package]]
name = "language-tags"
version = "0.2.2"
@@ -7814,6 +8046,27 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"

+[[package]]
+name = "lexgen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c8fd52abd364f752712c0e06022bece2eeafbc1b386e6794d03a348a906caab8"
+dependencies = [
+ "fxhash",
+ "proc-macro2 1.0.82",
+ "quote 1.0.36",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "lexgen_util"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "6a7234c237153c1ecb09f2467a78b1034f473d4dc3c6d0a056a151d299296aff"
+dependencies = [
+ "unicode-width",
+]
+
[[package]]
name = "lexopt"
version = "0.3.0"
@@ -10079,6 +10332,12 @@ dependencies = [
"tokio 1.37.0",
]

+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
[[package]]
name = "newline-converter"
version = "0.3.0"
@@ -10091,9 +10350,6 @@ dependencies = [
[[package]]
name = "nips"
version = "0.0.40"
-dependencies = [
- "include_dir",
-]

[[package]]
name = "nix"
@@ -10446,6 +10702,17 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"

+[[package]]
+name = "num-derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+dependencies = [
+ "proc-macro2 1.0.82",
+ "quote 1.0.36",
+ "syn 1.0.109",
+]
+
[[package]]
name = "num-integer"
version = "0.1.46"
@@ -10853,6 +11120,15 @@ dependencies = [
"libredox 0.0.2",
]

+[[package]]
+name = "ordered-float"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "ordered-stream"
version = "0.2.0"
@@ -10863,6 +11139,16 @@ dependencies = [
"pin-project-lite 0.2.14",
]

+[[package]]
+name = "os_pipe"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "os_str_bytes"
version = "6.6.1"
@@ -11045,6 +11331,15 @@ dependencies = [
"serde_json",
]

+[[package]]
+name = "parse-zoneinfo"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
+dependencies = [
+ "regex",
+]
+
[[package]]
name = "password-hash"
version = "0.4.2"
@@ -11241,14 +11536,35 @@ dependencies = [
"rustc_version 0.4.0",
]

+[[package]]
+name = "phf"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+dependencies = [
+ "phf_macros 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro-hack",
+]
+
[[package]]
name = "phf"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
dependencies = [
- "phf_macros",
- "phf_shared",
+ "phf_macros 0.11.2",
+ "phf_shared 0.11.2",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
]

[[package]]
@@ -11257,8 +11573,18 @@ version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared 0.10.0",
+ "rand 0.8.5",
]

[[package]]
@@ -11267,23 +11593,46 @@ version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
dependencies = [
- "phf_shared",
+ "phf_shared 0.11.2",
"rand 0.8.5",
]

+[[package]]
+name = "phf_macros"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro-hack",
+ "proc-macro2 1.0.82",
+ "quote 1.0.36",
+ "syn 1.0.109",
+]
+
[[package]]
name = "phf_macros"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
"proc-macro2 1.0.82",
"quote 1.0.36",
"syn 2.0.61",
]

+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
[[package]]
name = "phf_shared"
version = "0.11.2"
@@ -11519,6 +11868,12 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"

+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
[[package]]
name = "predicates"
version = "2.1.5"
@@ -12170,6 +12525,15 @@ dependencies = [
"rand_core 0.3.1",
]

+[[package]]
+name = "rand_xoshiro"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
[[package]]
name = "random-access-disk"
version = "3.0.1"
@@ -13520,6 +13884,18 @@ dependencies = [
"serde_derive",
]

+[[package]]
+name = "serde-xml-rs"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa"
+dependencies = [
+ "log 0.4.21",
+ "serde",
+ "thiserror",
+ "xml-rs",
+]
+
[[package]]
name = "serde_bser"
version = "0.3.1"
@@ -13533,6 +13909,16 @@ dependencies = [
"thiserror",
]

+[[package]]
+name = "serde_cbor"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+dependencies = [
+ "half 1.8.3",
+ "serde",
+]
+
[[package]]
name = "serde_derive"
version = "1.0.201"
@@ -13609,6 +13995,18 @@ dependencies = [
"serde",
]

+[[package]]
+name = "serde_yaml"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+dependencies = [
+ "indexmap 1.9.3",
+ "ryu",
+ "serde",
+ "yaml-rust",
+]
+
[[package]]
name = "serde_yaml"
version = "0.9.34+deprecated"
@@ -13909,6 +14307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
dependencies = [
"log 0.4.21",
+ "termcolor",
"time 0.3.36",
]

@@ -13918,6 +14317,16 @@ version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"

+[[package]]
+name = "sized-chunks"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e"
+dependencies = [
+ "bitmaps",
+ "typenum",
+]
+
[[package]]
name = "slab"
version = "0.4.9"
@@ -14070,6 +14479,37 @@ dependencies = [
"syn 2.0.61",
]

+[[package]]
+name = "snapbox"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "4b831b6e80fbcd2889efa75b185d24005f85981431495f995292b25836519d84"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "content_inspector",
+ "dunce",
+ "filetime",
+ "libc",
+ "normalize-line-endings",
+ "os_pipe",
+ "similar",
+ "snapbox-macros",
+ "tempfile",
+ "wait-timeout",
+ "walkdir",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "snapbox-macros"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d"
+dependencies = [
+ "anstream",
+]
+
[[package]]
name = "snow"
version = "0.9.6"
@@ -14208,6 +14648,19 @@ dependencies = [
"float-cmp",
]

+[[package]]
+name = "string_cache"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot 0.12.2",
+ "phf_shared 0.10.0",
+ "precomputed-hash",
+]
+
[[package]]
name = "strip-ansi-escapes"
version = "0.2.0"
@@ -14633,6 +15086,17 @@ dependencies = [
"windows-sys 0.52.0",
]

+[[package]]
+name = "term"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
+dependencies = [
+ "dirs-next",
+ "rustversion",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "termcolor"
version = "1.4.1"
@@ -14661,8 +15125,8 @@ dependencies = [
"dirs 4.0.0",
"fnv",
"nom",
- "phf",
- "phf_codegen",
+ "phf 0.11.2",
+ "phf_codegen 0.11.2",
]

[[package]]
@@ -14853,6 +15317,16 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

+[[package]]
+name = "time-fmt"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "78bfd61bca99323ce96911bd2c443259115460615e44f1d449cee8cb3831a1dd"
+dependencies = [
+ "thiserror",
+ "time 0.3.36",
+]
+
[[package]]
name = "time-macros"
version = "0.2.18"
@@ -14863,6 +15337,24 @@ dependencies = [
"time-core",
]

+[[package]]
+name = "time-tz"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "3503b497df9941543c7c5d609ae4136e0be8792054ff0a1856f0f25127192e93"
+dependencies = [
+ "cfg-if 1.0.0",
+ "nom",
+ "parse-zoneinfo",
+ "phf 0.10.1",
+ "phf_codegen 0.10.0",
+ "serde",
+ "serde-xml-rs",
+ "thiserror",
+ "time 0.3.36",
+ "windows-sys 0.32.0",
+]
+
[[package]]
name = "timeago"
version = "0.4.2"
@@ -15487,6 +15979,18 @@ dependencies = [
"serde",
]

+[[package]]
+name = "toml_edit"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f"
+dependencies = [
+ "combine",
+ "indexmap 1.9.3",
+ "itertools 0.10.5",
+ "serde",
+]
+
[[package]]
name = "toml_edit"
version = "0.19.15"
@@ -15752,6 +16256,22 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"

+[[package]]
+name = "trycmd"
+version = "0.13.7"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "a5377b33cbe8bb69d97da63e2a2266065a642a47cc9bb3d783c28279d0029fea"
+dependencies = [
+ "glob",
+ "humantime",
+ "humantime-serde",
+ "rayon",
+ "serde",
+ "shlex",
+ "snapbox",
+ "toml_edit 0.14.4",
+]
+
[[package]]
name = "ttf-parser"
version = "0.21.1"
@@ -16111,6 +16631,12 @@ dependencies = [
"serde",
]

+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
[[package]]
name = "usvg"
version = "0.28.0"
@@ -16137,6 +16663,12 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"

+[[package]]
+name = "utf8-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+
[[package]]
name = "utf8parse"
version = "0.2.1"
@@ -17170,6 +17702,19 @@ dependencies = [
"syn 2.0.61",
]

+[[package]]
+name = "windows-sys"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
+dependencies = [
+ "windows_aarch64_msvc 0.32.0",
+ "windows_i686_gnu 0.32.0",
+ "windows_i686_msvc 0.32.0",
+ "windows_x86_64_gnu 0.32.0",
+ "windows_x86_64_msvc 0.32.0",
+]
+
[[package]]
name = "windows-sys"
version = "0.36.1"
@@ -17289,6 +17834,12 @@ version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.36.1"
@@ -17313,6 +17864,12 @@ version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
+
[[package]]
name = "windows_i686_gnu"
version = "0.36.1"
@@ -17343,6 +17900,12 @@ version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
+
[[package]]
name = "windows_i686_msvc"
version = "0.36.1"
@@ -17367,6 +17930,12 @@ version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.36.1"
@@ -17409,6 +17978,12 @@ version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.36.1"
@@ -17678,6 +18253,19 @@ dependencies = [
"xml-rs",
]

+[[package]]
+name = "xq-lang"
+version = "0.0.1"
+dependencies = [
+ "derive_more",
+ "lalrpop",
+ "lalrpop-util",
+ "lexgen",
+ "lexgen_util",
+ "ordered-float",
+ "thiserror",
+]
+
[[package]]
name = "xz2"
version = "0.1.7"
@@ -17687,6 +18275,15 @@ dependencies = [
"lzma-sys",
]

+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
[[package]]
name = "yamux"
version = "0.12.1"
diff --git a/Cargo.toml b/Cargo.toml
index f51083e6e..a1e71d286 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@ cargo-features = []

[workspace]
resolver = "2"
-members = ["bins", "d", "cli", "jj", "gui", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils", "lookup","tui" ,"tui/asyncgit", "tui/filetreelist", "tui/git2-hooks", "tui/git2-testing", "tui/scopetime", "nips", "cat"]
+members = ["bins", "d", "cli", "jj", "gui", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils", "lookup","tui" ,"tui/asyncgit", "tui/filetreelist", "tui/git2-hooks", "tui/git2-testing", "tui/scopetime", "nips", "cat","xq"]
exclude = ["ffi", "relay"]

[workspace.package]
diff --git a/cli b/cli
index a7da11102..adcc893f9 160000
--- a/cli
+++ b/cli
@@ -1 +1 @@
-Subproject commit a7da11102da200c281696eae8fd1bda39aecf436
+Subproject commit adcc893f990c226f1c19c911522c09da785e0ba4
diff --git a/gnostr.mk b/gnostr.mk
index 533628771..e89b2de42 100644
--- a/gnostr.mk
+++ b/gnostr.mk
@@ -330,11 +330,9 @@ lookup:#bins/.git
.PHONY:xq gnostr-xq

.PHONY:xq gnostr-xq
-xq/.git:
- @devtools/refresh-submodules.sh xq
gnostr-xq:xq
-xq:xq/.git
- @cd xq && make cargo-b-release && make cargo-i
+xq:
+ @cargo install --path xq

.PHONY:core gnostr-core
core/.git:
diff --git a/nips b/nips
index 17466f24d..0f968441b 160000
--- a/nips
+++ b/nips
@@ -1 +1 @@
-Subproject commit 17466f24df54964cd5767927ac9854be9f27c7b7
+Subproject commit 0f968441be79c4d18c0935e67f5c0e4c8a9f8fa0
diff --git a/tui/Cargo.toml b/tui/Cargo.toml
index 1c148ab44..4930bae03 100644
--- a/tui/Cargo.toml
+++ b/tui/Cargo.toml
@@ -15,6 +15,12 @@ repository = { workspace = true }
documentation = { workspace = true }
keywords = { workspace = true }

+## git gnostr-tui
+[[bin]]
+name = "git-tui"
+path = "src/main.rs"
+
+
[dependencies]
anyhow = "1.0"
asyncgit = { path = "./asyncgit", default-features = false }
diff --git a/xq b/xq
deleted file mode 160000
index 983614b6f..000000000
--- a/xq
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 983614b6feb4add2c254163325b073eb2571290c