Merge branch 'improve-preview-performance'

* Branch commit log: jj-fzf: cut off the preview after a few thausand lines Cutting off the preview process at a point where users are unlikely to scroll to vastly improves preview performance for giant imports. jj-fzf: split-files: try using `jj diff` instead of `git diff-tree` Signed-off-by: Tim Janik <[email protected]>
tim-janik · Dec 22, 2024 · 6525fb3 · 6525fb3
2 parents 4e996bd + e6afe36
commit 6525fb3
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/jj-fzf b/jj-fzf
@@ -43,8 +43,9 @@ then
     then
       jj --no-pager --ignore-working-copy ${JJFZF_ATOP:+--at-op $JJFZF_ATOP} evolog --color=always -r "$REVISION"
     else							# show commit and diff
-      jj --no-pager --ignore-working-copy ${JJFZF_ATOP:+--at-op $JJFZF_ATOP} log --color=always --no-graph -T "$JJ_FZF_SHOWDETAILS" -s -r "$REVISION"
-      exec jj --no-pager --ignore-working-copy ${JJFZF_ATOP:+--at-op $JJFZF_ATOP} show --color=always -T ' "\n" ' -r "$REVISION" --ignore-space-change
+      { jj --no-pager --ignore-working-copy ${JJFZF_ATOP:+--at-op $JJFZF_ATOP} log --color=always --no-graph -T "$JJ_FZF_SHOWDETAILS" -s -r "$REVISION"
+	jj --no-pager --ignore-working-copy ${JJFZF_ATOP:+--at-op $JJFZF_ATOP} show --color=always -T ' "\n" ' -r "$REVISION" --ignore-space-change
+      } | head -n 4000
     fi
   else								# no valid revision
     true
@@ -67,7 +68,7 @@ case "${1:-}" in
   preview_oppatch)
     [[ " ${2:-} " =~ $OPRPAT ]] && {
 	jj --no-pager --ignore-working-copy --color=always op show -p "${BASH_REMATCH[1]}"
-      } ; exit ;;
+      } | head -n 4000 ; exit ;;
   preview_opdiff)
     [[ " ${2:-} " =~ $OPRPAT ]] && {
 	jj --no-pager --ignore-working-copy --color=always op diff -f "${BASH_REMATCH[1]}" -t @
@@ -1042,7 +1043,7 @@ split-files()
   R="$(xrev "${1:-@}")"
   cd "$JJROOT"		# operate on root relative file names
   # read files affected by $R
-  mapfile -t MAPFILE < <(git diff-tree --no-commit-id --name-only -r "$(rev_commitid "$R")")
+  mapfile -t MAPFILE < <(jj diff --name-only -r "$(rev_commitid "$R")")
   [[ ${#MAPFILE[@]} -gt 1 ]] ||
     return
   # show undo hint