This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Summary: | Add interactive/patch-level selection in git commit | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | tomacpace |
Component: | Git | Assignee: | Ondrej Vrabec <ovrabec> |
Status: | CLOSED INVALID | ||
Severity: | normal | CC: | erit01, git, MacDada, markiewb, terje7601 |
Priority: | P3 | ||
Version: | 7.3 | ||
Hardware: | All | ||
OS: | All | ||
Issue Type: | ENHANCEMENT | Exception Reporter: | |
Attachments: |
screen capture of xcode source commit
Partial "git add" GUI suggestion |
Description
tomacpace
2013-03-14 01:03:48 UTC
very difficult to implement in NB, but i guess we can try or at least evaluate how much work it would take makes sense for Subversion too. Created attachment 144222 [details]
Partial "git add" GUI suggestion
I don't know about NetBeans internals, but from the GUI point of view:
* NB diff window lists files – one can right-click on the file and select "add" to run "git add" on the file.
* NB diff window shows file's changes comparison – one could right-click on a change to "git add" only that part of the file.
This is one of the things that I notice sometimes when I suddenly start doing bug fixes while I'm also in the middle of a bigger feature. One possible suggestion how to implement this possibly easier is to do this in the Commit dialog itself. The "Files to Commit" section has a checkbox for each file and you can do file level selection of the modifications you want to commit. Now, the diff option of each file opens the "Diff" tab and you have the same diff view as in the GUI suggestion. In this view, you could exclude "hunks" as Git calls them using the same method as in the suggestion. Those sections would just drop off from the view - be it graphical or textual diff. The special part of this would be that in the file listing the selection checkbox would be tristate. Selected is a full file, partially selected is with only partial hunks and a fully selected is with all changes. Toggling the checkbox *after* you have removed a hunk from the commit would unselect it completely and toggling it again would select the file completely. This way you can quickly revert back to full changes and try again if you misclick. This also requires the least amount of UI changes even if the third checkbox state is shown differently as AFAIK there isn't a stock checkbox widget that does this. Would this make it any easier for first implementation or is all of the harder work under the hood, like pulling only partial differences off a file? I will close it, because it will handled now at the JIRA board: https://issues.apache.org/jira/browse/NETBEANS-428. Please discuss it there for further information. |