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 GITBUTLER_INTEGRATION_REFERENCE constant outside of integration rs

Browse Source 
This allows integration implementation to be extracted out of core
This commit is contained in:
Kiril Videlov 2024-07-07 16:34:20 +02:00
parent 9eaab28a48
commit 0865521f90
No known key found for this signature in database
GPG Key ID: A4C733025427C471
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/gitbutler-branch/src/base.rs
View File

@ -5,11 +5,11 @@ use git2::Index;
use serde::Serialize; use serde::Serialize;
use gitbutler_core::virtual_branches::integration::{ use gitbutler_core::virtual_branches::integration::{
get_workspace_head, update_gitbutler_integration, GITBUTLER_INTEGRATION_REFERENCE, get_workspace_head, update_gitbutler_integration,
}; };
use gitbutler_core::virtual_branches::{ use gitbutler_core::virtual_branches::{
branch, convert_to_real_branch, target, BranchId, RemoteCommit, VirtualBranchHunk, branch, convert_to_real_branch, target, BranchId, RemoteCommit, VirtualBranchHunk,
VirtualBranchesHandle, VirtualBranchesHandle, GITBUTLER_INTEGRATION_REFERENCE,
}; };
use gitbutler_core::{error::Marker, git::RepositoryExt, rebase::cherry_rebase}; use gitbutler_core::{error::Marker, git::RepositoryExt, rebase::cherry_rebase};
use gitbutler_core::{ use gitbutler_core::{

10
crates/gitbutler-core/src/virtual_branches/integration.rs
View File

@ -2,22 +2,16 @@ use std::{path::PathBuf, vec};
use anyhow::{anyhow, bail, Context, Result}; use anyhow::{anyhow, bail, Context, Result};
use bstr::ByteSlice; use bstr::ByteSlice;
use lazy_static::lazy_static;
use super::VirtualBranchesHandle; use super::{VirtualBranchesHandle, GITBUTLER_INTEGRATION_REFERENCE};
use crate::error::Marker; use crate::error::Marker;
use crate::git::RepositoryExt; use crate::git::RepositoryExt;
use crate::{ use crate::{
git::{self, CommitExt}, git::CommitExt,
project_repository::{self, conflicts, LogUntil}, project_repository::{self, conflicts, LogUntil},
virtual_branches::branch::BranchCreateRequest, virtual_branches::branch::BranchCreateRequest,
}; };
lazy_static! {
pub static ref GITBUTLER_INTEGRATION_REFERENCE: git::LocalRefname =
git::LocalRefname::new("gitbutler/integration", None);
}
const WORKSPACE_HEAD: &str = "Workspace Head"; const WORKSPACE_HEAD: &str = "Workspace Head";
pub const GITBUTLER_INTEGRATION_COMMIT_AUTHOR_NAME: &str = "GitButler"; pub const GITBUTLER_INTEGRATION_COMMIT_AUTHOR_NAME: &str = "GitButler";
pub const GITBUTLER_INTEGRATION_COMMIT_AUTHOR_EMAIL: &str = "gitbutler@gitbutler.com"; pub const GITBUTLER_INTEGRATION_COMMIT_AUTHOR_EMAIL: &str = "gitbutler@gitbutler.com";

7
crates/gitbutler-core/src/virtual_branches/mod.rs
View File

@ -6,7 +6,6 @@ mod files;
pub use files::*; pub use files::*;
pub mod integration; pub mod integration;
pub use integration::GITBUTLER_INTEGRATION_REFERENCE;
mod r#virtual; mod r#virtual;
pub use r#virtual::*; pub use r#virtual::*;
@ -20,3 +19,9 @@ pub use state::VirtualBranchesHandle;
mod author; mod author;
pub use author::Author; pub use author::Author;
use lazy_static::lazy_static;
lazy_static! {
pub static ref GITBUTLER_INTEGRATION_REFERENCE: crate::git::LocalRefname =
crate::git::LocalRefname::new("gitbutler/integration", None);
}