It is the only user now, after the branch dialog was removed.
Change-Id: I3aa8409efeb52427cdc13799146c4aa87273b169
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This allows all kind of typical Git workflow (rebasing,
merging, cherry-picking) without having the branches dialog
on top of all windows.
Task-number: QTCREATORBUG-19618
Change-Id: Iab078d79a589ff60fa8385c98ec2a23b352c084c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Tries the following:
* <git binary path>/gitk
* If git path ends with bin [or usr/bin, or mingw*/bin], try ../[../]cmd
* Search gitk in the PATH
Task-number: QTCREATORBUG-1577
Change-Id: I7f5e3d490bfeb527e2a5c1720126f1345e07eee0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
When adding existing untracked files to a project, and choosing to add them
to Git, error messages appeared in the output pane.
Change-Id: Iba639a678d2ca424fb32b34b218fca1c4b99971d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
When merge.tool is not configured, mergetool is not started, and the
following message is displayed:
This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge
ecmerge p4merge araxis bc codecompare emerge vimdiff
Merging:
test.cpp
Normal merge conflict for 'test.cpp':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (vimdiff):
On Windows, vimdiff is the default, and since it is textual, if we use it,
we have no way to pass any input for it, then we reach a dead-end.
On Linux/KDE (if DISPLAY is set), Git defaults to kdiff3. This is better,
but we cannot count on it even being installed.
Just abort with a warning on this case, and let the user [install and]
configure the preferred (graphical) mergetool.
Change-Id: I7144d9348a4d1ee03176b71b4ac2242b16795403
Reviewed-by: André Hartmann <aha_1980@gmx.de>
If the user is changed, we need to refresh at least the fallback server.
Task-number: QTCREATORBUG-20536
Change-Id: If21830ae5607907db9aaee164bc85b971ff93010
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
The commit operation itself [un]stages files before actually committing.
The model has to be refreshed after that.
Change-Id: I4b765005640b62812687d4f003d94af3717c379e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Let the server retry authentication on next update.
Change-Id: I22d9fcde2b501fc7c9b9d86bb9b656c73d3ee840
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
It is often possible to user (member) functions or members directly.
That improves readablility and potentially reduces the total number of
symbols.
Also use qobject_container_cast at places where it is appropriate.
Change-Id: Ia2591bca356591e001e2c53eeebcf753e5bc3c37
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
For rebase/merge strategies, this can cause real problems (when the target
branch is forwarded to a more recent branch...)
Task-number: QTCREATORBUG-20062
Change-Id: Ic7c282a1e0571b31d9333290141817c59daa0e7a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Otherwise when "this" instance
gets deleted and the sender still exists, the lambda
expression is still invoked for the deleted object.
Task-number: QTCREATORBUG-20223
Change-Id: Ifd5c9e6ce1fe7fde71698c6683cdfcd7566e8d35
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
And instead interpreted the ampersand + following character as an
accelerator key.
Task-number: QTCREATORBUG-17817
Change-Id: I327239499ce56e75fd12f2df5be60d4b04913acd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Don't store diff file index, chunk index and diff editor
controller anymore. Pass needed indices by value,
retrieve them when needed as lambda copy.
Change-Id: I3a81f1ab6d131c0b1d9899ac4b061b6e25582f51
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
