mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-09-11 12:25:42 +03:00
move virtual branch files impl our of core
This commit is contained in:
parent
da9f495816
commit
3d0455f12b
@ -21,9 +21,10 @@ use crate::base::{
|
|||||||
use super::r#virtual as branch;
|
use super::r#virtual as branch;
|
||||||
use gitbutler_core::virtual_branches;
|
use gitbutler_core::virtual_branches;
|
||||||
|
|
||||||
|
use crate::files::RemoteBranchFile;
|
||||||
use gitbutler_core::virtual_branches::{
|
use gitbutler_core::virtual_branches::{
|
||||||
branch::{BranchId, BranchOwnershipClaims},
|
branch::{BranchId, BranchOwnershipClaims},
|
||||||
target, RemoteBranchFile, VirtualBranchesHandle,
|
target, VirtualBranchesHandle,
|
||||||
};
|
};
|
||||||
use gitbutler_core::{
|
use gitbutler_core::{
|
||||||
git,
|
git,
|
||||||
@ -127,7 +128,7 @@ impl Controller {
|
|||||||
commit_oid: git2::Oid,
|
commit_oid: git2::Oid,
|
||||||
) -> Result<Vec<RemoteBranchFile>> {
|
) -> Result<Vec<RemoteBranchFile>> {
|
||||||
let project_repository = Repository::open(project)?;
|
let project_repository = Repository::open(project)?;
|
||||||
virtual_branches::list_remote_commit_files(project_repository.repo(), commit_oid)
|
crate::files::list_remote_commit_files(project_repository.repo(), commit_oid)
|
||||||
.map_err(Into::into)
|
.map_err(Into::into)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ use std::path;
|
|||||||
use anyhow::{anyhow, Context, Result};
|
use anyhow::{anyhow, Context, Result};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
|
||||||
use crate::git::diff;
|
use gitbutler_core::git::diff;
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Clone, Serialize)]
|
#[derive(Debug, PartialEq, Clone, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
@ -10,3 +10,5 @@ pub mod assets;
|
|||||||
pub mod base;
|
pub mod base;
|
||||||
|
|
||||||
pub mod integration;
|
pub mod integration;
|
||||||
|
|
||||||
|
pub mod files;
|
||||||
|
@ -2,9 +2,6 @@ pub mod branch;
|
|||||||
pub use branch::{Branch, BranchId};
|
pub use branch::{Branch, BranchId};
|
||||||
pub mod target;
|
pub mod target;
|
||||||
|
|
||||||
mod files;
|
|
||||||
pub use files::*;
|
|
||||||
|
|
||||||
mod remote;
|
mod remote;
|
||||||
pub use remote::*;
|
pub use remote::*;
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ pub mod commands {
|
|||||||
use crate::error::Error;
|
use crate::error::Error;
|
||||||
use anyhow::{anyhow, Context};
|
use anyhow::{anyhow, Context};
|
||||||
use gitbutler_branch::base::BaseBranch;
|
use gitbutler_branch::base::BaseBranch;
|
||||||
|
use gitbutler_branch::files::RemoteBranchFile;
|
||||||
use gitbutler_branch::{Controller, NameConflitResolution, VirtualBranches};
|
use gitbutler_branch::{Controller, NameConflitResolution, VirtualBranches};
|
||||||
use gitbutler_core::{
|
use gitbutler_core::{
|
||||||
assets,
|
assets,
|
||||||
@ -11,7 +12,7 @@ pub mod commands {
|
|||||||
types::ReferenceName,
|
types::ReferenceName,
|
||||||
virtual_branches::{
|
virtual_branches::{
|
||||||
branch::{self, BranchId, BranchOwnershipClaims},
|
branch::{self, BranchId, BranchOwnershipClaims},
|
||||||
RemoteBranch, RemoteBranchData, RemoteBranchFile,
|
RemoteBranch, RemoteBranchData,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use tauri::{AppHandle, Manager};
|
use tauri::{AppHandle, Manager};
|
||||||
|
Loading…
Reference in New Issue
Block a user