Added initial version

nigel.stanger / zsh-rust-git-prompt

Browse code Added initial version master
0 parent commit f563d54d274adb2b53a966b907fff1f9c64af78d Nigel Stanger authored on 13 Oct 2022

Patch

Showing 4 changed files

Ignore Space Show notes View .gitignore 0 → 100644
/target

Ignore Space Show notes View Cargo.lock 0 → 100644
# This file is automatically @generated by Cargo. # It is not intended for manual editing. version = 3 [[package]] name = "aho-corasick" version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" dependencies = [ "memchr", ] [[package]] name = "anes" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "regex" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "rustest" version = "0.1.0" dependencies = [ "anes", "regex", "substring", ] [[package]] name = "substring" version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" dependencies = [ "autocfg", ]

Ignore Space Show notes View

Cargo.lock 0 → 100644

# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3

[[package]]
name = "aho-corasick"
version = "0.7.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
dependencies = [
 "memchr",
]

[[package]]
name = "anes"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"

[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

[[package]]
name = "regex"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
dependencies = [
 "aho-corasick",
 "memchr",
 "regex-syntax",
]

[[package]]
name = "regex-syntax"
version = "0.6.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"

[[package]]
name = "rustest"
version = "0.1.0"
dependencies = [
 "anes",
 "regex",
 "substring",
]

[[package]]
name = "substring"
version = "1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86"
dependencies = [
 "autocfg",
]

Ignore Space Show notes View Cargo.toml 0 → 100644
[package] name = "rustest" version = "0.1.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] regex = "1" substring = "1.4.5" anes = "0.1.6"

Ignore Space Show notes View src/main.rs 0 → 100644
use anes::{Attribute, Color, ResetAttributes, SetAttribute, SetForegroundColor}; use std::io; use std::process::ExitCode; use regex::Regex; use std::num::NonZeroUsize; use substring::Substring; const BRANCH_PREFIX: &str = "\u{e725} "; const BRANCH_SUFFIX: &str = " "; const AHEAD_PREFIX: &str = "\u{f55c}"; const BEHIND_PREFIX: &str = "\u{f544}"; const STATUS_SEPARATOR: &str = " \| "; const STASHED_PREFIX: &str = "⚑"; const STAGED_PREFIX: &str = "\u{ea71}"; const CHANGED_PREFIX: &str = "+"; const CONFLICTED_PREFIX: &str = "\u{f655}"; const UNTRACKED_PREFIX: &str = "\u{f142}"; const IGNORED_PREFIX: &str = "!"; const CLEAN_INDICATOR: &str = "\u{f00c}"; fn reset_style() -> String { return format!("%{{{}%}}", ResetAttributes); } fn branch_style() -> String { return format!("%{{{}{}{}%}}", SetForegroundColor(Color::Black), SetAttribute(Attribute::Bold), SetAttribute(Attribute::Underline)); } fn stashed_style() -> String { return format!("%{{{}%}}", SetForegroundColor(Color::Blue)); } fn staged_style() -> String { return format!("%{{{}%}}", SetForegroundColor(Color::Blue)); } fn changed_style() -> String { return format!("%{{{}%}}", SetForegroundColor(Color::DarkMagenta)); } fn conflicted_style() -> String { return format!("%{{{}%}}", SetForegroundColor(Color::DarkRed)); } fn untracked_style() -> String { return format!("%{{{}%}}", SetForegroundColor(Color::DarkGreen)); } fn ignored_style() -> String { return format!("%{{{}%}}", SetForegroundColor(Color::Gray)); } fn clean_style() -> String { return format!("%{{{}%}}", SetForegroundColor(Color::DarkGreen)); } fn main() -> ExitCode { let mut git_status = String::new(); io::stdin().read_line(&mut git_status).expect("Failed to read input"); if git_status.len() == 0 { print!(""); return ExitCode::SUCCESS; } // Current commit. // example: # branch.oid 825882679bbf52650f8115bfec8591d973d80b49 let hash = match Regex::new(r"# branch\.oid ([^\x00]+)").unwrap().captures(&git_status) { Some(caps) => caps.get(1).unwrap().as_str(), None => "???", }; // Current branch. // example: # branch.head master // example: # branch.head (detached) let branch = match Regex::new(r"# branch\.head ([^\x00]+)").unwrap().captures(&git_status) { Some(caps) => { let name = caps.get(1).unwrap().as_str(); if name == "(detached)" { // use the (shortened) commit hash format!("{BRANCH_PREFIX}:{}{}{}{BRANCH_SUFFIX}", branch_style(), hash.substring(0, 7), reset_style()) } else { format!("{BRANCH_PREFIX}{}{}{}{BRANCH_SUFFIX}", branch_style(), name, reset_style()) } }, None => "???".to_string(), }; // Commits ahead/behind of upstream branch. // example: # branch.ab +2 -5 let (ahead, behind) = match Regex::new(r"# branch\.ab \+(\d+) -(\d+)").unwrap().captures(&git_status) { Some(caps) => ( format!("{AHEAD_PREFIX}{}", caps.get(1).unwrap().as_str()), format!("{BEHIND_PREFIX}{}", caps.get(2).unwrap().as_str()) ), None => ( format!("{AHEAD_PREFIX}0"), format!("{BEHIND_PREFIX}0") ), }; // Number of stashed files. // example: # stash 4 let stashed = match Regex::new(r"# stash (\d+)").unwrap().captures(&git_status) { Some(caps) => format!("{}{STASHED_PREFIX}{}{} ", stashed_style(), caps.get(1).unwrap().as_str(), reset_style()), None => "".to_string(), }; // Number of staged files. // example: 1 A. N... 000000 100644 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file.staged let staged = match NonZeroUsize::new(Regex::new(r"1 A. ([^\x00]+)").unwrap().find_iter(&git_status).count()) { Some(n) => format!("{}{STAGED_PREFIX}{n}{} ", staged_style(), reset_style()), None => "".to_string(), }; // Number of changed files. // example: 1 .M N... 000000 100644 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file.changed let changed = match NonZeroUsize::new(Regex::new(r"1 .M ([^\x00]+)").unwrap().find_iter(&git_status).count()) { Some(n) => format!("{}{CHANGED_PREFIX}{n}{} ", changed_style(), reset_style()), None => "".to_string(), }; // Number of conflicted files. // example: u UD N... 000000 100644 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file.conflicted let conflicted = match NonZeroUsize::new(Regex::new(r"u .. ([^\x00]+)").unwrap().find_iter(&git_status).count()) { Some(n) => format!("{}{CONFLICTED_PREFIX}{n}{} ", conflicted_style(), reset_style()), None => "".to_string(), }; // Number of untracked files. // example: ? file.untracked let untracked = match NonZeroUsize::new(Regex::new(r"\? ([^\x00]+)").unwrap().find_iter(&git_status).count()) { Some(n) => format!("{}{UNTRACKED_PREFIX}{n}{} ", untracked_style(), reset_style()), None => "".to_string(), }; // Number of ignored files. // example: ! file.ignored let ignored = match NonZeroUsize::new(Regex::new(r"! ([^\x00]+)").unwrap().find_iter(&git_status).count()) { Some(n) => format!("{}{IGNORED_PREFIX}{n}{} ", ignored_style(), reset_style()), None => "".to_string(), }; let status_string = format!("{stashed}{ignored}{staged}{changed}{conflicted}{untracked}"); print!("{branch}{ahead}{behind}{STATUS_SEPARATOR}{}", if status_string.len() > 0 { status_string.trim().to_string() } else { format!("{}{CLEAN_INDICATOR}{}", clean_style(), reset_style()) } ); ExitCode::SUCCESS }

Ignore Space Show notes View

src/main.rs 0 → 100644

use anes::{Attribute, Color, ResetAttributes, SetAttribute, SetForegroundColor};
use std::io;
use std::process::ExitCode;
use regex::Regex;
use std::num::NonZeroUsize;
use substring::Substring;

const BRANCH_PREFIX: &str = "\u{e725} ";
const BRANCH_SUFFIX: &str = " ";

const AHEAD_PREFIX: &str = "\u{f55c}";
const BEHIND_PREFIX: &str = "\u{f544}";

const STATUS_SEPARATOR: &str = " | ";

const STASHED_PREFIX: &str = "⚑";
const STAGED_PREFIX: &str = "\u{ea71}";
const CHANGED_PREFIX: &str = "+";
const CONFLICTED_PREFIX: &str = "\u{f655}";
const UNTRACKED_PREFIX: &str = "\u{f142}";
const IGNORED_PREFIX: &str = "!";

const CLEAN_INDICATOR: &str = "\u{f00c}";

fn reset_style() -> String {
    return format!("%{{{}%}}", ResetAttributes);
}

fn branch_style() -> String {
    return format!("%{{{}{}{}%}}", SetForegroundColor(Color::Black), SetAttribute(Attribute::Bold), SetAttribute(Attribute::Underline));
}

fn stashed_style() -> String {
    return format!("%{{{}%}}", SetForegroundColor(Color::Blue));
}

fn staged_style() -> String {
    return format!("%{{{}%}}", SetForegroundColor(Color::Blue));
}

fn changed_style() -> String {
    return format!("%{{{}%}}", SetForegroundColor(Color::DarkMagenta));
}

fn conflicted_style() -> String {
    return format!("%{{{}%}}", SetForegroundColor(Color::DarkRed));
}

fn untracked_style() -> String {
    return format!("%{{{}%}}", SetForegroundColor(Color::DarkGreen));
}

fn ignored_style() -> String {
    return format!("%{{{}%}}", SetForegroundColor(Color::Gray));
}

fn clean_style() -> String {
    return format!("%{{{}%}}", SetForegroundColor(Color::DarkGreen));
}

fn main() -> ExitCode {
    let mut git_status = String::new();

io::stdin().read_line(&mut git_status).expect("Failed to read input");

if git_status.len() == 0 {
        print!("");
        return ExitCode::SUCCESS;
    }

// Current commit.
    // example: # branch.oid 825882679bbf52650f8115bfec8591d973d80b49
    let hash = match Regex::new(r"# branch\.oid ([^\x00]+)").unwrap().captures(&git_status) {
        Some(caps) => caps.get(1).unwrap().as_str(),
        None => "???",
    };

// Current branch.
    // example: # branch.head master
    // example: # branch.head (detached)
    let branch = match Regex::new(r"# branch\.head ([^\x00]+)").unwrap().captures(&git_status) {
        Some(caps) => {
            let name = caps.get(1).unwrap().as_str();
            if name == "(detached)" {
                // use the (shortened) commit hash
                format!("{BRANCH_PREFIX}:{}{}{}{BRANCH_SUFFIX}", branch_style(), hash.substring(0, 7), reset_style())
            } else {
                format!("{BRANCH_PREFIX}{}{}{}{BRANCH_SUFFIX}", branch_style(), name, reset_style())
            }
        },
        None => "???".to_string(),
    };

// Commits ahead/behind of upstream branch.
    // example: # branch.ab +2 -5
    let (ahead, behind) = match Regex::new(r"# branch\.ab \+(\d+) -(\d+)").unwrap().captures(&git_status) {
        Some(caps) => (
            format!("{AHEAD_PREFIX}{}", caps.get(1).unwrap().as_str()),
            format!("{BEHIND_PREFIX}{}", caps.get(2).unwrap().as_str())
        ),
        None => (
            format!("{AHEAD_PREFIX}0"),
            format!("{BEHIND_PREFIX}0")
        ),
    };
    
    // Number of stashed files.
    // example: # stash 4
    let stashed = match Regex::new(r"# stash (\d+)").unwrap().captures(&git_status) {
        Some(caps) => format!("{}{STASHED_PREFIX}{}{} ", stashed_style(), caps.get(1).unwrap().as_str(), reset_style()),
        None => "".to_string(),
    };

// Number of staged files.
    // example: 1 A. N... 000000 100644 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file.staged
    let staged = match NonZeroUsize::new(Regex::new(r"1 A. ([^\x00]+)").unwrap().find_iter(&git_status).count()) {
        Some(n) => format!("{}{STAGED_PREFIX}{n}{} ", staged_style(), reset_style()),
        None => "".to_string(),
    };

// Number of changed files.
    // example: 1 .M N... 000000 100644 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file.changed
    let changed = match NonZeroUsize::new(Regex::new(r"1 .M ([^\x00]+)").unwrap().find_iter(&git_status).count()) {
        Some(n) => format!("{}{CHANGED_PREFIX}{n}{} ", changed_style(), reset_style()),
        None => "".to_string(),
    };

// Number of conflicted files.
    // example: u UD N... 000000 100644 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file.conflicted
    let conflicted = match NonZeroUsize::new(Regex::new(r"u .. ([^\x00]+)").unwrap().find_iter(&git_status).count()) {
        Some(n) => format!("{}{CONFLICTED_PREFIX}{n}{} ", conflicted_style(), reset_style()),
        None => "".to_string(),
    };
    
    // Number of untracked files.
    // example: ? file.untracked
    let untracked = match NonZeroUsize::new(Regex::new(r"\? ([^\x00]+)").unwrap().find_iter(&git_status).count()) {
        Some(n) => format!("{}{UNTRACKED_PREFIX}{n}{} ", untracked_style(), reset_style()),
        None => "".to_string(),
    };

// Number of ignored files.
    // example: ! file.ignored
    let ignored = match NonZeroUsize::new(Regex::new(r"! ([^\x00]+)").unwrap().find_iter(&git_status).count()) {
        Some(n) => format!("{}{IGNORED_PREFIX}{n}{} ", ignored_style(), reset_style()),
        None => "".to_string(),
    };

let status_string = format!("{stashed}{ignored}{staged}{changed}{conflicted}{untracked}");

print!("{branch}{ahead}{behind}{STATUS_SEPARATOR}{}", 
        if status_string.len() > 0 {
            status_string.trim().to_string()
        } else {
            format!("{}{CLEAN_INDICATOR}{}", clean_style(), reset_style())
        }
    );

ExitCode::SUCCESS
}

Show line notes below