git-tools 0.1.4

mod common;

use common::Git;

use globset::{Glob, GlobSetBuilder};
use std::collections::HashSet;
use std::io::Write;
use std::os::unix::process::CommandExt;
use std::process::Command;
use structopt::{clap::AppSettings, StructOpt};

#[derive(StructOpt, Debug)]
#[structopt(
    bin_name = "git try-merge",
    about = env!("CARGO_PKG_DESCRIPTION"),
    settings = &[AppSettings::TrailingVarArg, AppSettings::AllowLeadingHyphen],
)]
pub struct TryMerge {
    /// Squash all the merge commits together at the end.
    ///
    /// You can make this behavior the default using the following command:
    ///
    /// git config --global try-merge.squash true
    ///
    /// Or for this repository only:
    ///
    /// git config try-merge.squash true
    #[structopt(long)]
    squash: bool,

    // NOTE: the long and short name for the parameters must not conflict with `git merge`
    /// Do not run `git merge` at the end. (Merge to the latest commit possible without conflict.)
    #[structopt(long, short = "u")]
    no_merge: bool,

    /// Revision for the update (default branch or origin/main by default).
    revision: Option<String>,

    merge_args: Vec<String>,
}

fn main() {
    let exit_status = execute();
    std::io::stdout().flush().unwrap();
    std::process::exit(exit_status);
}

const SUCCESS: i32 = 0;
const FAILURE: i32 = 1;

fn execute() -> i32 {
    let opts = TryMerge::from_args();

    if let Err(err) = run(opts) {
        eprintln!("{}", err);

        FAILURE
    } else {
        SUCCESS
    }
}

pub fn run(params: TryMerge) -> Result<(), Box<dyn std::error::Error>> {
    let git = Git::open()?;

    update_branch(git, params)
}

fn update_branch(mut git: Git, params: TryMerge) -> Result<(), Box<dyn std::error::Error>> {
    let default_branch = git.get_default_branch("origin")?;
    let top_rev = params.revision.clone().unwrap_or_else(|| default_branch);

    if top_rev.contains('/') {
        git.update_upstream(top_rev.as_str())?;
    }

    if git.has_file_changes()? {
        return Err("The repository has not committed changes, aborting.".into());
    }

    let mut rev_list = git.rev_list("HEAD", top_rev.as_str(), true)?;

    if rev_list.is_empty() {
        let default_squash = git.config.get_bool("try-merge.squash").ok();
        if params.squash || default_squash.unwrap_or_default() {
            let commit = squash_all_merge_commits(&mut git, &top_rev)?;
            if commit.is_some() {
                println!("Your merge commits have been squashed.");
                return Ok(());
            }
        }
        println!("Your branch is already up-to-date.");
        return Ok(());
    }

    let ignore_conflict_set = {
        let mut builder = GlobSetBuilder::new();
        let mut entries = git.config.multivar("try-merge.ignore-conflict", None)?;
        while let Some(entry) = entries.next().transpose()? {
            builder.add(Glob::new(entry.value().expect("invalid UTF-8"))?);
        }
        builder.build()?
    };

    let mut skipped = 0;
    let mut last_failing_revision: Option<String> = None;
    let mut all_ignored_conflicts = HashSet::new();
    while let Some(revision) = rev_list.pop() {
        let message = format!("Merge commit {} (no conflict)\n\n", revision,);

        if let Some((_, ignored_conflicts)) =
            git.merge_no_conflict(revision.as_str(), message.as_str(), &ignore_conflict_set)?
        {
            println!(
                "All the commits to {} have been merged successfully without conflict",
                revision
            );
            all_ignored_conflicts.extend(ignored_conflicts);

            break;
        } else {
            skipped += 1;
            last_failing_revision = Some(revision.clone());
        }
    }

    if !all_ignored_conflicts.is_empty() {
        println!("The following files had conflicts but have been ignored:");
        for file_path in all_ignored_conflicts {
            println!("{}", file_path);
        }
    }

    if params.no_merge {
        return Ok(());
    } else if let Some(revision) = last_failing_revision {
        println!(
            "Your current branch is still behind '{}' by {} commit(s).",
            top_rev, skipped
        );
        println!("First merge conflict detected on: {}", revision);

        let message = format!("Merge commit {} (conflicts)\n\n", revision,);

        return Err(Command::new("git")
            .args(&[
                "merge",
                "--no-ff",
                revision.as_str(),
                "-m",
                message.as_str(),
            ])
            .args(params.merge_args)
            .exec()
            .into());
    } else {
        println!("Nothing more to merge. Your branch is up-to-date.");
    }

    Ok(())
}

fn squash_all_merge_commits(
    git: &mut Git,
    top_rev: &str,
) -> Result<Option<String>, Box<dyn std::error::Error>> {
    let merge_commits = git.ancestors("HEAD")?.take_while(|commit| {
        commit
            .message()
            .map(|msg| msg.starts_with("Merge commit"))
            .unwrap_or_default()
    });
    if let Some(ancestor) = merge_commits
        // NOTE: we need to have more than 1 commit to make a squash
        .skip(1)
        .last()
        .map(|x| format!("{}", x.parent(0).unwrap().id()))
    {
        Ok(Some(git.squash(
            &ancestor,
            top_rev,
            &format!("Merge branch {}", top_rev),
        )?))
    } else {
        Ok(None)
    }
}