Merged
Conversation
diegoiast
force-pushed
the
git-commit
branch
from
b6ac162 to
84872d9
Compare
We have a list of modified files, and basic layout. Next step is displaying the diff of current file - then link the preview with content of file.
When selected - a file, the diff of that file is displayed. We use the Qutepart, same as the main editor. That editor also shows the syntax of diff. I should use the text editor plugin to create the editor. This way the settings would follow, and double click would work (open the correct file).
I can revert a single item, and multiple is coded, but not tested yet.
1) When running git - return also the exit code. 2) (fix code compilation) 3) If on revert this fails - do not update file list. 4) Handle revert of single, and multiple file.
If you open a commit window, it will get restored when the app restarts.
There are some regressions on finding the repo root.
When the commit form now queries the text editor plugin, and creates the mdi editor from it. Now the settings of the editors, will be used for the diff viewer. Problems: - Clicking a diff, does not open the corresponding file.
I just needed to setup the mdi host on the editor.
The revert comand asks for confirmation.
I tested a simple commit on a dummy project, all seems to work.
Original code used ranges, which is not properly supported on Ubuntu 24.04. Use older code, which IMHO event looks nicer.
At some point I messed up logs of file and project. Fix is easy, just use the full filename. Git will do the correct thing.
If this is a new (or deleted) file - try to display it (if its text). Honor the highlighter of said file. Implementation is not ideal, as we brake abstractions. FIXME is in some places.
I keept seeing on the build console: ``` Warning: The name 'layoutWidget' (QWidget) is already in use, defaulting to 'layoutWidget2'. ``` Each time I create a layout, QtDesigner would host it inside a QWidget, which is not visible in the UI. The solution is to edit the XML by hand. Now those logs are gone.
Seems like all git commit forms are in monospaced font. Lets fix this. In a future iteration will need to do more cleanups - and use an editor with markdown style (?) or something more dedicated. I know that for example, the first line should not be more than 75 chars (that is what is the linux kernel use). (also - commit message is not saved in state, but this is another problem I will tackle later on)
diegoiast
force-pushed
the
git-commit
branch
from
89b0cd5 to
66c74dc
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds ability to commit within the IDE. I have been using it locally - so the basics are on. I am working on usability and cleanups.