Repository navigation
Commit 6b81fc3
committed
Preserve SHAs in jaspr nav up/top when no amend has occurred
navigateUp and navigateToTop used to cherry-pick every entry
above the cursor unconditionally, even when nothing had changed.
The result: every commit visited got a new SHA, the stored stack
drifted from the user's branch, and reviewing a stack via nav was
effectively unusable.
The replay path now checks the entry's git parent against HEAD:
- Match -> plain checkout (SHA preserved).
- Mismatch -> existing cherry-pick path (SHA rewritten, stored
state updated).
Comparing against the entry's actual git parent (rather than
against the previous stored SHA in the in-memory stack) matters
once a rewrite has occurred: the previous stored SHA is the
rewritten one, but the next entry has not been touched yet and
still carries the original commit, whose git parent is the
unmodified prior SHA.
Refactored the per-entry loop out of navigateUp/navigateToTop
into a private replayEntries(stack, range) -> stack helper.
Tests:
- Renamed `up replays one commit via cherry-pick` and `top
replays all remaining commits and restores branch` to reflect
the new behavior, and added SHA-equality assertions to lock
in preservation.
- Added `up cherry-picks remaining commits when amend exists
below the cursor` and a symmetric test for `top`.
- Updated the comment in `amend during nav session updates SHA
in stack`. Its outcome is unchanged, but the mechanism is
now checkout, not cherry-pick.
Closes git-jaspr-2yz.
commit-id: I4f05e5b71 parent 94d8ad5 commit 6b81fc3
2 files changed
Lines changed: 137 additions & 24 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 | |
|---|---|---|---|
| |||
2643 | 2643 | | |
2644 | 2644 | | |
2645 | 2645 | | |
2646 | | - | |
2647 | | - | |
| 2646 | + | |
| 2647 | + | |
2648 | 2648 | | |
2649 | 2649 | | |
2650 | 2650 | | |
| |||
2658 | 2658 | | |
2659 | 2659 | | |
2660 | 2660 | | |
2661 | | - | |
2662 | | - | |
2663 | | - | |
2664 | | - | |
2665 | | - | |
2666 | | - | |
2667 | | - | |
| 2661 | + | |
| 2662 | + | |
2668 | 2663 | | |
2669 | 2664 | | |
2670 | 2665 | | |
| |||
2686 | 2681 | | |
2687 | 2682 | | |
2688 | 2683 | | |
2689 | | - | |
2690 | | - | |
2691 | | - | |
2692 | | - | |
2693 | | - | |
2694 | | - | |
2695 | | - | |
| 2684 | + | |
| 2685 | + | |
2696 | 2686 | | |
2697 | 2687 | | |
2698 | 2688 | | |
2699 | 2689 | | |
2700 | 2690 | | |
| 2691 | + | |
| 2692 | + | |
| 2693 | + | |
| 2694 | + | |
| 2695 | + | |
| 2696 | + | |
| 2697 | + | |
| 2698 | + | |
| 2699 | + | |
| 2700 | + | |
| 2701 | + | |
| 2702 | + | |
| 2703 | + | |
| 2704 | + | |
| 2705 | + | |
| 2706 | + | |
| 2707 | + | |
| 2708 | + | |
| 2709 | + | |
| 2710 | + | |
| 2711 | + | |
| 2712 | + | |
| 2713 | + | |
| 2714 | + | |
| 2715 | + | |
| 2716 | + | |
| 2717 | + | |
| 2718 | + | |
2701 | 2719 | | |
2702 | 2720 | | |
2703 | 2721 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
326 | 327 | | |
327 | 328 | | |
328 | 329 | | |
329 | | - | |
| 330 | + | |
330 | 331 | | |
331 | 332 | | |
332 | 333 | | |
| |||
350 | 351 | | |
351 | 352 | | |
352 | 353 | | |
353 | | - | |
| 354 | + | |
354 | 355 | | |
355 | | - | |
| 356 | + | |
356 | 357 | | |
357 | 358 | | |
358 | 359 | | |
359 | 360 | | |
360 | 361 | | |
361 | | - | |
| 362 | + | |
362 | 363 | | |
363 | 364 | | |
364 | 365 | | |
| |||
374 | 375 | | |
375 | 376 | | |
376 | 377 | | |
| 378 | + | |
| 379 | + | |
377 | 380 | | |
378 | 381 | | |
379 | 382 | | |
| |||
384 | 387 | | |
385 | 388 | | |
386 | 389 | | |
387 | | - | |
| 390 | + | |
| 391 | + | |
388 | 392 | | |
389 | 393 | | |
390 | | - | |
391 | | - | |
| 394 | + | |
392 | 395 | | |
393 | 396 | | |
394 | 397 | | |
| |||
550 | 553 | | |
551 | 554 | | |
552 | 555 | | |
553 | | - | |
| 556 | + | |
| 557 | + | |
554 | 558 | | |
555 | 559 | | |
556 | 560 | | |
| |||
560 | 564 | | |
561 | 565 | | |
562 | 566 | | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
563 | 658 | | |
564 | 659 | | |
565 | 660 | | |
| |||
0 commit comments