git_wok/cmd/

push.rs

use anyhow::*;
use std::io::Write;
use std::result::Result::Ok;

use crate::{config, repo};

#[allow(clippy::too_many_arguments)]
pub fn push<W: Write>(
    wok_config: &mut config::Config,
    umbrella: &repo::Repo,
    stdout: &mut W,
    set_upstream: bool,
    all: bool,
    branch_name: Option<&str>,
    include_umbrella: bool,
    target_repos: &[std::path::PathBuf],
) -> Result<()> {
    // Determine the target branch
    let target_branch = match branch_name {
        Some(name) => name.to_string(),
        None => umbrella.head.clone(),
    };

    // Determine which repos to push
    let repos_to_push: Vec<config::Repo> = if all {
        // Push all configured repos, skipping those opted out unless explicitly targeted
        wok_config
            .repos
            .iter()
            .filter(|config_repo| {
                !config_repo.is_skipped_for("push")
                    || target_repos.contains(&config_repo.path)
            })
            .cloned()
            .collect()
    } else if !target_repos.is_empty() {
        // Push only specified repos
        wok_config
            .repos
            .iter()
            .filter(|config_repo| target_repos.contains(&config_repo.path))
            .cloned()
            .collect()
    } else {
        // Push repos that match the current main repo branch
        wok_config
            .repos
            .iter()
            .filter(|config_repo| config_repo.head == umbrella.head)
            .cloned()
            .collect()
    };

    let total_targets = repos_to_push.len() + usize::from(include_umbrella);

    if total_targets == 0 {
        writeln!(stdout, "No repositories to push")?;
        return Ok(());
    }

    writeln!(
        stdout,
        "Pushing {} repositories to branch '{}'...",
        total_targets, target_branch
    )?;

    // Push submodules first, then umbrella repo
    // This ensures submodule commits exist remotely before the umbrella repo references them
    for config_repo in &repos_to_push {
        if let Some(subrepo) = umbrella.get_subrepo_by_path(&config_repo.path) {
            match push_repo(subrepo, &target_branch, set_upstream) {
                Ok(result) => match result {
                    PushResult::Pushed => {
                        writeln!(
                            stdout,
                            "- '{}': pushed to '{}'",
                            config_repo.path.display(),
                            target_branch
                        )?;
                    },
                    PushResult::UpstreamSet => {
                        writeln!(
                            stdout,
                            "- '{}': pushed to '{}' and set upstream",
                            config_repo.path.display(),
                            target_branch
                        )?;
                    },
                    PushResult::UpToDate => {
                        writeln!(
                            stdout,
                            "- '{}': already up to date",
                            config_repo.path.display()
                        )?;
                    },
                    PushResult::NoRemote => {
                        writeln!(
                            stdout,
                            "- '{}': no remote configured, skipping",
                            config_repo.path.display()
                        )?;
                    },
                },
                Err(e) => {
                    writeln!(
                        stdout,
                        "- '{}': failed to push to '{}' - {}",
                        config_repo.path.display(),
                        target_branch,
                        e
                    )?;
                },
            }
        }
    }

    // Push umbrella repo last, after all submodules
    if include_umbrella {
        match push_repo(umbrella, &target_branch, set_upstream) {
            Ok(result) => match result {
                PushResult::Pushed => {
                    writeln!(stdout, "- 'umbrella': pushed to '{}'", target_branch)?;
                },
                PushResult::UpstreamSet => {
                    writeln!(
                        stdout,
                        "- 'umbrella': pushed to '{}' and set upstream",
                        target_branch
                    )?;
                },
                PushResult::UpToDate => {
                    writeln!(stdout, "- 'umbrella': already up to date")?;
                },
                PushResult::NoRemote => {
                    writeln!(stdout, "- 'umbrella': no remote configured, skipping")?;
                },
            },
            Err(e) => {
                writeln!(
                    stdout,
                    "- 'umbrella': failed to push to '{}' - {}",
                    target_branch, e
                )?;
            },
        }
    }

    writeln!(
        stdout,
        "Successfully processed {} repositories",
        total_targets
    )?;
    Ok(())
}

#[derive(Debug, Clone, PartialEq)]
enum PushResult {
    Pushed,
    UpstreamSet,
    UpToDate,
    NoRemote,
}

/// Check if the local branch has new commits compared to the remote branch.
/// Returns Ok(true) if push is needed, Ok(false) if already up-to-date, Err on failure.
fn needs_push(
    repo: &repo::Repo,
    remote: &mut git2::Remote,
    branch_name: &str,
) -> Result<bool> {
    // Get local branch OID
    let local_branch_ref = format!("refs/heads/{}", branch_name);
    let local_oid = repo.git_repo.refname_to_id(&local_branch_ref)?;

    // Connect to remote to check remote branch state
    let connection = remote.connect_auth(
        git2::Direction::Push,
        Some(repo.remote_callbacks()?),
        None,
    )?;

    // Check if remote branch exists and get its OID
    let remote_branch_ref = format!("refs/heads/{}", branch_name);
    let mut remote_oid: Option<git2::Oid> = None;

    for head in connection.list()?.iter() {
        if head.name() == remote_branch_ref {
            remote_oid = Some(head.oid());
            break;
        }
    }

    drop(connection);

    // If remote branch doesn't exist, we need to push
    let remote_oid = match remote_oid {
        Some(oid) => oid,
        None => return Ok(true), // New branch, push needed
    };

    // If OIDs match, no push needed
    if local_oid == remote_oid {
        return Ok(false);
    }

    // Check if local is ahead of remote (can fast-forward)
    // If remote is ahead or diverged, we still return true because
    // git push will fail with proper error message
    Ok(true)
}

fn push_repo(
    repo: &repo::Repo,
    branch_name: &str,
    set_upstream: bool,
) -> Result<PushResult> {
    // Get the remote name for this branch
    let remote_name = repo.get_remote_name_for_branch(branch_name)?;

    // Check if remote exists
    let mut remote = match repo.git_repo.find_remote(&remote_name) {
        Ok(remote) => remote,
        Err(_) => {
            return Ok(PushResult::NoRemote);
        },
    };

    // Get the current branch reference
    let branch_ref = format!("refs/heads/{}", branch_name);

    // Check if the branch exists locally
    if repo.git_repo.refname_to_id(&branch_ref).is_err() {
        return Err(anyhow!("Branch '{}' does not exist locally", branch_name));
    }

    // Check if push is actually needed
    match needs_push(repo, &mut remote, branch_name) {
        Ok(false) => {
            // Already up to date, skip the push entirely
            return Ok(PushResult::UpToDate);
        },
        Ok(true) => {
            // Push is needed, continue
        },
        Err(e) => {
            // If we can't check remote state (e.g., network issue),
            // proceed with push attempt and let git2 handle it
            // This maintains backwards compatibility
            eprintln!("Warning: Could not check remote state: {}", e);
        },
    }

    // Prepare the refspec for pushing
    let refspec = format!("{}:refs/heads/{}", branch_ref, branch_name);

    // Perform the push
    let mut push_options = git2::PushOptions::new();
    push_options.remote_callbacks(repo.remote_callbacks()?);

    match remote.push(&[&refspec], Some(&mut push_options)) {
        Ok(_) => {
            if set_upstream {
                // Set the upstream branch
                set_upstream_branch(repo, branch_name, &remote_name)?;
                Ok(PushResult::UpstreamSet)
            } else {
                Ok(PushResult::Pushed)
            }
        },
        Err(e) => {
            // Check if it's an "up to date" error
            if e.message().contains("up to date")
                || e.message().contains("non-fast-forward")
            {
                Ok(PushResult::UpToDate)
            } else {
                Err(e.into())
            }
        },
    }
}

fn set_upstream_branch(
    repo: &repo::Repo,
    branch_name: &str,
    remote_name: &str,
) -> Result<()> {
    // Update the branch configuration to set upstream
    let mut config = repo.git_repo.config()?;
    config.set_str(&format!("branch.{}.remote", branch_name), remote_name)?;
    config.set_str(
        &format!("branch.{}.merge", branch_name),
        &format!("refs/heads/{}", branch_name),
    )?;

    Ok(())
}