Skip to content
This repository was archived by the owner on Apr 1, 2020. It is now read-only.

Conversation

akinsho
Copy link
Member

@akinsho akinsho commented Jul 18, 2018

As part of fleshing out the VCS this pr adds the ability to commit a file using the git sidebar.

Additions:

  • Menu command toggle vcs visibility

  • Recent Commits Section: commits made whilst in oni (later might be preferable to get a git log rather than commits from oni)

  • Commiting: see below

vcs_commit

@codecov
Copy link

codecov bot commented Jul 18, 2018

Codecov Report

Merging #2441 into master will increase coverage by 0.64%.
The diff coverage is 68.58%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2441      +/-   ##
==========================================
+ Coverage   42.62%   43.27%   +0.64%     
==========================================
  Files         332      341       +9     
  Lines       13212    13425     +213     
  Branches     1736     1765      +29     
==========================================
+ Hits         5632     5809     +177     
- Misses       7302     7340      +38     
+ Partials      278      276       -2
Impacted Files Coverage Δ
browser/src/Input/KeyBindings.ts 1.92% <0%> (-0.1%) ⬇️
browser/src/Services/Sidebar/SidebarStore.ts 45.28% <0%> (-0.44%) ⬇️
...rowser/src/UI/components/VersionControl/Branch.tsx 96.29% <100%> (ø)
...src/UI/components/VersionControl/CommitMessage.tsx 100% <100%> (ø)
browser/src/UI/components/LoadingSpinner.tsx 100% <100%> (ø)
.../src/UI/components/VersionControl/SectionTitle.tsx 100% <100%> (ø)
...rowser/src/UI/components/VersionControl/Status.tsx 100% <100%> (ø)
.../Services/VersionControl/VersionControlProvider.ts 100% <100%> (ø)
browser/src/UI/components/LightweightText.tsx 49.05% <100%> (+15.72%) ⬆️
...src/Services/VersionControl/VersionControlPane.tsx 47.89% <42.3%> (-5.17%) ⬇️
... and 23 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f475061...e0aa2a5. Read the comment docs.

event.preventDefault()
currentWindow.webContents.send("open-oni-browser", url)
})
if (!isDevelopment) {
Copy link
Member Author

Choose a reason for hiding this comment

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

This fixes a bug which was preventing hot reloading, since this was active in dev hot reloading would try to reopen index.html in oni's browser rather than letting electron reload the browser

@akinsho akinsho changed the title [WIP] Feature/add git commit functionality Feature/add git commit functionality Jul 20, 2018
@akinsho akinsho requested review from CrossR and bryphe July 21, 2018 11:05
@akinsho
Copy link
Member Author

akinsho commented Jul 22, 2018

@CrossR when youre able would love some feedback on this, it adds the ability to commit by hitting enter on a staged file or on the commit all row then renders a little spinner while that happens.

Still leaving out the ui improvements till primer/octicons/pull/228 is merged

Copy link
Member

@CrossR CrossR left a comment

Choose a reason for hiding this comment

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

Code and test looks good, and worked fine when I gave it a test!

Noticed that unstaging etc is missing, but looks like it logged on the project, so at least we have it noted down somewhere.

@akinsho akinsho merged commit ecbd4af into onivim:master Jul 24, 2018
@akinsho
Copy link
Member Author

akinsho commented Jul 24, 2018

@CrossR yeah I've decided to leave unstaging and uncommitting since this PR was already quite extensive 👍 but I've logged it and it's probably the next bit I'm going to work on.

@akinsho akinsho deleted the feature/add-git-commit-functionality branch July 24, 2018 15:44
@akinsho akinsho restored the feature/add-git-commit-functionality branch October 1, 2018 09:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants