Initial Release Expectations

jhechtf / jj-vscode

fuck yeah

MIT License

3 stars 0 forks source link

Initial Release Expectations #3

Open jhechtf opened 4 months ago

jhechtf commented 4 months ago

Trying to determine some common things that are done in the jj terminal that might come up in the extension, here is the dumping ground for that

[ ] Splitting a commit
[ ] Moving commits around (? Not sure it's possible in VSCode's UI)
[ ] Pulling code down
[ ] Pushing code up
[ ] creating new branches
[ ] tracking the current commit to a branch
[ ] Diffs (No idea what bag of worms this opens up here)
[ ] Split Diff Editor
[ ] Branch management (creation, move to)

jennings commented 4 months ago

Since I colocate all my Jujutsu repositories, the features I'd want would be ones that Git integrations can't do. I'm pretty sure two SCM integrations can show up simultaneously.

Show something sensible in the changes pane if the working copy descends from a conflicted revision (for example, if you jj new <conflicted-revision>
Show something sensible for a 3-way (or larger) conflicted file
Describe the working copy

The Git integration features that I miss if I'm in a non-colocated repo are:

View the diff of the working copy (shows up as "uncommitted changes" to git)
Discard changes to files, discard hunks
Blame in the editor (comes from the GitLens extension)

Beyond those, I'm happy using the terminal (and Beyond Compare) for most operations. I'm indifferent about fetching, pushing, branches, squashing, or rebasing from VSCode.

jennings commented 3 months ago

While reflecting on why I don't use the squash workflow, I realized it's because I want to see the "complete diff" when I'm modifying a change, not just the interdiff. For example, suppose I've run jj new rtzyl with the eventual plan of squashing into rtzyl:

@  zuxzrspw b981fdab
│  (empty) (no description set)
◌  rtzylmoz 4add14cb
│  revset date filters
◆  vsvxszmo f3519e4c
│  github: bump the github-dependencies group with 3 updates
~

In this case, I want the IDE to show me what rtzyl will look like after I squash. So, approximately jj diff --from @-- --to @.

I'm not quite sure how this feature would work, because if I instead did jj edit rtzyl, I would want to see --from @-. I think it would probably need to be a toggle in the UI to switch between seeing --from @- and --from @--.

jhechtf commented 3 months ago

That is a good one; not 100% on how I would get that to work in VSCode -- a lot of this is new APIs for me so I'm doing a lot of FAFO to get some answers.