Commit Graph

648 Commits

Author SHA1 Message Date
jkobus
a9f00ac145 GitClient: use "git show" for show instead of "git diff"
Task-number: QTCREATORBUG-12755
Change-Id: Idc4427425a3ef3e70c8738f1062e20d50bab69ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 14:24:58 +02:00
jkobus
afea017c80 DiffEditor: Fix double click inside commit editor
The bug was that if you double-click a file
in the commit editor, then double-click another one,
the diff remains with the first one.

Change-Id: I1f49b549c9dfd3ebd4ec6950ed28dd8cbc7d0227
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-12 10:30:01 +02:00
Oswald Buddenhagen
f3a61e8bf7 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
2014-08-05 14:24:23 +02:00
Orgad Shaneh
117436a65a DiffEditor: Use explicit DirectConnection for context menu
The menu is expected to be populated after the signal is emitted.

Change-Id: Ibcb9eaf3742942801ad79b98000d48cb93d5ae31
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-08-04 09:26:32 +02:00
Orgad Shaneh
7a7690f0ec Git: Parse for-each-ref output as UTF-8
Adding a branch with non-ascii chars then refreshing the branch list on
Windows invalidates the branch name.

Change-Id: I59d3e092c66fdcc7cea38a8451de6b5e42cd5de0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-07-30 09:12:44 +02:00
Eike Ziller
0374a9782e Merge remote-tracking branch 'origin/3.2' into HEAD
Change-Id: I257bb9310bb3bde493aff4cd43091ec63fcb5203
2014-07-22 16:11:40 +02:00
Orgad Shaneh
933fd51225 Git: Fix soft assertion on Abort Rebase
When a rebase was initialized in a previous session or by
command-line.

Change-Id: I1a185f1bf1a9caeeba0d8358debc855cbd926d48
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-22 07:51:58 +02:00
Eike Ziller
c571ecbd51 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/git/changeselectiondialog.cpp
	src/plugins/git/changeselectiondialog.h
	src/plugins/git/gerrit/gerritplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/git/gitclient.h
	src/plugins/git/gitsettings.cpp
	src/plugins/git/gitsettings.h
	src/plugins/git/mergetool.cpp

Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791
2014-07-18 14:04:51 +02:00
Orgad Shaneh
febdfeb92f Git: Rename gitBinaryPath => gitExecutable
Avoid confusion with gitBinDirectory

Change-Id: I335cf6bc82284e02e0652b057f0b80f292d6ddc0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-18 11:19:54 +02:00
Eike Ziller
bc823443ea Fix broken merge
Change-Id: I21822285d2213a24ea80bb4a03c75a2cee5d4a9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-17 12:55:01 +02:00
Eike Ziller
e7ea94b688 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
2014-07-17 12:42:04 +02:00
Orgad Shaneh
71b56d2b9c Some QString -> FileName transformation
Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-16 12:44:01 +02:00
Orgad Shaneh
54db877297 Git: Factor out resolving of bin directory on Windows
Change-Id: Ifbafa0f5cb8329faedfd1da3674b87e46001acc3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-16 12:43:32 +02:00
jkobus
5ebd59d12b Rename some methods and variables in DiffEditor
Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-07 10:34:17 +02:00
jkobus
91e4271069 Hide reload button for diff editor when there is no reloader
Refactor code a bit. Now DiffEditorController has a pointer
to DiffEditorReloader.

Change-Id: I224579127f112923bc665cd59717b0c4d833981b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-07 10:34:11 +02:00
Orgad Shaneh
0544f9dd05 Git: Replace findRepository with VcsManager::findTopLevel
Take advantage of its cache

Change-Id: Ibf3b3b59821a92cd4475c6f8d6dd8212983d5c96
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 11:04:49 +02:00
Orgad Shaneh
7ba734162c Git: De-noise GitClient
Change-Id: I9b001bd47af826a3c4611071ca0b3a0674079b01
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-07-03 10:21:10 +02:00
Orgad Shaneh
44f9e3678c Git: Fix double-clicking a diff chunk in Show invoked from Blame
Change-Id: I31ba36245b8b62b9d1e3c4a9125dec5ce6610766
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 10:15:30 +02:00
Christian Kandeler
93304df038 Always pass Core::Id by value.
Currently we pass in some places by value, elsewhere by const ref and
for some weird reason also by const value in a lot of places. The latter
is particularly annoying, as it is also used in interfaces and therefore
forces all implementors to do the same, since leaving the "const" off is
causing compiler warnings with MSVC.

Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-01 11:52:08 +02:00
Orgad Shaneh
398872bcdc Git: Fix showing commits from rebase-todo editor
We used to need the repository root in order to resolve the file.

This is no longer needed, since the raw patch is parsed instead.

Change-Id: Ifdbbcd686a5ef7bbbd472f37b20190b9e9abebe7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-30 11:19:33 +02:00
Orgad Shaneh
f3106ebafe Git: Use a separate thread for updating commit data
Task-number: QTCREATORBUG-12449
Change-Id: I3057ca458272daac72c54abce1d6f9acf6a5d4af
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 12:00:22 +02:00
Orgad Shaneh
d6583f0f47 Git: Add on-demand branches expanding
Make "branches expanding" on demand and asynchronous.
After "git show" there is clickable text: "Branches: <Expand>" in
description. If user clicks this text then branches for commit is
triggered and done asynchronously.

Task-number: QTCREATORBUG-11293
Done-with: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Change-Id: I772cfef823d3f95e2b3060dfb5973157d81fc11a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 11:19:28 +02:00
Tobias Hunger
836e17a57c Revert "VCS: Open diff/blame editors in other split"
This change has lead to complaints about diff views opening
in apparently random places for users with several splits.

This reverts commit 02b3a79c5f.

Conflicts:
	src/plugins/diffeditor/diffeditorplugin.cpp
	src/plugins/subversion/subversionplugin.cpp

Change-Id: I2eab8ff2d88a9e12f4dc7ec3a9ca65455daf15e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-17 15:40:40 +02:00
Orgad Shaneh
4df7656394 Git: Preserve author on cherry-pick
Change-Id: Ib3184631145ed6c6eb72dd5b7c33e415fc0cc799
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-12 13:26:30 +02:00
Orgad Shaneh
e0196e38e2 Git: Replace string literal with constant
Change-Id: I457d69f1eac9810e2746d9f544151e421c147fac
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-12 13:24:00 +02:00
jkobus
8cad94534f Implement unified diff editor
Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-06-06 12:33:59 +02:00
Alessandro Portale
c3cb944eec Git: Native separators in GitClient::StashInfo::stashPrompt
Change-Id: I5090d8eb8f5e262785735ced81a12b9473721204
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-03 14:58:38 +02:00
hjk
6e584b5b49 DocumentModel: Make interface static
Move item model implementation to private, adjust user code.

Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 11:48:30 +02:00
Orgad Shaneh
642706dc44 VCS: Pass const values by references
Change-Id: I9749c0c76b810f3d5fee1aa8c5750dac5930cd3c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-06 15:32:52 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
2014-05-02 10:00:20 +02:00
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