Skip to content

Latest commit

 

History

History
289 lines (192 loc) · 7.23 KB

File metadata and controls

289 lines (192 loc) · 7.23 KB

pretty-git-prompt

Build Status

Your current git repository information inside a beautiful shell prompt.

Preview of pretty-git-prompt

Features:

  • You are able to display values such as:
    • git repository state (resolving merge conflict, interactive rebase, ...)
    • Current branch name.
    • Name of a tag which points at the checked out commit.
    • Count of changed, newly-added, staged, conflicting files.
    • Number of items in stash.
  • You can track divergence against arbitrary branches.
  • Every value in output can be fully configured via a config file.
  • Sample configuration files feature colors.
  • The tool supports zsh and bash.
  • pretty-git-prompt is written in Rust programming language and is delivered as a single, statically-linked binary.

Development status

The tool is ready to use.

How can I try this out?

Very easily! You don't need to install pretty-git-prompt if you just want to see it in action. There is a make target which launches docker container with whole environment set up.

It just takes some time to prepare the environment (create build environment, compile the tool, run the demo).

Just clone this git repository

$ git clone https://github.com/TomasTomecek/pretty-git-prompt

and run...

zsh

$ make zsh-demo

And this is what you should see:

Preview using zsh.

This is an interactive shell, so you can play with it.

bash

In case you want to see the tool in bash shell:

$ make bash-demo

Preview using bash.

This demo is one of the ways I verify that the tool works correctly.

Installation

If you want to add pretty-git-prompt inside your shell, this section contains information how to do that.

Obtaining pretty-git-prompt binary

GitHub release

Get the binary via latest GitHub release.

For a linux distrubution:

$ curl -O https://github.com/TomasTomecek/pretty-git-prompt/releases/download/0.3.0/pretty-git-prompt-0.3.0-x86_64-unknown-linux-gnu

Or for MacOS:

$ curl -O https://github.com/TomasTomecek/pretty-git-prompt/releases/download/0.3.0/pretty-git-prompt-0.3.0-x86_64-apple-darwin

Compile it yourself

$ make build

As stated inside demo section above, this takes some time.

If you have rust compiler and cargo available on your system, you can compile the tool without using a container:

$ make exec-release-build

The binary is then available on this path:

$ ls -lha target/release/pretty-git-prompt
-rwxr-xr-x 2 user group 1.7M May  9 21:37 target/release/pretty-git-prompt

shell configuration

Before digging into .bashrc and .zshrc, please make sure that binary pretty-git-prompt is placed on your $PATH:

$ pretty-git-prompt
master|✚1Δ1

zsh

This seems to be the minimal config required:

export LC_ALL=en_US.UTF-8
# Load colors.
autoload -U colors
colors
# Allow for functions in the prompt.
setopt PROMPT_SUBST
RPROMPT='\$(pretty-git-prompt)'

Just put it inside your ~/.zshrc and try it out.

bash

You should paste this inside your ~/.bashrc:

pretty_prompt() { PS1="$(pretty-git-prompt)\n\$ "; }
export PROMPT_COMMAND="pretty_prompt ; $PROMPT_COMMAND"

For more info about the presented solution, please read these superuser.com and stackoverflow threads.

Skipping selected repositories

pretty-git-prompt asks libgit2 for the repository status every time your prompt is rendered. In huge repositories (linux, netbsd-src, kubernetes, ...) this can take seconds, which makes the shell feel sluggish.

There is no ignore list inside the config file: the decision is made in your shell, by wrapping the call in a function which prints nothing for the paths you don't care about. Both snippets below match a directory and everything below it, so subdirectories of the repository are skipped as well.

zsh

# Directory trees where pretty-git-prompt should stay quiet.
PGP_IGNORED_PATHS=(
  ~/dev/linux
  ~/dev/netbsd-src
)

pretty_git_prompt_unless_ignored() {
  local ignored
  for ignored in $PGP_IGNORED_PATHS; do
    [[ $PWD == $ignored || $PWD == $ignored/* ]] && return 0
  done
  pretty-git-prompt
}

setopt PROMPT_SUBST
RPROMPT='$(pretty_git_prompt_unless_ignored)'

bash

PGP_IGNORED_PATHS=(
  "$HOME/dev/linux"
  "$HOME/dev/netbsd-src"
)

pretty_git_prompt_unless_ignored() {
  local ignored
  for ignored in "${PGP_IGNORED_PATHS[@]}"; do
    if [[ $PWD == "$ignored" || $PWD == "$ignored"/* ]]; then
      return 0
    fi
  done
  pretty-git-prompt
}

pretty_prompt() { PS1="$(pretty_git_prompt_unless_ignored)\n\$ "; }
export PROMPT_COMMAND="pretty_prompt ; $PROMPT_COMMAND"

If you prefer to mark the repositories themselves instead of listing them in your shell config, put a marker file in the repository, e.g. touch ~/dev/linux/.git/pretty-git-prompt-ignore, and check for it instead:

pretty_git_prompt_unless_ignored() {
  local git_dir
  git_dir=$(git rev-parse --absolute-git-dir 2>/dev/null) || return 0
  [[ -e $git_dir/pretty-git-prompt-ignore ]] && return 0
  pretty-git-prompt
}

Before you exclude a repository, it may be worth speeding git itself up, since pretty-git-prompt is as fast as the status of the repository it inspects:

$ git config core.untrackedCache true
$ git config core.fsmonitor true

Solving problems

If you encounter a problem, you may run the tool with verbose output to help you resolve the issue:

$ pretty-git-prompt --debug
Debug messages are enabled.
This is not a git repository: Error { code: -3, klass: 6, message: "could not find repository from \'.\'" }

Configuration

The configuration is documented inside default config file. Therefore it's not explicitly written down here. You can obtain it via:

$ pretty-git-prompt create-default-config
Configuration file created at "/home/you/.config/pretty-git-prompt.yml"

This repository contains also configuration for bash and zsh with colors:

  1. files/pretty-git-prompt.yml.bash
  2. files/pretty-git-prompt.yml.zsh

In case anything is not clear from the comments inside the config files, please open a new issue.

Contributing

This is an open source project. I don't guarantee any support. Everything is best effort.

If you encounter any issue, please submit it! I will take a look. The best thing to do in the meanwhile is to try fixing it yourself.

The whole development environment should be trivial to setup, even run tests: all you need is podman and make.

$ make test

Please read CONTRIBUTING.md before you start hacking.

Credits

This tool is heavily inspired by zsh-git-prompt. At some point I realized, I wanted a more powerful tool so I wrote pretty-git-prompt.