fix(p10k): flip jujutsu ahead/behind markers #20

merged
opened by a.starrysky.fyi targeting main from private/minion/push-rtyvwrpwslxl

Jujutsu's templates for this are for how far ahead/behind the remote branch is than compared to the local branch vs how far ahead/behind we are from the remote branch... it makes more sense to have this the other way around (and clarify in the comment...)

Changed files
+7 -6
packetmix
homes
minion
zsh
+7 -6
packetmix/homes/minion/zsh/p10k.zsh
··· 1760 1760 ')) 1761 1761 1762 1762 local VCS_STATUS_LOCAL_BRANCH=$branch 1763 - local VCS_STATUS_COMMITS_AHEAD=$counts[2] 1764 - local VCS_STATUS_COMMITS_BEHIND=$counts[3] 1765 - local VCS_STATUS_COMMITS_AHEAD_PLUS=$counts[4] 1766 - local VCS_STATUS_COMMITS_BEHIND_PLUS=$counts[5] 1763 + # note: the tracking_ahead_count and tracking_behind_count refer to whether the remote bookmark is ahead or behind the local bookmark, we want the other way round... 1764 + local VCS_STATUS_COMMITS_BEHIND=$counts[2] 1765 + local VCS_STATUS_COMMITS_AHEAD=$counts[3] 1766 + local VCS_STATUS_COMMITS_BEHIND_PLUS=$counts[4] 1767 + local VCS_STATUS_COMMITS_AHEAD_PLUS=$counts[5] 1767 1768 fi 1768 1769 1769 1770 local status_char='' ··· 1783 1784 1784 1785 1785 1786 ## jj_remote 1786 - # ⇡42 if ahead of the remote. 1787 + # ⇡42 if our local branch is ahead of the remote. 1787 1788 (( VCS_STATUS_COMMITS_AHEAD )) && res+=" ${green}⇡${VCS_STATUS_COMMITS_AHEAD}" 1788 1789 (( VCS_STATUS_COMMITS_AHEAD_PLUS )) && res+="${VCS_STATUS_COMMITS_AHEAD_PLUS}" 1789 - # ⇣42 if behind the remote; no leading space if also ahead of the remote: ⇡42⇣42. 1790 + # ⇣42 if our local branch is behind the remote; no leading space if our local branch is also ahead of the remote: ⇡42⇣42. 1790 1791 (( VCS_STATUS_COMMITS_BEHIND && !VCS_STATUS_COMMITS_AHEAD )) && res+=" " 1791 1792 (( VCS_STATUS_COMMITS_BEHIND )) && res+="${red}⇣${VCS_STATUS_COMMITS_BEHIND}" 1792 1793 (( VCS_STATUS_COMMITS_BEHIND_PLUS )) && res+="${VCS_STATUS_COMMITS_BEHIND_PLUS}"