Commit Graph

568 Commits

Author SHA1 Message Date
Orgad Shaneh
954245c645 Git: Fix author encoding on amend commit on Windows...
... when i18n.commitEncoding is not UTF-8 and the author has non-ASCII
characters.

Change-Id: Ieec0a78f4d31b18f9ebda9c4a1fce4a0d5ecbb9b
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-28 14:12:50 +02:00
Orgad Shaneh
2a8350eca8 Git: Suppress command logging for internal git-remote calls
Change-Id: I8cd93d0f5fdcc685af1cf1526eecf97d3b19eeff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-25 14:15:19 +02:00
Peter Kümmel
65cd8ea4c2 Git: Fix config encoding on Windows
This fixes commit d72b4851b4
which has removed the conversion from Utf-8 on Windows.

Task-number: QTCREATORBUG-12092
Change-Id: I83c4d2d5eacb79ca99ef0b6f385344689582079e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-04-22 17:43:26 +02:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
Orgad Shaneh
187bb36945 Git: Continue command after failed merge tool attempt
Change-Id: Ic3b7d4aee51897e226a78979bbecb82f06095b2d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-27 15:11:44 +01:00
Orgad Shaneh
5101938974 Git: Remove branches from show header
It is too slow on large repositories. Will be revived in 3.2 with a
trigger button.

Task-number: QTCREATORBUG-11293
Change-Id: I6ba2028b280821b2acb49b7664ec9ece063c8981
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-24 13:25:35 +01:00
Orgad Shaneh
d72b4851b4 Git: Avoid QByteArray -> QString -> QByteArray conversions for encoding
Change-Id: Ib2eb3000a08021336c9071d35d499371c9b88976
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 14:30:09 +01:00
Orgad Shaneh
e6d0e6872d Git: Replace QStringList with QString in readConfig
All the calls pass a single argument

Change-Id: I95a7c44114ff2bb38cd65ab79a1e455dc969a62b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 14:28:41 +01:00
Orgad Shaneh
0d61ddce84 Git: Consolidate codec configuration retrieval
Change-Id: I6c099a5d0e4ffa180289bbecfe6d552b39d4aeaf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 14:27:47 +01:00
Orgad Shaneh
7872981d62 Git: Simplify commit message codec handling
Change-Id: I5f90d7f5a17ccbe8585efd8ac7f731440b10db61
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 13:44:58 +01:00
Andre Hartmann
ae09c33fdf Git: Use commit encoding for git show.
At least for the Side-By-Side Diff for now.

Task-number: QTCREATORBUG-11115

Change-Id: Ic7cb91f48ca810a99c39b2d00acc0cf227d051be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 11:54:04 +01:00
Orgad Shaneh
86d7916b5b Git: Factor out commitEncoding
Task-number: QTCREATORBUG-11115

Change-Id: I58f3759c13d963aaf3e7891d7cc0a41c1ae14ecd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 11:39:54 +01:00
Robert Loehning
991e1bfa0a VCS: Fix message in GitClient
Change-Id: I1184b15a8b225430b59e0abb35cd9395cb7d1850
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-17 21:12:36 +01:00
Tobias Hunger
02b3a79c5f VCS: Open diff/blame editors in other split
... if there are other splits that is.

Task-number: QTCREATORBUG-11623
Change-Id: Icb3b1c86c39d88e90916079e8ab347574ae9a361
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 16:02:14 +01:00
Tobias Hunger
c9b6897e78 EditorManager: Add OpenEditorFlags to openEditorWithContents
This requires moving the activateEditor call into openEditorWithContents.

Remove that line elsewhere when editors are constructed. Keep it when
reusing an existing editor though.

Change-Id: I872f03e16fde42f3b8adec2cf2344b7cc495cd08
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 15:56:43 +01:00
Sergio Ahumada
c375436847 Fix some typos
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-05 09:39:42 +01:00
Friedemann Kleint
b653ca1f18 Revert "Git: Replace %n with %1 in string"
This does not work, it needs to be either:

("%1").arg(n) or ("%n, 0, n)

The %n syntax is preferred here since although there probably
are always > 1 elements, some languages use different grammatical
cases for various numerical ranges (Russian, Polish).

This reverts commit c09e80b853.

Change-Id: Id3f480f0ec0de2dd8893b8de256c5e6c9628a6f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-28 15:35:32 +01:00
Orgad Shaneh
c09e80b853 Git: Replace %n with %1 in string
There is no plural form in this message

Change-Id: I85b584d4e53e68128279d50cb6b63e259f7a35b5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-28 10:37:56 +01:00
Orgad Shaneh
1817c48c7b Git: Use git describe for topic before falling back to "Detach Head"
Change-Id: Iaf8be78ac3b6119f01ad3491eec7eccfa5f45e26
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:44:54 +01:00
Orgad Shaneh
5c942d04c5 Git: Suppress show-ref command logging
Yet another plumbing command...

Change-Id: I88ba2349d8c15e47372addb3034f1bed2de170f2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:43:38 +01:00
Orgad Shaneh
cd48c5e513 IVersionControl: Implement topic cache in the base class
Derivatives need to derive TopicCache, implement its pure virtual
functions and pass it in IVersionControl's constructor.

Change-Id: I3a904c84541fda95eee75296f86441c4bae55d79
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-19 09:25:31 +01:00
hjk
c68ebeed2e QtcProcess: Introduce a QtcProcess::Arguments class
This is used to get a platform-agnostic handle on "command line
arguments". It essentially wraps a single QString on Windows,
and a QStringList everywhere else.

As a consequence, several occurrences of #ifdef Q_OS_*
can be removed from the codebase.

Change-Id: Ic93118c1bd0bce0ebb58f416d395dbaebb861772
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-02-19 09:19:28 +01:00
jkobus
73cf43f323 Add DiffEditorManager, refactoring.
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).

Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-18 13:46:49 +01:00
Orgad Shaneh
b7d2268ff3 Git: Suppress log output in LogChangeWidget
It's distracting

Change-Id: I6c522ee61ba7261611002bf40c01a9d1d23a0259
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:42:42 +01:00
Orgad Shaneh
0bb318939b Git: Suppress for-each-ref
Another plumbing command

Change-Id: I1450baae370e46e8daf5c440def7e9f04d9d01bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:42:37 +01:00
Orgad Shaneh
6db52645b9 Git: Silence rev-list execution
It's plumbing. Not interesting for the user.

Change-Id: I65bb7849c64f32ac24684715290acf26441c5d2b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 12:06:12 +01:00
jkobus
7267c95acf Fix a crash on "Switch to Text Diff Editor"
Task-number: QTCREATORBUG-11448

Change-Id: Id0239d5cf71ff857ac384e18136348df92a98b74
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-11 11:40:46 +01:00
Orgad Shaneh
346f0c3177 Git: Remove unused functions
Change-Id: I279dcf1ee1c1fe16d3a1fd866af4f9cc4a8c9070
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-10 10:44:25 +01:00
Orgad Shaneh
757a5a2867 Git: Detect rc versions
Rename local vars to avoid collision with macros defined in
<sys/sysmacros.h>

Change-Id: I6da7354102cca898d2600296242131e4c343c019
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-06 11:10:09 +01:00
Jarek Kobus
edac8f082d Get rid of DiffShowEditor.
Made DiffEditor customizable instead

Change-Id: If92799d47c7e731febb45197384c082eb3af55df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-01-30 19:13:48 +01:00
Jarek Kobus
c18fa9112b Rename DiffEditorWidget -> SideBySideDiffEditorWidget
It's the preparation for the new UnifiedDiffEditorWidget

Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-01-30 17:13:14 +01:00
Eike Ziller
cdd19fe6ad Merge remote-tracking branch 'origin/3.0'
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

Change-Id: If62ec06ea069a7eba6735101e5334b0c1f66861f
2014-01-20 14:21:46 +01:00
jkobus
a74b59ffd6 Add DiffEditorController
Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-16 14:36:53 +01:00
Petar Perisin
3a3dbb3746 Git: Fixed bug with branches missing from a list
Change-Id: Id4fa9f6c4f874c9b1ac5112efceaf0c22ed84d00
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-01-16 00:52:54 +01:00
Orgad Shaneh
5eff132253 Git: Pop stored stash after checkout
Change-Id: I41eda91149c0152fd0b9f3d2c0294120153377b5
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2014-01-15 08:19:15 +01:00
Petar Perisin
27ce04bb5b Git: search for gitk in path if all else fails
Change-Id: I4799791b2baffa61092c01699a4128f01151b53c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-01-14 18:13:34 +01:00
Orgad Shaneh
df9299fd24 Git: Do not hang on Continue Cherry-Pick/Revert
...after conflicts resolving

Change-Id: I02637e19d1f5b595b2c63d8e001c0df6af94a347
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-14 11:11:29 +01:00
jkobus
1d954b1b2a Get rid of DiffEditor::editorWidget();
Change-Id: I3078002359871dad74d4a07924d5beeaeb9f82ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-01-13 13:32:10 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
jkobus
0d13028440 Refactor source property
Get rid of source property out of DiffEditorWidget,
attach dynamic property when it's needed instead.

Change-Id: I6641a7b55c42b4eceba78c2e28f5140b40fe0fa5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-12-19 14:06:51 +01:00
Orgad Shaneh
4a5af14b7f Git: Enable choosing non-fast-forward merge
Change-Id: I5972489d06637616953bd0d93a3b65c4d9918377
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-12-09 11:14:02 +01:00
Eike Ziller
072d551c73 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
2013-12-05 11:58:42 +01:00
Orgad Shaneh
0a71091260 Limit cdUp to root
Task-number: QTCREATORBUG-10860

Change-Id: I22550b4415e07cac0d78f36595dc7ee781a837c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-03 14:42:07 +01:00
Eike Ziller
0e4de8c108 Merge remote-tracking branch 'origin/3.0' 2013-11-29 11:50:41 +01:00
Friedemann Kleint
6ec8838f68 git: Suppress stderr when running diff on Windows.
When using autocrlf, warnings
"LF will be replaced by CRLF in ..."
occur, causing the command window to pop up, which is not
desired.

Change-Id: I399080a98f9386dbbaff2c90c6d4ba4877d08057
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-28 13:41:52 +01:00
Friedemann Kleint
6c02c27e9e Change GitClient::executeGit() to take flags instead of bool.
Change-Id: I3cb83914be7e9665f49baf9f563c753c6c3919f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-11-28 13:25:45 +01:00
Eike Ziller
559e66cb35 Merge remote-tracking branch 'origin/3.0' 2013-11-22 09:11:51 +01:00
Petar Perisin
390e90a07a Git: Fix ability to open file on double click
since show can be called with file name as source, we get its
repository as source in diffhandler

Task-number: QTCREATORBUG-10780
Change-Id: Ib0076c583eb5d43e66deb68adfdff1d25fc5a798
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-11-22 05:08:35 +01:00
Eike Ziller
8fe04ce0ad Merge remote-tracking branch 'origin/3.0' 2013-11-19 07:41:47 +01:00