Commit Graph

1186 Commits

Author SHA1 Message Date
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
Orgad Shaneh
b79449bedd Git: Fix mergetool prompt replies
Task-number: QTCREATORBUG-12335
Change-Id: I68c36412f517072f551102b53cac2eeeff22f1e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-03 12:03:43 +02:00
Eike Ziller
7c34567cb2 Merge remote-tracking branch 'origin/3.1' 2014-05-28 11:03:18 +02:00
Tobias Hunger
7e47a8a453 Cleanup: Remove searchKeywords from optionspage widgets
If no specialization is provided then the UI strings are searched.

So get rid of extra code collecting all those strings in a lot of
places.

Change-Id: Ibcb48a67e5c7b74e5960fe38b1cb2f74259b503a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-26 15:24:24 +02:00
Orgad Shaneh
a3da1dfce5 Git: Fix handling of Enter key on LogChangeDialog
Broken in 7e59415f

Change-Id: Ibbcd784965d101207ef873b1ba4d6d45e865c8b9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-26 15:23:47 +02:00
Orgad Shaneh
8cc909a84c Git: Suppress command logging for tooltip display in branches dialog
Change-Id: I933a68c566a9acd40913ccc78363645572aa8ff8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-26 15:23:19 +02:00
Orgad Shaneh
5125a47955 Git: Remove redundant null validations
Change-Id: I6977b7c7633191d768c39d0bfff43c8aedecae9d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-26 15:20:27 +02:00
Orgad Shaneh
560fd9bce9 Git: Fix tab order in gerrit options
Change-Id: I6169b97ebbc412e41cf42d3c4d87d0b9c8ddd93e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-26 15:12:07 +02:00
Tobias Hunger
434ecd6215 Vcs: Use Utils::FileName where possible in the CheckoutWizards
Change-Id: I7e90f2c3468099229620d6713b39b69d8dbe8ff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:45:08 +02:00
Tobias Hunger
8e126df545 BaseCheckoutWizard*: Move createCommand from factory into Wizard
Change-Id: I0dcc931f279b59f0d6cf7afb553a2fed30baae7a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:44:43 +02:00
Tobias Hunger
719d39d372 Vcs: Remove propertyPages from wizardFactory
Change-Id: If9d3249818b024a1a873fd3f78190379c050ac66
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:44:32 +02:00
Tobias Hunger
dae8df0567 Vcs: Make checkout wizards work, even when VCS in unconfigured
They used to grab the first page in the set of pages and that
is the VCS setup page if the VCS was not configured before the
wizard was started. Then the wizards just stopped.

Change-Id: I8ea5bc373c07fb5c68a4814396864de6b8413747
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:44:16 +02:00
Tobias Hunger
6644a08c21 VcsBase: Remove BaseCheckoutWizard::setCustomLabels()
Also assert that d->wizard is not in use already and use d->wizard
consistently.

Change-Id: I85599f80e92edb2a0a0fc52c5fed1e484d0beac9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:44:08 +02:00
Tobias Hunger
e9526eadb8 Vcs: Add method to create a Wizard to the WizardFactory and use it
Implement it in all VCS that support this type of wizard

Change-Id: I78b0e4a37e6bf6b25d8cee4b1e96bcc76188047a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:44:00 +02:00
Tobias Hunger
67c2c77a99 Vcs: Append "Factory" to the variaus checkout wizards
Change-Id: I571717a389c63f4f0371570e22d3f2a834e8b900
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:43:48 +02:00
Tobias Hunger
b4965ba023 Rename basecheckoutwizard.* to vcsbase/basecheckoutwizardfactory.*
Change-Id: I9f607b9d27b52fbbc26ae601e7a36c30bcc3df59
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:42:58 +02:00
Tobias Hunger
776eb92fa9 Rename BaseCheckoutWizard to BaseCheckoutWizardFactory
Change-Id: Ide131cbfa27640875bb16f82a1992cf2975c5083
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:42:39 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
2014-05-16 16:54:50 +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
Alessandro Portale
551f7e1caf QString(QLatin1String()) -> QString::fromLatin1()
Change-Id: I93bdd926ca1c7a37a298335711069d985f1f91dd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-09 09:03:19 +02:00
Tobias Hunger
fe37b2788b Git: Do not crash when closing creator after reverting all files in a commit
Keep the commit editor around and disable it instead of closing it. That stops
Qt Creator from closing the editor when bringing the commit editor to the
foreground to ask whether it should be closed.

Task-number: QTCREATORBUG-12099
Change-Id: I6927424675338f845f504cb6f630f05eaf8ad49f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-08 14:16:05 +02:00
Orgad Shaneh
98ebe37e21 Git: Remove redundant null validation
Change-Id: Id4b8629fcb0c4b7d26d849bc15ab0cbd61c19fd2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-06 15:33:02 +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
Tobias Hunger
4278fd0af2 Git: Return true when asked to close a editor that is not open
Change-Id: I645c371c0ca94cef9885475f580ed463fc643b2a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-05 18:34:23 +02:00
Alessandro Portale
7d40ce845e Remove QHeaderView::setDefaultSectionSize calls
Do not set the row height in pixels, since that
will break in High DPI situations. We do that for
some QTableViews, apparently as an obsolete
workaround.

QTableView does the right thing by default,
therefore we don't need to set that value at all.

Task-Number: QTCREATORBUG-11179
Change-Id: Id90f01316f8359207796a4060cb43b0aba93d441
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-05 14:25:07 +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
Eike Ziller
063b95d970 Use more descriptive progress bar titles
Change-Id: I70450a2aa675d69f820de48dd75909f36051efe0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-28 14:32:25 +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
1edc65cc1b Git: Avoid superfluous execution of git status on commit
Change-Id: I1cba2902165a36bd313672c5b0e15333da71cd6e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-25 14:15:30 +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
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines.
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-22 10:06:40 +02:00
Daniel Teske
7e59415fd5 LogChangeWidget: Fix keyboard navigation on all platforms
Change-Id: I42858fd8aa8b5403e0d2a0639a6fe9fe5817f4a6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-16 14:57:05 +02:00
Daniel Teske
094a309a10 GerritDialog: Fix keyboard activation
Open the change in a browser on Return/Enter

Change-Id: I6ed6d832e3bebf625adb3765415929cc0670d4e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-14 12:08:29 +02:00
Daniel Teske
c17ddb7766 Git: Fix keyboard activation in StashView
Change-Id: I8ad4991b17e2cf60e73278db13c0ac403e35807c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-14 12:08:16 +02:00
Orgad Shaneh
d24e509662 Gerrit: Some more cleanup
* Remove qualification for types in Gerrit::Internal
* Remove action/command pair. Action is stored in Command.

Change-Id: I946bedd3909e217279e9d7a538e8460e0a61de0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-07 10:14:32 +02:00
Orgad Shaneh
c79413a4bd GitPlugin: Reserve enough entries for repository actions
There are currently ~40 actions. Reserve some extra for future use.

Change-Id: I50284105f4f11df43ed5fb8b246b4a457f2447c1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:07:48 +02:00
Orgad Shaneh
17d2605951 Git: Disable "Actions on Commits" when there is no repository
It does nothing in this case anyway

Change-Id: I9b8ab5280375f10b3bd943855648a0a2946a4094
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:07:29 +02:00
Orgad Shaneh
0eb363f959 Gerrit: Use current top level as default repository
* Remove repository setting
* Disable Gerrit menu entry if there is no top level

Change-Id: Ie3f4ca36ae4e7b350034dea7a0de52382da94e90
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:06:50 +02:00
Orgad Shaneh
f7db3258b4 Gerrit: Remove the "Always prompt" setting
It's confusing. The user can just choose the path in the dialog rather
than in a popup

Change-Id: I91422ec9baf5508d3e3d2e552afc6b955fd84748
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:06:35 +02:00
Orgad Shaneh
e75cd440ed Gerrit: Cleanup GerritPlugin
* Use Git::Internal namespace
* Use a static function for accessing GitClient
* Avoid needless data() calls for QSharedPointer

Change-Id: I590b75bbee4831be368894c1844c29237e7800eb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-03 08:43:04 +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
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +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