3 сентября 2026 г. 08:51:53 GMT+03:00, Theo Buehler <tb@theobuehler.org> пишет: >On Mon, Aug 31, 2026 at 10:21:28AM +0200, Theo Buehler wrote: >> I got a report that fish completions don't work properly for jj. That >> is, command completions work, but revision and bookmark completions >> (which seem just as useful to have completions for) do not. Turns out >> the packaged completions get in the way of this. >> >> jj has supported (experimental) dynamic completions for fish out of the >> box for a long time (around 0.24). This only works with fish >=4.0.2. >> So the downside of doing this is that fish 3 users need to install >> completions manually by doing 'jj util completion fish | source' >> >> It seems a reasonable trade-off to me, but I'm not a user of these >> facilities. > >Here is the same diff rebased on top of the update to 0.45.0. I am going >to commit this after the weekend unless I hear objections. > >Index: Makefile >=================================================================== >RCS file: /cvs/ports/devel/jujutsu/Makefile,v >diff -u -p -r1.39 Makefile >--- Makefile 3 Sep 2026 05:46:27 -0000 1.39 >+++ Makefile 3 Sep 2026 05:49:23 -0000 >@@ -2,6 +2,7 @@ COMMENT = version control system with g > > V = 0.45.0 > PKGNAME = jujutsu-$V >+REVISION = 0 > > DIST_TUPLE = github jj-vcs jj v$V . > >@@ -41,7 +42,6 @@ JJ = ${WRKBUILD}/target/release/jj > post-build: > cd /tmp && ${JJ} util install-man-pages ${WRKBUILD} > cd /tmp && ${JJ} util completion bash > ${WRKBUILD}/jj.bash >- cd /tmp && ${JJ} util completion fish > ${WRKBUILD}/jj.fish > cd /tmp && ${JJ} util completion zsh > ${WRKBUILD}/jj.zsh > > post-install: >@@ -49,12 +49,9 @@ post-install: > ${INSTALL_MAN} ${WRKBUILD}/man1/* ${PREFIX}/man/man1 > ${INSTALL_DATA_DIR} \ > ${PREFIX}/share/bash-completion/completions \ >- ${PREFIX}/share/fish/vendor_completions.d \ > ${PREFIX}/share/zsh/site-functions > ${INSTALL_DATA} ${WRKBUILD}/jj.bash \ > ${PREFIX}/share/bash-completion/completions/jj >- ${INSTALL_DATA} ${WRKBUILD}/jj.fish \ >- ${PREFIX}/share/fish/vendor_completions.d/jj.fish > ${INSTALL_DATA} ${WRKBUILD}/jj.zsh \ > ${PREFIX}/share/zsh/site-functions/_jj > >Index: pkg/PLIST >=================================================================== >RCS file: /cvs/ports/devel/jujutsu/pkg/PLIST,v >diff -u -p -r1.17 PLIST >--- pkg/PLIST 3 Sep 2026 05:46:27 -0000 1.17 >+++ pkg/PLIST 3 Sep 2026 05:49:23 -0000 >@@ -122,5 +122,4 @@ > @man man/man1/jj-workspace.1 > @man man/man1/jj.1 > share/bash-completion/completions/jj >-share/fish/vendor_completions.d/jj.fish > share/zsh/site-functions/_jj > Ok kn
No comments:
Post a Comment