gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-09-11 12:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

move from lib+bin to bin, refactor tests into crate

Browse Source
This commit is contained in:
Josh Junon 2024-03-01 15:14:30 +01:00
parent d5c9f1d7da
commit 502645eaac
36 changed files with 258 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config.toml
View File

@ -1,2 +0,0 @@
[build]
rustflags = ["--cfg", "tokio_unstable"]

8
gitbutler-app/Cargo.toml
View File

@ -5,14 +5,6 @@ edition = "2021"
rust-version = "1.57"
authors = ["GitButler <gitbutler@gitbutler.com>"]
[lib]
name = "gblib"
path = "src/lib.rs"
[[bin]]
name = "gitbutler-app"
path = "src/bin.rs"
[build-dependencies]
tauri-build = { version = "1.5", features = [] }

4
gitbutler-app/src/database.rs
View File

@ -74,13 +74,13 @@ impl Database {
#[cfg(test)]
mod tests {
use crate::test_utils;
use crate::tests;
use super::*;
#[test]
fn smoke() {
let data_dir = test_utils::temp_dir();
let data_dir = tests::temp_dir();
let db = Database::try_from(&data_dir).unwrap();
db.transaction(|tx| {
tx.execute("CREATE TABLE test (id INTEGER PRIMARY KEY)", [])

8
gitbutler-app/src/deltas/database.rs
View File

@ -138,13 +138,13 @@ fn insert_stmt<'conn>(
#[cfg(test)]
mod tests {
use crate::test_utils;
use crate::tests;
use super::*;
#[test]
fn insert_query() -> Result<()> {
let db = test_utils::test_database();
let db = tests::test_database();
let database = Database::new(db);
let project_id = ProjectId::generate();
@ -170,7 +170,7 @@ mod tests {
#[test]
fn insert_update() -> Result<()> {
let db = test_utils::test_database();
let db = tests::test_database();
let database = Database::new(db);
let project_id = ProjectId::generate();
@ -203,7 +203,7 @@ mod tests {
#[test]
fn aggregate_deltas_by_file() -> Result<()> {
let db = test_utils::test_database();
let db = tests::test_database();
let database = Database::new(db);
let project_id = ProjectId::generate();

2
gitbutler-app/src/deltas/writer.rs
View File

@ -77,7 +77,7 @@ mod tests {
use crate::{
deltas, sessions,
test_utils::{Case, Suite},
tests::{Case, Suite},
};
use super::*;

2
gitbutler-app/src/gb_repository/repository.rs
View File

@ -969,7 +969,7 @@ mod test {
use anyhow::Result;
use pretty_assertions::assert_eq;
use crate::test_utils::{Case, Suite};
use crate::tests::{Case, Suite};
#[test]
fn test_alternates_file_being_set() -> Result<()> {

2
gitbutler-app/src/gb_repository/repository_tests.rs
View File

@ -8,7 +8,7 @@ use crate::{
projects::{self, ProjectId},
reader,
sessions::{self, SessionId},
test_utils::{Case, Suite},
tests::{Case, Suite},
};
fn test_remote_repository() -> Result<git2::Repository> {

10
gitbutler-app/src/git/config.rs
View File

@ -50,11 +50,11 @@ impl Config {
#[cfg(test)]
mod tests {
use crate::test_utils;
use crate::tests;
#[test]
pub fn test_set_str() {
let repo = test_utils::test_repository();
let repo = tests::test_repository();
let mut config = repo.config().unwrap();
config.set_str("test.key", "test.value").unwrap();
assert_eq!(
@ -65,7 +65,7 @@ mod tests {
#[test]
pub fn test_set_bool() {
let repo = test_utils::test_repository();
let repo = tests::test_repository();
let mut config = repo.config().unwrap();
config.set_bool("test.key", true).unwrap();
assert!(config.get_bool("test.key").unwrap().unwrap());
@ -73,14 +73,14 @@ mod tests {
#[test]
pub fn test_get_string_none() {
let repo = test_utils::test_repository();
let repo = tests::test_repository();
let config = repo.config().unwrap();
assert_eq!(config.get_string("test.key").unwrap(), None);
}
#[test]
pub fn test_get_bool_none() {
let repo = test_utils::test_repository();
let repo = tests::test_repository();
let config = repo.config().unwrap();
assert_eq!(config.get_bool("test.key").unwrap(), None);
}

4
gitbutler-app/src/git/credentials.rs
View File

@ -417,7 +417,7 @@ impl Helper {
mod tests {
use super::*;
use crate::test_utils::{self, test_repository};
use crate::tests::{self, test_repository};
#[derive(Default)]
struct TestCase<'a> {
@ -429,7 +429,7 @@ mod tests {
impl TestCase<'_> {
fn run(&self) -> Vec<(String, Vec<Credential>)> {
let local_app_data = test_utils::temp_dir();
let local_app_data = tests::temp_dir();
let users = users::Controller::try_from(&local_app_data).unwrap();
let user = users::User {

12
gitbutler-app/src/git/diff.rs
View File

@ -331,13 +331,13 @@ pub fn reverse_hunk(hunk: &Hunk) -> Option<Hunk> {
#[cfg(test)]
mod tests {
use crate::test_utils;
use crate::tests;
use super::*;
#[test]
fn diff_simple_text() {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
std::fs::write(repository.workdir().unwrap().join("file"), "hello").unwrap();
let head_commit_id = repository.head().unwrap().peel_to_commit().unwrap().id();
@ -360,7 +360,7 @@ mod tests {
#[test]
fn diff_empty_file() {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
std::fs::write(repository.workdir().unwrap().join("first"), "").unwrap();
let head_commit_id = repository.head().unwrap().peel_to_commit().unwrap().id();
@ -383,7 +383,7 @@ mod tests {
#[test]
fn diff_multiple_empty_files() {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
std::fs::write(repository.workdir().unwrap().join("first"), "").unwrap();
std::fs::write(repository.workdir().unwrap().join("second"), "").unwrap();
@ -419,7 +419,7 @@ mod tests {
#[test]
fn diff_binary() {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
std::fs::write(
repository.workdir().unwrap().join("image"),
[
@ -450,7 +450,7 @@ mod tests {
#[test]
fn diff_some_lines_are_binary() {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
std::fs::write(
repository.workdir().unwrap().join("file"),
[

2
gitbutler-app/src/keys/controller.rs
View File

@ -59,7 +59,7 @@ mod tests {
#[cfg(target_family = "unix")]
use std::os::unix::prelude::*;
use crate::test_utils::Suite;
use crate::tests::Suite;
use super::*;

1
gitbutler-app/src/keys/key.rs
View File

@ -4,7 +4,6 @@ use ssh_key::{HashAlg, LineEnding, SshSig};
use rand::rngs::OsRng;
use serde::{Deserialize, Serialize};
use ssh_key;
#[derive(Debug, Clone, Eq)]
pub struct PrivateKey(ssh_key::PrivateKey);

44
gitbutler-app/src/lib.rs
View File

@ -1,44 +0,0 @@
#![feature(error_generic_member_access)]
#![cfg_attr(target_os = "windows", feature(windows_by_handle))]
pub mod analytics;
pub mod app;
pub mod assets;
pub mod commands;
pub mod database;
pub mod dedup;
pub mod deltas;
pub mod error;
pub mod events;
pub mod fs;
pub mod gb_repository;
pub mod git;
pub mod github;
pub mod keys;
pub mod lock;
pub mod logs;
pub mod menu;
pub mod project_repository;
pub mod projects;
pub mod reader;
pub mod sentry;
pub mod sessions;
pub mod ssh;
pub mod storage;
pub mod types;
pub mod users;
pub mod virtual_branches;
pub mod watcher;
#[cfg(target_os = "windows")]
pub(crate) mod windows;
pub mod writer;
pub mod zip;
#[cfg(test)]
pub mod test_utils;
#[deprecated = "use `gitbutler-core` instead"]
pub mod id {
#[deprecated = "use `gitbutler-core` instead"]
pub use gitbutler_core::id::Id;
}

2
gitbutler-app/src/lock.rs
View File

@ -54,7 +54,7 @@ impl Inner {
mod tests {
use super::*;
use crate::test_utils::temp_dir;
use crate::tests::temp_dir;
#[tokio::test]
async fn test_lock_same_instance() {

49
gitbutler-app/src/bin.rs → gitbutler-app/src/main.rs
View File

@ -1,12 +1,53 @@
#![feature(error_generic_member_access)]
#![cfg_attr(target_os = "windows", feature(windows_by_handle))]
pub(crate) mod analytics;
pub(crate) mod app;
pub(crate) mod assets;
pub(crate) mod commands;
pub(crate) mod database;
pub(crate) mod dedup;
pub(crate) mod deltas;
pub(crate) mod error;
pub(crate) mod events;
pub(crate) mod fs;
pub(crate) mod gb_repository;
pub(crate) mod git;
pub(crate) mod github;
pub(crate) mod keys;
pub(crate) mod lock;
pub(crate) mod logs;
pub(crate) mod menu;
pub(crate) mod project_repository;
pub(crate) mod projects;
pub(crate) mod reader;
pub(crate) mod sentry;
pub(crate) mod sessions;
pub(crate) mod ssh;
pub(crate) mod storage;
pub(crate) mod types;
pub(crate) mod users;
pub(crate) mod virtual_branches;
pub(crate) mod watcher;
#[cfg(target_os = "windows")]
pub(crate) mod windows;
pub(crate) mod writer;
pub(crate) mod zip;
#[cfg(test)]
pub(crate) mod tests;
#[deprecated = "use `gitbutler-core` instead"]
pub(crate) mod id {
#[deprecated = "use `gitbutler-core` instead"]
pub use gitbutler_core::id::Id;
}
use std::path::PathBuf;
use anyhow::Context;
use tauri::{generate_context, Manager, Wry};
use gblib::{
analytics, app, assets, commands, database, deltas, github, keys, logs, menu, projects, sentry,
sessions, storage, users, virtual_branches, watcher, zip,
};
use tauri_plugin_log::LogTarget;
use tauri_plugin_store::{with_store, JsonValue, StoreCollection};

26
gitbutler-app/src/reader.rs
View File

@ -447,11 +447,11 @@ mod tests {
use anyhow::Result;
use crate::test_utils;
use crate::tests;
#[test]
fn test_directory_reader_read_file() -> Result<()> {
let dir = test_utils::temp_dir();
let dir = tests::temp_dir();
let file_path = path::Path::new("test.txt");
std::fs::write(dir.join(file_path), "test")?;
@ -464,12 +464,12 @@ mod tests {
#[test]
fn test_commit_reader_read_file() -> Result<()> {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
let file_path = path::Path::new("test.txt");
std::fs::write(repository.path().parent().unwrap().join(file_path), "test")?;
let oid = test_utils::commit_all(&repository);
let oid = tests::commit_all(&repository);
std::fs::write(repository.path().parent().unwrap().join(file_path), "test2")?;
@ -481,7 +481,7 @@ mod tests {
#[test]
fn test_reader_list_files_should_return_relative() -> Result<()> {
let dir = test_utils::temp_dir();
let dir = tests::temp_dir();
std::fs::write(dir.join("test1.txt"), "test")?;
std::fs::create_dir_all(dir.join("dir"))?;
@ -497,7 +497,7 @@ mod tests {
#[test]
fn test_reader_list_files() -> Result<()> {
let dir = test_utils::temp_dir();
let dir = tests::temp_dir();
std::fs::write(dir.join("test.txt"), "test")?;
std::fs::create_dir_all(dir.join("dir"))?;
@ -514,7 +514,7 @@ mod tests {
#[test]
fn test_commit_reader_list_files_should_return_relative() -> Result<()> {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
std::fs::write(
repository.path().parent().unwrap().join("test1.txt"),
@ -531,7 +531,7 @@ mod tests {
"test",
)?;
let oid = test_utils::commit_all(&repository);
let oid = tests::commit_all(&repository);
std::fs::remove_dir_all(repository.path().parent().unwrap().join("dir"))?;
@ -545,7 +545,7 @@ mod tests {
#[test]
fn test_commit_reader_list_files() -> Result<()> {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
std::fs::write(repository.path().parent().unwrap().join("test.txt"), "test")?;
std::fs::create_dir_all(repository.path().parent().unwrap().join("dir"))?;
@ -559,7 +559,7 @@ mod tests {
"test",
)?;
let oid = test_utils::commit_all(&repository);
let oid = tests::commit_all(&repository);
std::fs::remove_dir_all(repository.path().parent().unwrap().join("dir"))?;
@ -574,7 +574,7 @@ mod tests {
#[test]
fn test_directory_reader_exists() -> Result<()> {
let dir = test_utils::temp_dir();
let dir = tests::temp_dir();
std::fs::write(dir.join("test.txt"), "test")?;
@ -587,11 +587,11 @@ mod tests {
#[test]
fn test_commit_reader_exists() -> Result<()> {
let repository = test_utils::test_repository();
let repository = tests::test_repository();
std::fs::write(repository.path().parent().unwrap().join("test.txt"), "test")?;
let oid = test_utils::commit_all(&repository);
let oid = tests::commit_all(&repository);
std::fs::remove_file(repository.path().parent().unwrap().join("test.txt"))?;

6
gitbutler-app/src/sessions/database.rs
View File

@ -198,13 +198,13 @@ fn insert_stmt<'conn>(
#[cfg(test)]
mod tests {
use crate::test_utils;
use crate::tests;
use super::*;
#[test]
fn test_insert_query() -> Result<()> {
let db = test_utils::test_database();
let db = tests::test_database();
println!("0");
let database = Database::new(db);
println!("1");
@ -247,7 +247,7 @@ mod tests {
#[test]
fn test_update() -> Result<()> {
let db = test_utils::test_database();
let db = tests::test_database();
let database = Database::new(db);
let project_id = ProjectId::generate();

2
gitbutler-app/src/sessions/tests.rs
View File

@ -2,7 +2,7 @@ use anyhow::Result;
use crate::{
sessions::{self, session::SessionId},
test_utils::{Case, Suite},
tests::{Case, Suite},
};
use super::Writer;

7
gitbutler-app/src/test_utils.rs → gitbutler-app/src/tests.rs
View File

@ -1,3 +1,10 @@
pub(crate) mod common;
mod suite {
mod gb_repository;
mod projects;
mod virtual_branches;
}
use std::{collections::HashMap, fs, path};
use tempfile::tempdir;

2
gitbutler-app/tests/common.rs → gitbutler-app/src/tests/common.rs
View File

@ -1,5 +1,5 @@
#![allow(unused)]
use gblib::git;
use crate::git;
use std::{path, str::from_utf8};
pub fn temp_dir() -> std::path::PathBuf {

8
gitbutler-app/tests/gb_repository.rs → gitbutler-app/src/tests/suite/gb_repository.rs
View File

@ -1,7 +1,7 @@
mod common;
use self::common::{paths, TestProject};
use gblib::{gb_repository, git, project_repository, projects};
use crate::{
gb_repository, git, project_repository, projects,
tests::common::{paths, TestProject},
};
use std::path;
mod init {

10
gitbutler-app/tests/projects.rs → gitbutler-app/src/tests/suite/projects.rs
View File

@ -1,7 +1,7 @@
mod common;
use self::common::paths;
use gblib::projects::Controller;
use crate::{
projects::Controller,
tests::common::{self, paths},
};
pub fn new() -> Controller {
let data_dir = paths::data_dir();
@ -22,7 +22,7 @@ mod add {
}
mod error {
use gblib::projects::AddError;
use crate::projects::AddError;
use super::*;

17
gitbutler-app/tests/virtual_branches.rs → gitbutler-app/src/tests/suite/virtual_branches.rs
View File

@ -5,20 +5,17 @@
clippy::dbg_macro
)]
mod common;
use std::{fs, path, str::FromStr};
use gblib::{
use crate::{
error::Error,
git, keys,
projects::{self, ProjectId},
tests::common::{paths, TestProject},
users,
virtual_branches::{branch, controller::ControllerError, errors, Controller},
};
use self::common::{paths, TestProject};
struct Test {
repository: TestProject,
project_id: ProjectId,
@ -49,7 +46,7 @@ impl Default for Test {
}
mod unapply_ownership {
use gblib::virtual_branches::branch::Ownership;
use crate::virtual_branches::branch::Ownership;
use super::*;
@ -365,7 +362,7 @@ mod references {
let branch1_id = controller
.create_virtual_branch(
&project_id,
&gblib::virtual_branches::branch::BranchCreateRequest {
&crate::virtual_branches::branch::BranchCreateRequest {
name: Some("name".to_string()),
..Default::default()
},
@ -376,7 +373,7 @@ mod references {
let branch2_id = controller
.create_virtual_branch(
&project_id,
&gblib::virtual_branches::branch::BranchCreateRequest {
&crate::virtual_branches::branch::BranchCreateRequest {
name: Some("name".to_string()),
..Default::default()
},
@ -3377,7 +3374,7 @@ mod update_base_branch {
}
mod reset_virtual_branch {
use gblib::virtual_branches::{controller::ControllerError, errors::ResetBranchError};
use crate::virtual_branches::{controller::ControllerError, errors::ResetBranchError};
use super::*;
@ -6255,7 +6252,7 @@ mod selected_for_changes {
}
mod move_commit_to_vbranch {
use gblib::virtual_branches::BranchId;
use crate::virtual_branches::BranchId;
use super::*;

2
gitbutler-app/src/virtual_branches/branch/reader.rs
View File

@ -27,7 +27,7 @@ mod tests {
use crate::{
sessions,
test_utils::{Case, Suite},
tests::{Case, Suite},
virtual_branches::branch::Ownership,
};

2
gitbutler-app/src/virtual_branches/branch/writer.rs
View File

@ -157,7 +157,7 @@ mod tests {
use once_cell::sync::Lazy;
use crate::{
test_utils::{Case, Suite},
tests::{Case, Suite},
virtual_branches::branch,
};

2
gitbutler-app/src/virtual_branches/iterator.rs
View File

@ -65,7 +65,7 @@ mod tests {
use crate::{
reader, sessions,
test_utils::{Case, Suite},
tests::{Case, Suite},
virtual_branches::target,
};

2
gitbutler-app/src/virtual_branches/target/reader.rs
View File

@ -39,7 +39,7 @@ mod tests {
use crate::{
sessions,
test_utils::{Case, Suite},
tests::{Case, Suite},
virtual_branches::{branch, target::writer::TargetWriter},
};

2
gitbutler-app/src/virtual_branches/target/writer.rs
View File

@ -100,7 +100,7 @@ mod tests {
use once_cell::sync::Lazy;
use crate::{
test_utils::{Case, Suite},
tests::{Case, Suite},
virtual_branches::branch,
};

32
gitbutler-app/src/virtual_branches/tests.rs
View File

@ -13,7 +13,7 @@ use std::os::unix::{fs::symlink, prelude::*};
use crate::{
gb_repository, git, project_repository, reader, sessions,
test_utils::{self, empty_bare_repository, Case, Suite},
tests::{self, empty_bare_repository, Case, Suite},
virtual_branches::errors::CommitError,
};
@ -207,7 +207,7 @@ fn test_track_binary_files() -> Result<()> {
];
let mut file = fs::File::create(std::path::Path::new(&project.path).join("image.bin"))?;
file.write_all(&image_data)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
set_test_target(&gb_repository, &project_repository)?;
@ -954,7 +954,7 @@ fn test_merge_vbranch_upstream_clean_rebase() -> Result<()> {
std::path::Path::new(&project.path).join(file_path),
"line1\nline2\nline3\nline4\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let target_oid = project_repository
.git_repository
.head()
@ -967,7 +967,7 @@ fn test_merge_vbranch_upstream_clean_rebase() -> Result<()> {
"line1\nline2\nline3\nline4\nupstream\n",
)?;
// add a commit to the target branch it's pointing to so there is something "upstream"
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let last_push = project_repository
.git_repository
.head()
@ -981,7 +981,7 @@ fn test_merge_vbranch_upstream_clean_rebase() -> Result<()> {
"line1\nline2\nline3\nline4\nupstream\ncoworker work\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let coworker_work = project_repository
.git_repository
.head()
@ -1078,7 +1078,7 @@ fn test_merge_vbranch_upstream_conflict() -> Result<()> {
std::path::Path::new(&project.path).join(file_path),
"line1\nline2\nline3\nline4\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let target_oid = project_repository
.git_repository
.head()
@ -1091,7 +1091,7 @@ fn test_merge_vbranch_upstream_conflict() -> Result<()> {
"line1\nline2\nline3\nline4\nupstream\n",
)?;
// add a commit to the target branch it's pointing to so there is something "upstream"
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let last_push = project_repository
.git_repository
.head()
@ -1105,7 +1105,7 @@ fn test_merge_vbranch_upstream_conflict() -> Result<()> {
"line1\nline2\nline3\nline4\nupstream\ncoworker work\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let coworker_work = project_repository
.git_repository
.head()
@ -1284,7 +1284,7 @@ fn test_apply_unapply_branch() -> Result<()> {
std::path::Path::new(&project.path).join(file_path),
"line1\nline2\nline3\nline4\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
set_test_target(&gb_repository, &project_repository)?;
@ -1385,7 +1385,7 @@ fn test_apply_unapply_added_deleted_files() -> Result<()> {
std::path::Path::new(&project.path).join(file_path2),
"file2\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
set_test_target(&gb_repository, &project_repository)?;
@ -1471,7 +1471,7 @@ fn test_detect_mergeable_branch() -> Result<()> {
std::path::Path::new(&project.path).join(file_path),
"line1\nline2\nline3\nline4\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
set_test_target(&gb_repository, &project_repository)?;
@ -1532,7 +1532,7 @@ fn test_detect_mergeable_branch() -> Result<()> {
std::path::Path::new(&project.path).join(file_path),
"line1\nline2\nline3\nline4\nupstream\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let up_target = project_repository
.git_repository
.head()
@ -1556,7 +1556,7 @@ fn test_detect_mergeable_branch() -> Result<()> {
std::path::Path::new(&project.path).join(file_path3),
"file3\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let up_target = project_repository
.git_repository
.head()
@ -1682,7 +1682,7 @@ fn test_upstream_integrated_vbranch() -> Result<()> {
std::path::Path::new(&project.path).join("test.txt"),
"file1\nversion2\n",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
let upstream_commit = project_repository
.git_repository
@ -2388,12 +2388,12 @@ fn test_verify_branch_commits_to_integration() -> Result<()> {
// write two commits
let file_path2 = std::path::Path::new("test2.txt");
std::fs::write(std::path::Path::new(&project.path).join(file_path2), "file")?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
std::fs::write(
std::path::Path::new(&project.path).join(file_path2),
"update",
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
// verify puts commits onto the virtual branch
integration::verify_branch(&gb_repository, &project_repository).unwrap();

106
gitbutler-app/src/watcher.rs
View File

@ -53,28 +53,26 @@ impl Watchers {
let project_id = project.id;
let project_path = project.path.clone();
task::Builder::new()
.name(&format!("{} watcher", project_id))
.spawn({
let watchers = Arc::clone(&self.watchers);
let watcher = watcher.clone();
async move {
watchers.lock().await.insert(project_id, watcher.clone());
match watcher.run(&project_path, &project_id).await {
Ok(()) => {
tracing::debug!(%project_id, "watcher stopped");
},
Err(RunError::PathNotFound(path)) => {
tracing::warn!(%project_id, path = %path.display(), "watcher stopped: project path not found");
watchers.lock().await.remove(&project_id);
}
Err(error) => {
tracing::error!(?error, %project_id, "watcher error");
watchers.lock().await.remove(&project_id);
}
task::spawn({
let watchers = Arc::clone(&self.watchers);
let watcher = watcher.clone();
async move {
watchers.lock().await.insert(project_id, watcher.clone());
match watcher.run(&project_path, &project_id).await {
Ok(()) => {
tracing::debug!(%project_id, "watcher stopped");
}
Err(RunError::PathNotFound(path)) => {
tracing::warn!(%project_id, path = %path.display(), "watcher stopped: project path not found");
watchers.lock().await.remove(&project_id);
}
Err(error) => {
tracing::error!(?error, %project_id, "watcher error");
watchers.lock().await.remove(&project_id);
}
}
})?;
}
});
Ok(())
}
@ -196,44 +194,42 @@ impl WatcherInner {
.context("failed to send event")?;
let handle_event = |event: &Event| -> Result<()> {
task::Builder::new()
.name(&format!("handle {}", event))
.spawn_blocking({
let project_id = project_id.to_string();
let handler = self.handler.clone();
let tx = proxy_tx.clone();
let event = event.clone();
move || {
futures::executor::block_on(async move {
match handler.handle(&event, time::SystemTime::now()).await {
Err(error) => tracing::error!(
project_id,
%event,
?error,
"failed to handle event",
),
Ok(events) => {
for e in events {
if let Err(error) = tx.send(e.clone()) {
tracing::error!(
project_id,
%event,
?error,
"failed to post event",
);
} else {
tracing::debug!(
project_id,
%event,
"sent response event",
);
}
task::spawn_blocking({
let project_id = project_id.to_string();
let handler = self.handler.clone();
let tx = proxy_tx.clone();
let event = event.clone();
move || {
futures::executor::block_on(async move {
match handler.handle(&event, time::SystemTime::now()).await {
Err(error) => tracing::error!(
project_id,
%event,
?error,
"failed to handle event",
),
Ok(events) => {
for e in events {
if let Err(error) = tx.send(e.clone()) {
tracing::error!(
project_id,
%event,
?error,
"failed to post event",
);
} else {
tracing::debug!(
project_id,
%event,
"sent response event",
);
}
}
}
});
}
})?;
}
});
}
});
Ok(())
};

27
gitbutler-app/src/watcher/dispatchers.rs
View File

@ -55,24 +55,21 @@ impl Dispatcher {
let (tx, rx) = channel(1);
let project_id = *project_id;
task::Builder::new()
.name(&format!("{} dispatcher", project_id))
.spawn(async move {
loop {
select! {
() = self.cancellation_token.cancelled() => {
break;
}
Some(event) = file_change_rx.recv() => {
if let Err(error) = tx.send(event).await {
tracing::error!(%project_id, ?error,"failed to send file change");
}
task::spawn(async move {
loop {
select! {
() = self.cancellation_token.cancelled() => {
break;
}
Some(event) = file_change_rx.recv() => {
if let Err(error) = tx.send(event).await {
tracing::error!(%project_id, ?error,"failed to send file change");
}
}
}
tracing::debug!(%project_id, "dispatcher stopped");
})
.context("failed to spawn combined dispatcher task")?;
}
tracing::debug!(%project_id, "dispatcher stopped");
});
Ok(rx)
}

115
gitbutler-app/src/watcher/dispatchers/file_change.rs
View File

@ -82,67 +82,70 @@ impl Dispatcher {
tracing::debug!(%project_id, "file watcher started");
let (tx, rx) = channel(1);
task::Builder::new()
.name(&format!("{} file watcher", project_id))
.spawn_blocking({
let path = path.to_path_buf();
let project_id = *project_id;
move || {
for result in notify_rx {
match result {
Err(errors) => {
tracing::error!(?errors, "file watcher error");
}
Ok(events) => {
let file_paths = events.into_iter().filter(|event| is_interesting_kind(event.kind)).flat_map(|event| event.paths.clone()).filter(|file| is_interesting_file(&repo, file));
for file_path in file_paths {
match file_path.strip_prefix(&path) {
Ok(relative_file_path) if relative_file_path.display().to_string().is_empty() => { /* noop */ }
Ok(relative_file_path) => {
let event = if relative_file_path.starts_with(".git") {
tracing::info!(
%project_id,
file_path = %relative_file_path.display(),
"git file change",
);
events::Event::GitFileChange(
project_id,
relative_file_path
.strip_prefix(".git")
.unwrap()
.to_path_buf(),
)
} else {
tracing::info!(
%project_id,
file_path = %relative_file_path.display(),
"project file change",
);
events::Event::ProjectFileChange(
project_id,
relative_file_path.to_path_buf(),
)
};
if let Err(error) = block_on(tx.send(event)) {
tracing::error!(
%project_id,
?error,
"failed to send file change event",
);
}
}
Err(error) => {
tracing::error!(%project_id, ?error, "failed to strip prefix");
task::spawn_blocking({
let path = path.to_path_buf();
let project_id = *project_id;
move || {
for result in notify_rx {
match result {
Err(errors) => {
tracing::error!(?errors, "file watcher error");
}
Ok(events) => {
let file_paths = events
.into_iter()
.filter(|event| is_interesting_kind(event.kind))
.flat_map(|event| event.paths.clone())
.filter(|file| is_interesting_file(&repo, file));
for file_path in file_paths {
match file_path.strip_prefix(&path) {
Ok(relative_file_path)
if relative_file_path.display().to_string().is_empty() =>
{ /* noop */ }
Ok(relative_file_path) => {
let event = if relative_file_path.starts_with(".git") {
tracing::info!(
%project_id,
file_path = %relative_file_path.display(),
"git file change",
);
events::Event::GitFileChange(
project_id,
relative_file_path
.strip_prefix(".git")
.unwrap()
.to_path_buf(),
)
} else {
tracing::info!(
%project_id,
file_path = %relative_file_path.display(),
"project file change",
);
events::Event::ProjectFileChange(
project_id,
relative_file_path.to_path_buf(),
)
};
if let Err(error) = block_on(tx.send(event)) {
tracing::error!(
%project_id,
?error,
"failed to send file change event",
);
}
}
Err(error) => {
tracing::error!(%project_id, ?error, "failed to strip prefix");
}
}
}
}
}
}
}
tracing::debug!(%project_id, "file watcher stopped");
}
}).context(format!("{}: failed to start file watcher thread", project_id))?;
tracing::debug!(%project_id, "file watcher stopped");
}
});
Ok(rx)
}

4
gitbutler-app/src/watcher/handlers/calculate_deltas_handler.rs
View File

@ -201,7 +201,7 @@ mod test {
use crate::{
deltas, sessions,
test_utils::{self, Case, Suite},
tests::{self, Case, Suite},
virtual_branches::{self, branch},
};
@ -613,7 +613,7 @@ mod test {
i.to_string(),
)?;
test_utils::commit_all(&project_repository.git_repository);
tests::commit_all(&project_repository.git_repository);
listener.handle(relative_file_path, &project.id)?;
assert!(gb_repository.flush(&project_repository, None)?.is_some());
}

2
gitbutler-app/src/watcher/handlers/fetch_gitbutler_data.rs
View File

@ -167,7 +167,7 @@ mod test {
use pretty_assertions::assert_eq;
use crate::test_utils::{Case, Suite};
use crate::tests::{Case, Suite};
use super::super::test_remote_repository;
use super::*;

2
gitbutler-app/src/watcher/handlers/git_file_change.rs
View File

@ -132,7 +132,7 @@ mod test {
use pretty_assertions::assert_eq;
use crate::{
test_utils::{Case, Suite},
tests::{Case, Suite},
watcher::handlers,
};

2
gitbutler-app/src/watcher/handlers/push_project_to_gitbutler.rs
View File

@ -292,7 +292,7 @@ mod test {
use std::path::PathBuf;
use crate::project_repository::LogUntil;
use crate::test_utils::{Case, Suite};
use crate::tests::{Case, Suite};
use crate::virtual_branches::set_test_target;
use super::super::test_remote_repository;