-
Notifications
You must be signed in to change notification settings - Fork 300
Feature/uncommit unstage functionality #2457
Feature/uncommit unstage functionality #2457
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2457 +/- ##
==========================================
+ Coverage 43.26% 43.45% +0.18%
==========================================
Files 341 341
Lines 13434 13463 +29
Branches 1768 1769 +1
==========================================
+ Hits 5812 5850 +38
+ Misses 7346 7336 -10
- Partials 276 277 +1
Continue to review full report at Codecov.
|
…ncommit-unstage-functionality
this._onFileStatusChanged.dispatch() | ||
} catch (error) { | ||
this._oni.log.warn(` | ||
Git Provider unable to get logs because of: ${error.message}`) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tiny change, but this should be unable to undo most recent commit
.
Functionally seems to all work well! Code looks good too. I tried both unstaging files, as well as undoing commits. One comment I would make is that the UX for undoing commits potentially could do with being changed, since my first instinct on an item is usually to hit I'll wait on approving till the CI passes. |
@CrossR thanks for the review 👍 yeah think I should have stuck with |
This PR adds the ability to unstage a file, as well undo the last commit
Issues/Limitations:
Currently although the git logs is shown the last 25 commits (for performance sake only 25 as testing with a large repo with loads of commits rendering and fetching that log is much slower) they can only interact with the one that is the latest as the uncommit functionality uses
git reset --soft HEAD^
to remove the last commit.with the log though other functionality like checkout etc. can eventually be added but if the user were able to select each commit atm they would have to scroll throw all 25 to reach the next section, in order to get round this the VimNavigator would have to be expanded to allow dynamically setting a selected ID and some functionality added to allow skipping sections so for now I have removed the option to do that
Help Section

Outstanding: