Change-Id: I99df9765da1ba68c449f8879c8262c3ca3fbc28c
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

We need read i18n.commitEncoding value, to write correct encoding of the commit file.
In Windows OS, the default encoding is GBK, So we need convert to correct encoding of the commit messages.

Change-Id: Id5f35745dba15da2c9ceb1266e0ea537cba7da73
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Task-number: QTCREATORBUG-6262
Change-Id: I2095e4244b145e57e901fa9d6ca6adbcb10aa0c0
Merge-request: 402
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6510
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

This fixes a incompatibility with the config settings.

Change-Id: I518291af2309acfaba7eea78b22519c283114009
Reviewed-on: http://codereview.qt-project.org/6161


Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

VCSBaseClient handles saving of settings for us, but we do not
use that yet, so we have to do that ourselves:-(

Change-Id: I731d01d429497581fad814effd68bbd784e05fe8
Reviewed-on: http://codereview.qt-project.org/6080


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Use VCSBase::Command instead.

Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb
Reviewed-on: http://codereview.qt-project.org/6079


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef
Reviewed-on: http://codereview.qt-project.org/6073


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24
Reviewed-on: http://codereview.qt-project.org/6071


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: I554e46cc5e3c1b55bc245f20f7f9541103afb8c5
Reviewed-on: http://codereview.qt-project.org/6070


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Icf23c7c3c1c8858d281434f519accc96984cdd09
Reviewed-on: http://codereview.qt-project.org/6069


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Merge-request: 385
Reviewed-by: Tobias Hunger <tobias.hunger@gmx.de>
Change-Id: Id3ad9b6153ca9ca1133f0f3a90fe63ecf6525caa
Task-number: QTCREATORBUG-5749
Reviewed-on: http://codereview.qt-project.org/5158


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Make sure all the proper arguments are applied when bringing a git
diff/show/blame editor to the foreground.

Task-number: QTCREATORBUG-5176
Change-Id: I4ca603311335ac4e591ba38a690f1f3a27725e8f
Reviewed-on: http://codereview.qt-project.org/5157


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Make initialization/cloning of a repo trigger an updateActions.

This is needed to e.g. enable git actions after a git repo is created.

Reviewed-by: Hugues Delorme
Change-Id: Ia8513a216e584fe8e512fdd5d6215aa96c075f3f
Reviewed-on: http://codereview.qt-project.org/4878


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Fix initital evaluation of ignore-whitespace and patience flags in
git diff.

Task-number: QTCREATORBUG-5176
Change-Id: Ibe3652ca6426fbc6e7187140b1d101afbec6c5ae
Reviewed-on: http://codereview.qt.nokia.com/2509


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389


Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Task-number: QTCREATORBUG-4942
Change-Id: Ifd8586e110379a621c43233fe9b912bd82f7f28a
Reviewed-on: http://codereview.qt.nokia.com/218


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Move the call to force readOnly to before the activation for the editors
that had it after their activation call.
Not having signals, currently dynamic changes of the editor read only
state are not really supported, and on windows some actions remained
activated.

Task-number: QTCREATORBUG-4774
Change-Id: I09a84c6e558ddf61aeedb928f8688f6ed65e89c0
Reviewed-on: http://codereview.qt.nokia.com/20


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Reviewed-by: Leena Miettinen

Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2

lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619

... and have the project wizard update the available VCS.

Task-number: QTCREATORBUG-4423

Reviewed-by: Pawel Polanski

Implement in git. Add infrastructure to revert single chhunks
by using patch -R. Currently only implemented in git since
only that has functionality to re-run diff.

Rubber-stamped-by: hunger <tobias.hunger@nokia.com>

Cleaned up some hacky code in the process.

Done-with: Tobias Hunger

rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings

Fix git show using the default format the first time it gets used.

Task-number: QTCREATORBUG-3412

Reviewed-by: hjk

Task-number: QTCREATORBUG-3390

If we have some git operation in an editor already: Bring that to
the foreground.

Allow for pretty format selection in git show.

Save selected value and default to "email".

Task-number: QTCREATORBUG-3341

Add tooltips to the toggles found in the Git Blame and Diff editors.