summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase
Commit message (Collapse)AuthorAgeFilesLines
* VCS: Remove trailing return type of lambdaNikolai Kosjar2018-10-161-1/+1
| | | | | Change-Id: Iba1033ed5eaaf68815ac83a91a514845c0f2347a Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Clang: Avoid starting backend jobs for inactive app and during VCS operationsNikolai Kosjar2018-10-161-2/+7
| | | | | | | | | | | | | | | | | | | | | ...to reduce file locking on Windows caused by clangbackend's parse/reparse jobs. Considering inactive application state should help for external VCS operations, e.g. on the command line. However, activating Qt Creator while such a VCS operation runs might still lead to undesired behavior, but this should be the less common case. VCS operations started from within Qt Creator should see less locking conflicts as we know when they start and finish. However, we just avoid starting new jobs - there might be still jobs running. Pending or new jobs will be started once Qt Creator is activated again and all VCS operations finished. Task-number: QTCREATORBUG-15449 Change-Id: I5f04c34f006e66162368efbdd58bd822a706f35e Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* Remove hard-coded disabling of debug logsOrgad Shaneh2018-10-131-3/+3
| | | | | | | | | | | Instead, set the default level of all logs to QtWarningMsg. The call to setFilterRules overrides the user preferences in qtlogging.ini. Change-Id: Id5f6cd550d14ff7f45ae04c5d3110e0bafb0f072 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: hjk <hjk@qt.io>
* VCS: Re-add state loggingOrgad Shaneh2018-10-131-0/+2
| | | | | | | | Recovers logs that were removed in 05312bfeeccdc86fd51a4c5b8c9466337c40c36a. Change-Id: I4f433795917ee331623ead8f465ef26f53bed229 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* VCS: Use category loggingOrgad Shaneh2018-10-131-14/+13
| | | | | | | + clean the logs a bit. Change-Id: I5a196f7007eb2b76bcdce4b2ac152da84698b860 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* VcsBase: Fix order of toolbar widgetsOrgad Shaneh2018-10-111-3/+1
| | | | | | | | | | | | Git Blame has an additional widget, which is added before the refresh button, but it still appeared after it. It looks like insertAction was left there for historical reasons. Replacing it with addAction doesn't affect the widgets positions, and they're still placed before the line/column widget. Change-Id: Id6b658b5c3c8a8bb256e03e13536865f007d41bf Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Core: Change IEditor::document() to constOrgad Shaneh2018-09-262-2/+2
| | | | | | | All the implementations are const. Change-Id: Ib9753fe764dd482d4f4392eec70878d42edc737a Reviewed-by: hjk <hjk@qt.io>
* VCSBase: ModernizeOrgad Shaneh2018-09-2019-189/+144
| | | | | | | override, auto, nullptr, member initializers. Change-Id: Ie21b8f4a4d6673947d82619bc3de677fcea63d7f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Git: Support move/copy detection for blameOrgad Shaneh2018-09-191-7/+11
| | | | | | Fixes: QTCREATORBUG-20462 Change-Id: Ib2ea14de6a60691a1ed27cd07aac282557d69015 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Avoid accessing global font settings from syntax highlightersEike Ziller2018-09-191-1/+1
| | | | | | Change-Id: Ic015f7449351166ec41a7745355ddc63504f6442 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: David Schulz <david.schulz@qt.io>
* Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-09-141-2/+5
|\ | | | | | | Change-Id: I562b0b8afb98940e03b67cbd7d7c3e756b77d736
| * Fix colorization of change numbers in VCS annotations (like git blame)Eike Ziller2018-09-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax highlighters get information on which text char format they should set, which is not necessarily equivalent with the resulting color in the editor. Currently the only way to explicitly get the color, is through the global text editor settings. Fix-up of 601eebd832e8f8a39d661031a44d5ee3c53bf718 Task-number: QTCREATORBUG-21041 Change-Id: I8fb6e79500d490438b2ccd27b162a3b80822c1ee Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | VCS: Consolidate submit editor actions setupOrgad Shaneh2018-08-283-6/+47
| | | | | | | | | | Change-Id: I36754779b6a9aa35de705b368daf8c2a1de058c6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | VCS: Remove unused unregisterActions functionsOrgad Shaneh2018-08-284-42/+0
| | | | | | | | | | | | Change-Id: I4c7a0dfc93f27f93cdbd84d7e027e63db05341e8 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | VCS: Capitalize commitDisplayNameOrgad Shaneh2018-08-281-2/+3
| | | | | | | | | | | | | | | | To be used by the submit editor. Change-Id: I73fc13abfd37f207d92669c1893b7edda35ed1e4 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | VCS: Use namespace UtilsOrgad Shaneh2018-07-1810-76/+92
| | | | | | | | | | Change-Id: I41c818362398fd194995baf5b1adb16899e83217 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Prefer using 'override' instead of 'virtual'Alessandro Portale2018-07-111-1/+1
|/ | | | | | | | warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' [modernize-use-override] Change-Id: I6dac7a62b627fa1353b4455e1af92f869c2571cc Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* VCS: Fix off-by-one line in blameOrgad Shaneh2018-07-021-4/+4
| | | | | | | | Line is blockNumber()+1. When executing blame, the cursor jumps to one line above the selected line. Change-Id: Ia28b6c5a353ee979fae3f463b864d1409d9649cd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* VcsCommand: Block auto reload while a command is runningOrgad Shaneh2018-06-271-0/+9
| | | | | | | | | | | | | Git rebase is executed in the background, and it can change a file multiple times in a short period. If we reparse a file while this happens on Windows, Git fails to replace it, the rebase action fails and the repository becomes unstable (remains with a modified file). See discussion at https://github.com/git-for-windows/git/pull/1666 Task-number: QTCREATORBUG-15449 Change-Id: Iba40a770a1df2dfff0dd1c874c491dfbe1cceb58 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix that bookmarks couldn't be added to .pro files with mouseEike Ziller2018-06-191-0/+1
| | | | | | | | | | | The area with the marks was not showing up. This patch reverses the logic for showing the marks area to opt-out. Almost all editors were opting in for it already. The AndroidManifest editor, VCS base editor, and widget designer text editor opt out now. Task-number: QTCREATORBUG-20339 Change-Id: Iccb6d0256618f7ef70e8921847ce2fd46fd660c0 Reviewed-by: David Schulz <david.schulz@qt.io>
* Remove some lambdas from Utils::transform callsEike Ziller2018-05-281-3/+1
| | | | | | | | | | | 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>
* VcsBase: Consistently use nullptrTobias Hunger2018-05-079-13/+13
| | | | | | | Fixed by clang-tidy modernize-use-nullptr. Change-Id: I496d3febae9c445dc96490582a5d4ae86fec71ee Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VcsBase: Use override consistentlyTobias Hunger2018-05-074-6/+6
| | | | | | | clang-tidy fixes from modernize-use-override check. Change-Id: I4775c493dbeefaf832b862f8740f216a3aacbfc6 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update Options dialog iconsAlessandro Portale2018-04-245-2/+4
| | | | | | | | | A new set of scalable and themable icons with unified look as provided by Diana. Task-number: QTCREATORBUG-20325 Change-Id: I68498b034e9e43fbb61511a38d9c7fc0003ab076 Reviewed-by: hjk <hjk@qt.io>
* Clean up options page category display name and icon set upEike Ziller2018-04-232-4/+2
| | | | | | | | | | | | | | In cases where plugins extend an existing settings category of a plugin that they depend on anyhow, they do not need to specify the translated display name and icon for that category. Some options pages were already not setting the icon, but still the translated name, which makes even less sense. Clean up this mess, only setting display name and icon if that is necessary. Change-Id: I8bc9d0c51b11d48f1d847337838704d663e70b45 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Utils: Purge qtcfallthrough.hOrgad Shaneh2018-04-091-1/+0
| | | | | | | No longer needed. Change-Id: I9b0bee014df89d4c567f1d2431b5ff9404f5f925 Reviewed-by: hjk <hjk@qt.io>
* VCS: fix VCS pane openAlexander Drozdov2018-03-061-0/+3
| | | | | | | | | | | | Version Control output pane creates only when project with VCS support opens. So, registration in outputpanemanager.cpp::g_outputPanes makes with some delay and after OutputPaneManager::init() call. As a result, g_outputPanes size and internal m_buttons size is differ and impossible to enable VCS output pane in GUI. Task-number: QTCREATORBUG-19971 Change-Id: Ifb8a759fdbf39484c8648dd8ecc0b3f573cf45eb Reviewed-by: hjk <hjk@qt.io>
* VcsBasePlugin: Remove last instance of addAutoReleasedObjecthjk2018-02-204-24/+34
| | | | | Change-Id: I6a622faed0bce39f21c5489afc0df623cb32f801 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Editor: Fix block for offset calculationDavid Schulz2018-02-151-4/+4
| | | | | | | | Take block bounding rects into account, when calculating the row count or the center visible line. Change-Id: If933828867df25920eeb56359e9a42a8b95d9c6d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Vcs/Text search: Remove a few addAutoReleaseObject useshjk2018-02-065-6/+11
| | | | | | | Using a QObject parent suffices here. Change-Id: I4dc5448511d55bf14fbd8f810e91336a49e94094 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: add reload button for 'git blame' and 'git log' windowsPrzemyslaw Gorszkowski2018-01-092-3/+19
| | | | | | Change-Id: I64685e779bed91d41e38bdc1454571dbbcd7f177 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* De-emphasize PluginManager::getObjects<Type>()hjk2017-12-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by additionally keeping local (currently non-owning) pools per "interesting" type. Current situation: - The global object pool does not scale well for looking up objects, as iteration plus qobject_cast typically iterates over all pooled objects. - User code that can use typed results from the object pool need to have access to the full type definition anyway, i.e. depend on the plugin of the target class anyway. The patch here solves the scaling problem is to have local type-specific pools to which objects register in their constructors and deregister in their destructors. This patch here does *not* change the ownership model of the pooled objects, however, it opens the possibility to change the ownership model per type (e.g. by not putting things into the global pool at all anymore and make the local pool 'owning') and the intent is to handle that in later patchs. Even without the follow-up patches this here is a performance improvement for the cases that access the local pools instead the global one, i.e. "practically all". Change-Id: Ib11a42df2c4ecf5e1155534730083a520dd1995b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-251-1/+1
|\ | | | | | | Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
| * VCS: Fix translation issuesEike Ziller2017-10-241-1/+1
| | | | | | | | | | Change-Id: I3d85a3fc9d34144ca30ef1e37b22bfe7874b8e64 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-131-1/+3
|\ \ | |/ | | | | Change-Id: I0a4a1b6787afc817acf2b7a1c3fd2b881c35f57a
| * Git: Use C locale when parsing the command outputOrgad Shaneh2017-10-121-1/+3
| | | | | | | | | | | | Task-number: QTCREATORBUG-19017 Change-Id: Ib77d66e22d227d43245d352905f9b095f7d0f42b Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-1216-13/+27
|\ \ | |/ | | | | Change-Id: Iebd340258966aff910fb9ab0e45b5149e8f242f0
| * VCS: Clean up QLatin1String in VcsBasePluginOrgad Shaneh2017-10-111-4/+4
| | | | | | | | | | Change-Id: I80e01ee352c5a973b5b84537df7b4170b6e1f036 Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * VcsBase: Modernize the iconsAlessandro Portale2017-10-0915-9/+23
| | | | | | | | | | | | | | | | Use themable, HighDPI enabled icons for commit and diff. Re-use an existing red cross for the removesubmitfield. Change-Id: I43f46db96d07de9a7e166937d470d48e45d7f3fb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Replace manual signal blocking/unblocking with QSignalBlockerTobias Hunger2017-10-043-10/+5
| | | | | | | | | | | | Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Environment: Use Utils::FileName for path() and related methodsTobias Hunger2017-09-271-1/+4
|/ | | | | | | Update users accordingly. Change-Id: I9432e82308e9d0630514c6c8632aeb6b6ee0cf90 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* VcsBaseClientSettings: Skip empty parts when splitting pathsFriedemann Kleint2017-09-251-1/+1
| | | | | Change-Id: I56106079a31ec0ebc64a038ca41df618b0c09fcf Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Fix buildNikolai Kosjar2017-09-121-1/+1
| | | | | Change-Id: Ie18986306317b72558b3c59021bfa921fd2fcd5b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Offer to save-all before commitTobias Hunger2017-09-122-0/+15
| | | | | | Task-number: QTCREATORBUG-3857 Change-Id: I3ff3d90803eec4134b9da4af5567753ad7bffafb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Drop unused variables and lambda capturesUlf Hermann2017-09-082-4/+4
| | | | | | | | | Also, add context to connect() expressions where we are or were capturing "this". Change-Id: I6e006ba6f83d532478018550d148ee93eca59605 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.4'Orgad Shaneh2017-08-301-1/+1
|\ | | | | | | Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
| * Fix copyright year in plugin info, --version, and macOS infoEike Ziller2017-08-241-1/+1
| | | | | | | | | | | | | | | | By using the new QTCREATOR_COPYRIGHT_YEAR variable Task-number: QTCREATORBUG-18612 Change-Id: I3bcf0319660d210436d3130c00f43325c460a66c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Replace QLatin1String, QStringLiteral ("") with QString()Nikita Baryshnikov2017-08-211-3/+3
| | | | | | | | | | | | Change-Id: I21e6165e7e8858df8436c04c9afcc1be5242bda4 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Utils: Separate rendering out of ProgressIndicatorTobias Hunger2017-07-271-1/+1
| | | | | | | | | | | | | | | | | | I want to reuse the rendering of the progress indicator outside of a widget. Change-Id: Icaeeb798578ad838693b68556bf2193c4ba45cfa Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-07-182-18/+117
|\ \ | |/ | | | | Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a
View Lorry Controller Status