Skip to content

Fix jj bookmark tracking #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tcodes0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix jj bookmark tracking #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions dotfiles/.functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,11 @@ jj_prompt() {
bookmarks[1]=${bookmarks[1]/main/}
bookmarks[1]=${bookmarks[1]/master/}

# local repo_root
local repo_root

# if repo_root=$(command jj root 2>/dev/null); then
# track_jj_bookmarks "$repo_root" "${bookmarks[0]}"
# fi
if repo_root=$(command jj root 2>/dev/null); then
track_jj_bookmarks "$repo_root" "${bookmarks[0]}"
fi

local light_black="\\[\\e[33;90m\\]" green="\\[\\e[33;32m\\]"
local format="${bookmarks[0]} ${bookmarks[1]} $green@$END$change_id $description $green@-$END$change_id_parent $light_black$description_parent$END"
Expand All @@ -369,30 +369,34 @@ jj_prompt() {
#- - - - - - - - - - -

# Track recent bookmarks per repo using a global var.
# track_jj_bookmarks() {
# local repo="$1" current_bookmark="$2"
track_jj_bookmarks() {
local repo="$1" current_bookmark="$2"

# if [[ "$current_bookmark" == "main" || "$current_bookmark" == "master" ]]; then
# return
# fi
if [[ -z "$repo" || -z "$current_bookmark" ]]; then
return
fi

# if [[ "${JJ_RECENT_BOOKMARK_MAP[$repo]+set}" == "" ]]; then
# JJ_RECENT_BOOKMARK_MAP[$repo]=""
# fi
if [[ "$current_bookmark" == "main" || "$current_bookmark" == "master" ]]; then
return
fi

# local -a bookmarks=()
# read -ra bookmarks <<<"${JJ_RECENT_BOOKMARK_MAP[$repo]}"
if [[ "${JJ_RECENT_BOOKMARK_MAP[$repo]+set}" != "set" ]]; then
JJ_RECENT_BOOKMARK_MAP[$repo]=""
fi

# if [[ "${bookmarks[0]}" != "$current_bookmark" ]]; then
# bookmarks=("$current_bookmark" "${bookmarks[@]}")
# fi
local -a bookmarks=()
read -ra bookmarks <<< "${JJ_RECENT_BOOKMARK_MAP[$repo]}"

# if [ "${#bookmarks[@]}" -gt 7 ]; then
# bookmarks=("${bookmarks[@]:0:7}")
# fi
if [[ "${bookmarks[0]}" != "$current_bookmark" ]]; then
bookmarks=("$current_bookmark" "${bookmarks[@]}")
fi

# JJ_RECENT_BOOKMARK_MAP["$repo"]="${bookmarks[*]}"
# }
if (( ${#bookmarks[@]} > 7 )); then
bookmarks=("${bookmarks[@]:0:7}")
fi

JJ_RECENT_BOOKMARK_MAP[$repo]="${bookmarks[*]}"
}

#- - - - - - - - - - -

Expand Down
8 changes: 4 additions & 4 deletions dotfiles/lib-prompt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ MAIN_COLOR="\\[$(rand_256_color)\\]"
SECONDARY_COLOR="\\[$(rand_256_color)\\]"

# global var used in jj functions
# if ! declare -p JJ_RECENT_BOOKMARK_MAP &>/dev/null; then
# declare -g -A JJ_RECENT_BOOKMARK_MAP=()
# export JJ_RECENT_BOOKMARK_MAP
# fi
if ! declare -p JJ_RECENT_BOOKMARK_MAP &>/dev/null; then
declare -g -A JJ_RECENT_BOOKMARK_MAP=()
export JJ_RECENT_BOOKMARK_MAP
fi