Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ members = [
"extensions/rag/chat",
"extensions/rag/index",
"extensions/observatory",
"scorpio",
"context",
"neptune",
"scorpio",
]
default-members = ["mega", "mono", "libra", "aries", "orion", "orion-server"]
resolver = "1"
exclude = ["scorpio"]

[workspace.dependencies]
gateway = { path = "gateway" }
Expand Down Expand Up @@ -106,7 +107,7 @@ rayon = "1.10.0"
byteorder = "1.5.0"
bincode = "2.0.1"
once_cell = "1.21.3"
testcontainers = "0.24.0"
testcontainers = "0.25.0"
scopeguard = "1.2.0"
serial_test = "3.2.0"
sysinfo = "0.36.0"
Expand Down
4 changes: 1 addition & 3 deletions common/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,7 @@ impl PackConfig {
}

let ratio_result = size_str.parse::<f64>();
if ratio_result.is_ok() {
let ratio = ratio_result.unwrap();

if let Ok(ratio) = ratio_result {
if ratio > 0.0 && ratio < 1.0 {
let total_mem = fn_get_total_capacity()?;

Expand Down
2 changes: 1 addition & 1 deletion gemini/src/p2p/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl P2PClient {
}
}

pub fn get_bootstrap_node(&self) -> Cow<str> {
pub fn get_bootstrap_node(&self) -> Cow<'_, str> {
let ref_str = self
.bootstrap_node
.get()
Expand Down
1 change: 0 additions & 1 deletion libra/src/command/branch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ pub async fn execute(args: BranchArgs) {
Head::Branch(name) => set_upstream(&name, &args.set_upstream_to.unwrap()).await,
Head::Detached(_) => {
eprintln!("fatal: HEAD is detached");
return;
}
};
} else if args.list {
Expand Down
32 changes: 16 additions & 16 deletions libra/src/command/restore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,25 +81,25 @@ pub async fn execute(args: RestoreArgs) {

// to workdir path
let target_blobs: Vec<(PathBuf, SHA1)> = {
// `source` has been pre-process before ↑
if source.is_none() {
// only this situation, restore from [Index]
assert!(!staged);
let index = Index::load(path::index()).unwrap();
index
.tracked_entries(0)
.into_iter()
.map(|entry| (PathBuf::from(&entry.name), entry.hash))
.collect()
} else {
// restore from commit hash
if let Some(commit) = target_commit {
match (source.as_ref(), target_commit) {
(None, _) => {
// only this situation, restore from [Index]
assert!(!staged);
let index = Index::load(path::index()).unwrap();
index
.tracked_entries(0)
.into_iter()
.map(|entry| (PathBuf::from(&entry.name), entry.hash))
.collect()
}
(Some(_), Some(commit)) => {
// restore from commit hash
let tree_id = Commit::load(&commit).tree_id;
let tree = Tree::load(&tree_id);
tree.get_plain_items()
} else {
let src = source.unwrap();
if storage.search(&src).await.len() != 1 {
}
(Some(src), None) => {
if storage.search(src).await.len() != 1 {
eprintln!("fatal: could not resolve {src}");
} else {
eprintln!("fatal: reference is not a commit: {src}");
Expand Down
4 changes: 2 additions & 2 deletions mono/src/server/http_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ pub async fn post_method_router(
pack_protocol.service_type = Some(ServiceType::ReceivePack);
crate::git_protocol::http::git_receive_pack(req, pack_protocol).await
} else {
return Err(ProtocolError::NotFound(
Err(ProtocolError::NotFound(
"Operation not supported".to_owned(),
));
))
}
}

Expand Down
3 changes: 3 additions & 0 deletions monobean/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ As this module uses Gtk4 and libadwaita to construct the GUI, you should additio
### For Ubuntu Users
Tested on Ubuntu 24.04 (Noble), other Ubuntu versions should work as well.
Simply type the following commands to build:

```bash
sudo apt update
sudo apt install -y libgtk-4-dev libadwaita-1-0 libadwaita-1-dev libgtksourceview-5-dev
Expand All @@ -46,7 +47,9 @@ $env:LIB = "C:\gtk\lib;" + $env:LIB
$env:PKG_CONFIG_PATH = "C:\gtk\lib\pkgconfig" + $env:PKG_CONFIG_PATH
$env:INCLUDE = "C:\gtk\include;C:\gtk\include\cairo;C:\gtk\include\glib-2.0;C:\gtk\include\gobject-introspection-1.0;C:\gtk\lib\glib-2.0\include;" + $env:INCLUDE
```

Then build the package:

```pwsh
cargo build --bin monobean
```
Expand Down
4 changes: 2 additions & 2 deletions scorpio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ once_cell = "1.19.0"
arc-swap = "1.7.1"
env_logger = "0.11.5"
sled = "0.34.7"
bincode = { workspace = true , features = ["serde"] }
bincode = "2.0.1"
async-recursion = "1.1.1"
bytes = "1.7.2"
futures = "0.3.31"
Expand All @@ -47,7 +47,7 @@ thiserror = "2.0.12"
crossbeam = "0.8.4"
fs_extra = "1.2"
dashmap = "6.1.0"
chrono = { workspace = true }
chrono = "0.4.24"


[features]
Expand Down
Loading