mirror of
https://github.com/paulirish/git-recent.git
synced 2026-09-10 07:26:16 -04:00
126 lines
5.8 KiB
Bash
Executable file
126 lines
5.8 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
#
|
|
# git recent 2.0 - switching branches, but so fancy
|
|
#
|
|
# - view recently edited local branches
|
|
# - see unique commits to that branch, and optionally the branch diff (against the main/master/primary branch) with Ctrl-o
|
|
# - hit Enter to checkout the selected branch.
|
|
# - text filtering against branch names, too.
|
|
#
|
|
|
|
if ! command -v fzf >/dev/null 2>&1; then
|
|
echo "Error: fzf is not installed. Please install fzf to use git-recent." >&2
|
|
exit 1
|
|
fi
|
|
[ "$(git rev-parse --is-inside-work-tree)" = "true" ] || exit
|
|
|
|
if [[ "$1" == "--help" ]]; then
|
|
echo "git-recent: Browse and checkout recently used Git branches."
|
|
echo
|
|
echo "Keybindings:"
|
|
echo " Enter: Checkout the selected branch"
|
|
echo " Ctrl-O: Show the diff of the selected branch against the main/master branch"
|
|
echo " Ctrl-C: Exit"
|
|
exit 0
|
|
fi
|
|
|
|
# ---------------------------------------------------------------------------------------
|
|
|
|
branches_format="%(color:yellow)%(refname:short)%(color:reset)"
|
|
commits_format="%C(red bold)%h %C(bold blue)%an %C(bold green)%ad %Creset%s"
|
|
|
|
# The HEAD of the primary branch (eg main or master or w/e), for diffing.
|
|
# TODO: some branch mgmt approaches don't work well with this. And may prefer `git log --pretty=format:%H --merges -n 1`. See https://github.com/paulirish/git-recent/issues/28
|
|
diff_base=$(cat $(git rev-parse --show-cdup).git/refs/remotes/origin/HEAD | awk '{print $2}')
|
|
|
|
uniqcommits_cmd="branch_name=\$(echo {1} | cut -d' ' -f1) git log --date=human --color=always --format='$commits_format' --no-merges $diff_base..\$branch_name"
|
|
|
|
diffbranch_cmd="git diff --color=always $diff_base...{}"
|
|
# Progressive enhancement if you have delta or diff-so-fancy
|
|
if command -v delta >/dev/null 2>&1; then
|
|
diffbranch_cmd="$diffbranch_cmd | delta"
|
|
elif command -v diff-so-fancy >/dev/null 2>&1; then
|
|
diffbranch_cmd="$diffbranch_cmd | diff-so-fancy"
|
|
fi
|
|
|
|
# Copy to clipboard, variants for mac/linux
|
|
copy_cmd="echo 'Could not copy {} to clipboard.'"
|
|
if command -v pbcopy >/dev/null; then
|
|
copy_cmd="printf '%s' {} | pbcopy"
|
|
elif command -v wl-copy >/dev/null; then
|
|
copy_cmd="printf '%s' {} | wl-copy"
|
|
elif command -v xclip >/dev/null; then
|
|
copy_cmd="printf '%s' {} | xclip -selection clipboard"
|
|
elif command -v xsel >/dev/null; then
|
|
copy_cmd="printf '%s' {} | xsel --clipboard"
|
|
fi
|
|
|
|
YELLOW='\033[0;33m'
|
|
DIM='\033[2m'
|
|
NC='\033[0m' # No Color
|
|
|
|
# if extra arg passed (eg `git recent remotename`), then list those remote branches, rather than local ones
|
|
[[ -n "$1" ]] && heads="refs/remotes/$1" || heads="refs/heads"
|
|
|
|
# fzf git inspiration:
|
|
# - https://github.com/junegunn/fzf/wiki/Examples#git
|
|
# - https://github.com/junegunn/fzf/wiki/Examples-(fish)#git
|
|
# - https://github.com/junegunn/fzf-git.sh (intense.)
|
|
|
|
# If there's a GIT_RECENT_QUERY environment variable, use it for non-interactive filtering. (Primarily added for testing.)
|
|
filterarg=${GIT_RECENT_QUERY:+"--filter=$GIT_RECENT_QUERY"}
|
|
|
|
|
|
CL_STATUS=$(git cl status --fast --no-branch-color | grep 'https://' | sed 's| (.*||')
|
|
# CL_STATUS=$(cat <<'EOF'
|
|
# delete-unused-things-june25 : https://crrev.com/c/6649316 (waiting)
|
|
# download-branded-chrome : https://crrev.com/c/6333632 (waiting)
|
|
# drop-micro-sec-entirely : https://crrev.com/c/6287827 (waiting)
|
|
# editor-search-result-to-center : https://crrev.com/c/5958176 (waiting)
|
|
# faster-ut-handler : https://crrev.com/c/6472820 (waiting)
|
|
# initiator-arrow-reduxx : https://crrev.com/c/5309492 (waiting)
|
|
# insight-bounds : https://crrev.com/c/6436290 (waiting)
|
|
# io-throttling-order : https://crrev.com/c/6535192 (waiting)
|
|
# knapsack-for-victor : https://crrev.com/c/5981368 (waiting)
|
|
# lcp-phase-mini-refactor : https://crrev.com/c/6651250 (waiting)
|
|
# module-graph-test : https://crrev.com/c/6183179 (waiting)
|
|
# negative-lcp-phase : https://crrev.com/c/6651013 (waiting)
|
|
# react-ext-link-handling : https://crrev.com/c/6535878 (waiting)
|
|
# sidebar-reset-active-insight-on-hide : https://crrev.com/c/6433141 (waiting)
|
|
# url-eliding : https://crrev.com/c/6329935 (waiting)
|
|
# usertiming-fix : https://crrev.com/c/6533610 (waiting)
|
|
# verbosespec : https://crrev.com/c/6635126 (waiting)
|
|
# EOF
|
|
# )
|
|
|
|
|
|
# echo "$CL_STATUS"
|
|
|
|
_browse_branches() {
|
|
git for-each-ref --sort=-authordate "$heads" --format="$branches_format" \
|
|
| while read -r branch_name; do
|
|
review_url=$(echo "$CL_STATUS" | grep -E "\b${branch_name}\b" | grep -o -E 'https://.*' | sed 's|https://||')
|
|
printf "$YELLOW$branch_name $DIM$review_url\n"
|
|
done \
|
|
| fzf \
|
|
$filterarg --ansi -- --layout=reverse --multi --height=90% --min-height=20 \
|
|
--border-label-pos=2 --border-label '🌲 Branches' --border \
|
|
--no-hscroll --no-multi \
|
|
--preview-window='right,70%,border-left,border-rounded' --preview="$uniqcommits_cmd" --preview-label="Commits unique to branch" \
|
|
--header $'ENTER (checkout)\nCTRL-O (show branch diff)\nCTRL-Y (copy name to clipboard)' \
|
|
--bind 'preview-scroll-up:preview-up+preview-up+preview-up' \
|
|
--bind 'preview-scroll-down:preview-down+preview-down+preview-down' \
|
|
--bind "ctrl-y:execute-silent($copy_cmd)" \
|
|
--bind "ctrl-o:preview:$diffbranch_cmd"
|
|
}
|
|
chosen_branch="$(_browse_branches)"
|
|
line_count=$(printf "%s" "$chosen_branch" | wc -l)
|
|
|
|
if [[ -n "$chosen_branch" ]] && (( line_count == 0 )); then
|
|
echo git checkout "$chosen_branch"
|
|
git checkout "$chosen_branch"
|
|
else
|
|
echo "$chosen_branch"
|
|
fi
|