Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Roll back last VCS snapshot #4050

Merged
merged 139 commits into from
Feb 16, 2023
Merged

Roll back last VCS snapshot #4050

merged 139 commits into from
Feb 16, 2023

Conversation

galin-enso
Copy link
Contributor

@galin-enso galin-enso commented Jan 13, 2023 •
edited by farmaazon
Loading

Pull Request Description

Fixes #5001

This PR implements reverting the current project state to the last state saved into the VCS. This action is performed on ctrl+r.

unknown_2023.02.03-16.42.mp4

Important Notes

  • Currently on vcs/restore all expressions are invalidated and all nodes are re-executed. This is tracked in task.

Checklist

Please include the following checklist in your PR:

  • The documentation has been updated if necessary.
  • All code conforms to the
    Scala,
    Java,
    and
    Rust
    style guides.
  • All code has been tested:
    • Unit tests have been written where possible.
    • If GUI codebase was changed: Enso GUI was tested when built using BOTH
      ./run ide build and ./run ide watch.

galin-enso and others added 30 commits November 24, 2022 16:26
@galin-enso
Initial test for saving VCS entries
c8b49fc
@galin-enso
Merge branch 'develop' into wip/galin-enso/save-vsc-on-shortcut-18387…
acf2756 
…4358
@galin-enso
Save project state to vcs
062373b
@galin-enso
Merge branch 'develop' into wip/galin-enso/save-vsc-on-shortcut-18387…
234f31e 
…4358
@galin-enso
Fix error check
ce3ad59
@galin-enso
Get root path from language server
105e63c
@galin-enso
Format
c499e1b
@galin-enso
Merge branch 'develop' into wip/galin-enso/save-vsc-on-shortcut-18387…
d15c411 
…4358
@galin-enso
Merge branch 'develop' into wip/galin-enso/save-vsc-on-shortcut-18387…
bcfd941 
…4358
@galin-enso
Handle text/autoSave notification
baa207a
@galin-enso
Move snapshot functions to project
c370659
@galin-enso
Merge branch 'develop' into wip/galin-enso/save-vsc-on-shortcut-18387…
edc249b 
…4358
@galin-enso
Project snapshot unit tests
b973681
@galin-enso
Merge branch 'develop' into wip/galin-enso/save-vsc-on-shortcut-18387…
b2b298b 
…4358
@galin-enso
Lint
98155de
@galin-enso
Merge branch 'develop' into wip/galin-enso/save-vsc-on-shortcut-18387…
ca77c05 
…4358
@galin-enso
Changelog entry
fbf52b1
@galin-enso
Trigger set_project_changed in project_name
c583ac8
@galin-enso
Merge branch 'develop' into wip/galin-enso/visual-indication-of-vcs-s…
40c862a 
…tatus-183558159
@galin-enso
Check VCS dirty on autosave
1c835cc
@galin-enso
Temporary: skip VCS status and report always dirty
4570563
@galin-enso
Change project name color
8969cdd
@galin-enso
Merge branch 'develop' into wip/galin-enso/visual-indication-of-vcs-s…
34e4de8 
…tatus-183558159
@galin-enso
Re-enable vcs status check
0e3358b
@galin-enso
Merge branch 'develop' into wip/galin-enso/visual-indication-of-vcs-s…
1551a3e 
…tatus-183558159
@galin-enso
Cleanup
357a21b
@galin-enso
Add unit tests for check_project_vcs_is_outdated
20b7c91
@galin-enso
Formatting
e295400
@galin-enso
Lint
be52fc1
@galin-enso
Clean up color change logic
0c3c951
@galin-enso galin-enso marked this pull request as ready for review February 3, 2023 17:56
farmaazon
farmaazon requested changes Feb 6, 2023
View reviewed changes
app/gui/controller/engine-protocol/src/language_server.rs Outdated Show resolved Hide resolved
app/gui/src/model/module.rs Outdated Show resolved Hide resolved
app/gui/src/model/module/synchronized.rs Outdated Show resolved Hide resolved
@wdanilo wdanilo mentioned this pull request Feb 6, 2023
Open
2 tasks
hubertp
hubertp approved these changes Feb 6, 2023
View reviewed changes
Copy link
Contributor

@hubertp hubertp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for the parser changes (better than crashing)

farmaazon
farmaazon approved these changes Feb 9, 2023
View reviewed changes
app/gui/src/model/module/synchronized.rs Outdated Show resolved Hide resolved
app/gui/src/model/module.rs Outdated Show resolved Hide resolved
farmaazon
farmaazon approved these changes Feb 15, 2023
View reviewed changes
Copy link
Contributor

@farmaazon farmaazon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QA Approved

@galin-enso galin-enso added the CI: Ready to merge This PR is eligible for automatic merge label Feb 15, 2023
@mergify mergify bot merged commit 725b3da into develop Feb 16, 2023
@mergify mergify bot deleted the wip/galin-enso/roll-back-last-vcs-snapshot-183604295 branch February 16, 2023 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@farmaazon farmaazon farmaazon approved these changes

@hubertp hubertp hubertp approved these changes

@MichaelMauderer MichaelMauderer Awaiting requested review from MichaelMauderer

@wdanilo wdanilo Awaiting requested review from wdanilo

@mwu-tow mwu-tow Awaiting requested review from mwu-tow

@4e6 4e6 Awaiting requested review from 4e6 4e6 is a code owner

@JaroslavTulach JaroslavTulach Awaiting requested review from JaroslavTulach JaroslavTulach is a code owner

Assignees
No one assigned
Labels
CI: Ready to merge This PR is eligible for automatic merge
Projects
Issues Board
Status: 🟢 Accepted
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rollback to last save action on shortcut
3 participants
@galin-enso @hubertp @farmaazon