jj-update: fix commands to work with breaking changes in jj-0.36.0#407
jj-update: fix commands to work with breaking changes in jj-0.36.0#407idursun merged 1 commit intoidursun:mainfrom
Conversation
a0a5a72 to
61f3e7d
Compare
| func (b Bookmark) IsPushable() bool { | ||
| return b.Local != nil && len(b.Remotes) == 0 | ||
| } | ||
|
|
There was a problem hiding this comment.
Bookmark.Pushable now becomes used in the codebase 😔
|
Hey, thanks! If we merge this now, we will force everybody to be on 0.36, otherwise Additionally, we need to update the minimum jj version in the README.md to 0.36. |
|
I'm not sure anyone wins if this is merged or if you wait an arbitrary while. Perhaps the fixes can be put behind some sort of flag/version check? |
jj has been released just yesterday. I still want to keep my option to release another version of
Yes, but it's only worthwhile if implementing a version check and branching the code per jj version takes less than a couple of weeks. |
61f3e7d to
275998c
Compare
@idursun hey it's fine, let's wait for a while
|
4b0e7c4 to
b2daa9e
Compare
I'm using |
b2daa9e to
8f0686a
Compare
in [Release v0.36.0 - jj-vcs/jj](https://github.com/jj-vcs/jj/releases/tag/v0.36.0), jj has breaking changes which breaks jjui. This commit includes the fixes for: - deprecation of `--destination` flag: changed to `--onto` - deprecation of `--edit` flag: changed to `--editor` - deprecation of `--allow-new` flag for `git push`: removed all commands calling `git push` with `--allow-new` Additionally, to replace `d` for `--destination`, `o` is used for the new `--onto` flag in related modes, which conflicts with OpLog.Mode. Hence, a `IsNormalMode` check is added to ui.
8f0686a to
9a2d64a
Compare
|
0.37.0 is now out. Looking through the changelog, not sure what affects jjui but there's a lot of welcomed changes. |
|
@nickchomey yeap didn't see anything that might affect jjui |
|
Are you running this PR branch then? Because not being able to use destination affects rebasing etc |
@nickchomey ah this should have been brought up in this PR, my bad! @idursun please be aware of this behavior change, and advise if any changes needed |
idursun
left a comment
There was a problem hiding this comment.
Thanks @baggiiiie I think this is good to go in.
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [idursun/jjui](https://github.com/idursun/jjui) | patch | `v0.9.9` → `v0.9.10` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>idursun/jjui (idursun/jjui)</summary> ### [`v0.9.10`](https://github.com/idursun/jjui/releases/tag/v0.9.10) [Compare Source](idursun/jjui@v0.9.9...v0.9.10) ### Release Notes #### 🆕 Features ##### Lua Scripting Enhancements - **Lua Context Module** ([#​465](idursun/jjui#465)): Added context module to Lua scripting API, exposing methods for accessing selected item metadata and checked items: - `context.change_id()` - Get the change ID of selected revision or file - `context.commit_id()` - Get the commit ID of selected revision, file, or commit - `context.file()` - Get the file path of selected file - `context.operation_id()` - Get the operation ID of selected operation - `context.checked_files()` - Get array of checked file paths - `context.checked_change_ids()` - Get array of change IDs from checked items - `context.checked_commit_ids()` - Get array of commit IDs from checked items - **Shell Execution in Lua** ([#​471](idursun/jjui#471)): Exposed `exec_shell()` function to Lua scripts, enabling interactive commands like opening files in external editors directly from jjui. This enables custom commands such as: ```toml [custom_commands.open_file] key = ["O"] lua = ''' local file = context.file() if not file then flash("No file selected") return end exec_shell("vim " .. file) ''' ``` #### ✨ Improvements - **Abandon Workflow**: Removed confirmation dialog; users can now use Space to add/remove revisions from the abandon list #### 🐛 Bug Fixes - **Preview Pane Scrolling** ([#​472](idursun/jjui#472)): Fixed broken Ctrl-U/Ctrl-D scrolling in the preview pane that was introduced by earlier input routing changes. Preview commands are now properly grouped and always handled. - **Parser**: Fixed handling of divergent change ID format - **Bookmarks**: Fixed tracking of new bookmarks (currently tracks all remotes) #### 🔧 Compatibility - **Jujutsu 0.36.0 Support** ([#​407](idursun/jjui#407)): Updated commands to work with breaking changes in Jujutsu 0.36.0: - Changed `--destination` flag to `--onto` - Changed `--edit` flag to `--editor` - Removed deprecated `--allow-new` flag from `git push` commands - Updated keybinding from `d` to `o` for `--onto` flag in related modes #### 📝 Documentation - **README Updates** ([#​470](idursun/jjui#470)): - Added missing op log revert item to help menu - Fixed redo documentation - Updated custom command examples #### What's Changed - jj-update: fix commands to work with breaking changes in jj-0.36.0 by [@​baggiiiie](https://github.com/baggiiiie) in [#​407](idursun/jjui#407) - refactor(abandon): remove confirmation dialog by [@​idursun](https://github.com/idursun) in [#​462](idursun/jjui#462) - fix(bookmarks): track new bookmarks by [@​idursun](https://github.com/idursun) in [#​463](idursun/jjui#463) - feat(lua): add context module by [@​idursun](https://github.com/idursun) in [#​465](idursun/jjui#465) - lua: expose exec\_shell to lua script by [@​baggiiiie](https://github.com/baggiiiie) in [#​471](idursun/jjui#471) - README improvements and help menu missing item by [@​baggiiiie](https://github.com/baggiiiie) in [#​470](idursun/jjui#470) - ui,preview: fix preview pane ctrl-u/d scrolling by [@​baggiiiie](https://github.com/baggiiiie) in [#​472](idursun/jjui#472) **Full Changelog**: <idursun/jjui@v0.9.9...v0.9.10> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi44NC4wIiwidXBkYXRlZEluVmVyIjoiNDIuODQuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90IiwiYXV0b21hdGlvbjpib3QtYXV0aG9yZWQiLCJkZXBlbmRlbmN5LXR5cGU6OnBhdGNoIl19-->
in Release v0.36.0 - jj-vcs/jj, jj has breaking changes which breaks jjui.
Below is the fixes for:
--destinationflag: changed to--onto--editflag: changed to--editor--allow-newflag forgit push: removed all commands callinggit pushwith--allow-new