Repository navigation
Commit ee91e55
committed
Let jaspr goto accept a commit hash, not just a position
Picking a commit out of `jaspr status` meant counting rows to turn "I
want <hash>" into a position. `jaspr goto` now accepts a commit hash (or
any commit-ish that resolves to a stack member) in addition to a numeric
position.
navigateTo(position) is refactored to share the move logic with a new
navigateToDestination(dest), which disambiguates: a valid in-range
position is treated as a position (so "-1" is never git-resolved), and
anything else is resolved as a commit and matched against the stack.
This keeps ordinary positions working while also handling an all-digit
abbreviated hash correctly. A destination that is neither an in-range
position nor a stack commit errors cleanly, and an out-of-range number
still reports the position range error.
commit-id: I50fb77f01 parent de93aaf commit ee91e55
3 files changed
Lines changed: 165 additions & 17 deletions
File tree
- git-jaspr/src
- main/kotlin/sims/michael/gitjaspr
- test/kotlin/sims/michael/gitjaspr
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1496 | 1496 | | |
1497 | 1497 | | |
1498 | 1498 | | |
1499 | | - | |
| 1499 | + | |
| 1500 | + | |
| 1501 | + | |
1500 | 1502 | | |
1501 | 1503 | | |
1502 | | - | |
| 1504 | + | |
| 1505 | + | |
| 1506 | + | |
| 1507 | + | |
| 1508 | + | |
1503 | 1509 | | |
1504 | 1510 | | |
1505 | 1511 | | |
| |||
1511 | 1517 | | |
1512 | 1518 | | |
1513 | 1519 | | |
1514 | | - | |
| 1520 | + | |
1515 | 1521 | | |
1516 | 1522 | | |
1517 | 1523 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3062 | 3062 | | |
3063 | 3063 | | |
3064 | 3064 | | |
3065 | | - | |
3066 | | - | |
3067 | | - | |
| 3065 | + | |
| 3066 | + | |
| 3067 | + | |
| 3068 | + | |
| 3069 | + | |
| 3070 | + | |
| 3071 | + | |
| 3072 | + | |
| 3073 | + | |
| 3074 | + | |
| 3075 | + | |
| 3076 | + | |
| 3077 | + | |
| 3078 | + | |
| 3079 | + | |
| 3080 | + | |
| 3081 | + | |
| 3082 | + | |
| 3083 | + | |
| 3084 | + | |
| 3085 | + | |
| 3086 | + | |
| 3087 | + | |
| 3088 | + | |
| 3089 | + | |
| 3090 | + | |
| 3091 | + | |
| 3092 | + | |
| 3093 | + | |
| 3094 | + | |
3068 | 3095 | | |
| 3096 | + | |
3069 | 3097 | | |
| 3098 | + | |
3070 | 3099 | | |
3071 | | - | |
3072 | | - | |
3073 | | - | |
3074 | | - | |
3075 | | - | |
3076 | | - | |
| 3100 | + | |
| 3101 | + | |
| 3102 | + | |
| 3103 | + | |
| 3104 | + | |
| 3105 | + | |
| 3106 | + | |
| 3107 | + | |
| 3108 | + | |
| 3109 | + | |
| 3110 | + | |
| 3111 | + | |
| 3112 | + | |
| 3113 | + | |
| 3114 | + | |
| 3115 | + | |
3077 | 3116 | | |
| 3117 | + | |
| 3118 | + | |
| 3119 | + | |
| 3120 | + | |
3078 | 3121 | | |
3079 | | - | |
| 3122 | + | |
| 3123 | + | |
| 3124 | + | |
| 3125 | + | |
| 3126 | + | |
| 3127 | + | |
| 3128 | + | |
3080 | 3129 | | |
3081 | | - | |
| 3130 | + | |
| 3131 | + | |
| 3132 | + | |
| 3133 | + | |
| 3134 | + | |
| 3135 | + | |
| 3136 | + | |
| 3137 | + | |
3082 | 3138 | | |
3083 | 3139 | | |
3084 | 3140 | | |
3085 | 3141 | | |
3086 | 3142 | | |
3087 | | - | |
| 3143 | + | |
3088 | 3144 | | |
3089 | 3145 | | |
3090 | 3146 | | |
| |||
3097 | 3153 | | |
3098 | 3154 | | |
3099 | 3155 | | |
3100 | | - | |
| 3156 | + | |
3101 | 3157 | | |
3102 | 3158 | | |
3103 | 3159 | | |
3104 | 3160 | | |
3105 | 3161 | | |
3106 | | - | |
| 3162 | + | |
3107 | 3163 | | |
3108 | 3164 | | |
3109 | 3165 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
722 | 722 | | |
723 | 723 | | |
724 | 724 | | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
| 788 | + | |
| 789 | + | |
| 790 | + | |
| 791 | + | |
| 792 | + | |
| 793 | + | |
| 794 | + | |
| 795 | + | |
| 796 | + | |
| 797 | + | |
| 798 | + | |
| 799 | + | |
| 800 | + | |
| 801 | + | |
| 802 | + | |
| 803 | + | |
| 804 | + | |
| 805 | + | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
725 | 811 | | |
726 | 812 | | |
727 | 813 | | |
| |||
0 commit comments