Skip to content

Port branch/apply.rs to non-legacy functions #11182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Port branch/apply.rs to non-legacy functions #11182

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c86128d
Initial plan
Copilot Nov 12, 2025
c340eae
Port apply.rs to non-legacy functions, remove gitbutler_ imports
Copilot Nov 12, 2025
ac7e357
Apply rustfmt to apply.rs
Copilot Nov 12, 2025
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
18 changes: 9 additions & 9 deletions crates/but/src/branch/apply.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
use std::{ops::Deref, str::FromStr};

use bstr::ByteSlice;
use but_settings::AppSettings;
use gitbutler_command_context::CommandContext;
use gitbutler_project::Project;
use gitbutler_reference::RemoteRefname;

/// Apply a branch to the workspace
///
/// Look first in through the local references, then the remote references.
pub fn apply(project: &Project, branch_name: &str, json: bool) -> anyhow::Result<()> {
let ctx = CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
let repo = ctx.gix_repo()?;
pub fn apply(
project: &gitbutler_project::Project,
branch_name: &str,
json: bool,
) -> anyhow::Result<()> {
let repo = project.open()?;

if let Some(reference) = repo.try_find_reference(branch_name)? {
if let Some(reference) = (&repo).try_find_reference(branch_name)? {
// Look for the branch in the local repository
let ref_name = gitbutler_reference::Refname::from_str(&reference.name().to_string())?;
let remote_ref_name = reference
Expand Down Expand Up @@ -60,7 +59,8 @@ fn find_remote_reference(
branch_name: &str,
) -> anyhow::Result<Option<gitbutler_reference::RemoteRefname>> {
for remote in repo.remote_names().iter().map(|r| r.deref()) {
let remote_ref_name = RemoteRefname::new(remote.to_str()?, branch_name);
let remote_ref_name =
gitbutler_reference::RemoteRefname::new(remote.to_str()?, branch_name);
if repo
.try_find_reference(&remote_ref_name.fullname())?
.is_some()
Expand Down