summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitclient.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Utils: Unify CheckableMessageBox and make it look more nativeMarcus Tillmanns2023-05-171-8/+10
| | | | | | Change-Id: I5690c16f38cfd2058e01441283bec28d44cadf75 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Git: Also use the latest settings setup approachhjk2023-05-151-28/+28
| | | | | Change-Id: I34a210575d02d18927c1e0f6d8ea6cb9924c563d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* All: Use the shorter access to aspect values in a few placeshjk2023-05-121-3/+3
| | | | | Change-Id: Ie0ff0e4e1cf4c2750897ea733dfccb743f44fa93 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* TaskTree: Prepare for de-utils-ization - part 2Jarek Kobus2023-05-121-4/+2
| | | | | | | | | Move TaskTree into Tasking namespace. Move Tasking namespace out of Utils namespace. Change-Id: Ib4c1d7f54f1808517e54768dfa27209c33517b61 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* Tasking::Tree: Rename Tree into TaskTreeTaskJarek Kobus2023-05-101-1/+1
| | | | | | | Task-number: QTCREATORBUG-29102 Change-Id: I70073bcb44a712c427c8c5aea42c48dbc30eebe0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* Process: Rename QtcProcessPrivate -> ProcessPrivateJarek Kobus2023-05-101-1/+1
| | | | | | | | | | Rename the logging category for Process. Fix inline comments accordingly. Adapt warning/debug messages accordingly. Change-Id: I2b1f0f558701def3afa3c1b04adf629833dba9e7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* Utils: Rename qtcprocess.{cpp,h} -> process.{cpp,h}Jarek Kobus2023-05-041-1/+1
| | | | | | | | Follows QtcProcess -> Process rename. Change-Id: I97235a9a40cb7fd52944515b7ab878d96528f919 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Utils: Rename QtcProcess -> ProcessJarek Kobus2023-05-041-28/+28
| | | | | | | | Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* Utils: Rename asynctask.{cpp,h} -> async.{cpp,h}Jarek Kobus2023-05-031-1/+1
| | | | | | | Follows AsyncTask -> Async rename. Change-Id: I37f18368ab826c9960a24087b52f6691bb33f225 Reviewed-by: hjk <hjk@qt.io>
* Tasking::Process: Rename Process into ProcessTaskJarek Kobus2023-05-031-10/+10
| | | | | | | | Rename QtcProcessAdapter into ProcessTaskAdapter. Task-number: QTCREATORBUG-29102 Change-Id: I1902c7176da75db60d70125f505084a2ea5ba774 Reviewed-by: hjk <hjk@qt.io>
* Fix compiler warningsEike Ziller2023-05-021-2/+2
| | | | | | | | Change-Id: I9b0b4a60d1152142f62bf3f76885cf8019714623 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* TaskTree: Add TreeStorage::operator*()Jarek Kobus2023-02-211-3/+3
| | | | | | | | Reuse it in some places. Change-Id: I335f38fa0384ea17bd8e981d743f835c3f05b731 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-02-161-1/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/clangcodemodel/clangcodemodelplugin.cpp Change-Id: Idb3d6e8fdfd278979f6180dc3795a2138bc2e61d
| * Some fixes in translated stringsEike Ziller2023-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - doesn't make sense to translate "%1" - showPreprocessedFile: "reason" contains full stop, put at the end - add missing closing > - remove whitespace at the end of translated string - added missing quotes and full stops - Remove some control text from tr Change-Id: I5537c3d12d038e25e2209af1198129fbf959b43c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Git: Reduce sync processesOrgad Shaneh2023-02-141-19/+21
|/ | | | | | Change-Id: I5d83636d4a018464ba6f248aa818fb8f840df9fc Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Git: Avoid passing strings to resolve text encodingsAndre Hartmann2023-01-301-23/+27
| | | | | | | | Therefore, merge the code of codecFor() and encoding() to avoid further mis-usage. Change-Id: I086e4ace6c791d16f43f14c423b6529ad199c456 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* TaskTree: Merge DynamicSetup with OnGroupSetupJarek Kobus2023-01-231-1/+1
| | | | | | | | | Don't define 2 separate group setup items. Make OnGroupSetup be able to handle also dynamic setup - like it's done with CustomTask's setup handler. Change-Id: I43e135f268ea96419b44ef5a4325707a124b4921 Reviewed-by: hjk <hjk@qt.io>
* Git: Some more FilePath proliferationhjk2023-01-231-37/+32
| | | | | Change-Id: I8d3d97d0c7979d741a7da333f922ce93359afef8 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* TaskTree: Remove GroupConfig / GroupActionJarek Kobus2023-01-201-2/+2
| | | | | | | | | | | Use TaskAction for dynamic group setup. Get rid of possibility of selecting group's children to be started inside group setup. Use dynamic children's setup instead, so that each individual child may decide itself whether it wants to be started or not. Change-Id: Ie31f707791db0dc26be92663ca6238b8e49c3b98 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* VcsBase: Proliferate use of FilePathhjk2023-01-201-30/+28
| | | | | | | ... and update user code. Change-Id: I52c08e9e07238536d31fc72f97312ac582a1e32f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* GitClient: Replace DynamicSetup with dynamic task setupJarek Kobus2023-01-201-11/+6
| | | | | Change-Id: I1a56e34274c5d7ace8fb8866c128c8dee03d2ad8 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VcsPlugins: Use multi-arg for stringsJarek Kobus2023-01-111-3/+3
| | | | | Change-Id: I8c1c62e3d2f98781ff1468b44ad11640b873695d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* VcsBaseDiffEditorController: Remove unused stuffJarek Kobus2022-12-151-1/+0
| | | | | | Change-Id: I34cc9dee686929fb69253ba16ff0fd5fed023ca1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* GitBaseDiffEditorController: Remove unused methodJarek Kobus2022-12-151-12/+0
| | | | | | | Change-Id: Iff58be30e40a181fc259564415a9850a891b4953 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* GitDiffEditorController: Reuse task treeJarek Kobus2022-12-151-8/+28
| | | | | | | Change-Id: I6f89a6865ee45eea66a0307c273ef8d76976da3b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VcsBaseDiffEditorController: Make post processing reusableJarek Kobus2022-12-151-29/+17
| | | | | | | | | Move creating the post process task into vcs base class and reuse it in subclasses. Change-Id: Ibd81d1640524980c0554a5d0ddc41b96ecd7f73f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditorController: Aggregate reloadRecipeJarek Kobus2022-12-151-82/+70
| | | | | | | Instead of declaring virtual getter. Change-Id: I0f9e995bdff1b7e387e71daaf149a3726b7c09af Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditorController: Simplify APIJarek Kobus2022-12-151-5/+5
| | | | | | | | | | | Get rid of VcsBaseDiffEditorController::setWorkingDirectory() and rename DiffEditorController::setBaseDirectory() into setWorkingDirectory(). Don't pass workingDirectory inside setDiffFiles(). Change-Id: I6a3a02d5e3ddc23977ed2908cd8d7b8ed51a9ee0 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VcsBase & dependent: Fix const correctnessJarek Kobus2022-12-141-17/+17
| | | | | | | And some minor cleanups. Change-Id: Id0c2df6865ba84c054f0fb97c0ac42a76a128355 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditor: Simplify internalsJarek Kobus2022-12-141-4/+4
| | | | | | | | | | | | Don't pass startupFile arg on every setDiffFiles. Provide a setStartupFile() separate setter inside DiffEditorDocument and call it directly from DiffEditorController::setStartupFile(). Correct updateDescription() implementation. Change-Id: Ie489431632bdabc61e2c692d09caf7b2e3990764 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* FileListDiffController: Don't set startupFile()Jarek Kobus2022-12-141-2/+1
| | | | | | | | | We didn't do that before. We did it only for ShowController. Amends cbcfc0242e13a9319ff964b7b876fef830def5f3 Change-Id: I6ba68bdb6b16204bcc66bdfd63bf7457c713ac28 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* GitBaseDiffEditorController: Simplify internalsJarek Kobus2022-12-141-55/+36
| | | | | | | | | | | | Remove initialize() method and do it inside reloader method. When reloader is being executed the workingDirectory is already set. Amends bfcd1149eb688707a5495ce63f39e93bcf0c0a54 Change-Id: I600daaff8d15f3bdb822789623947b31df0b7edd Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* FileListDiffController: Reuse task treeJarek Kobus2022-12-141-13/+70
| | | | | | | | | | This makes it possible that staged and unstaged tasks are run in parallel, so the result is to be expected earlier. Change-Id: I0b99d17a55e39f2178d6ebed208e29fbaaa8aa5e Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* GitBaseDiffEditorController: Remove interactive branch expansionJarek Kobus2022-12-141-177/+0
| | | | | | | Branches are now being automatically expanded. Change-Id: I6c8986f39fe0ceb71841a2fea46b6038123240b7 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ShowController: Make showing branches a part of show processJarek Kobus2022-12-141-1/+54
| | | | | | Change-Id: I23d994fd489fc6a6f02419452ad2b07c756a9cd3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditorController: Make it possible to setup task treeJarek Kobus2022-12-141-112/+151
| | | | | | | | | Instead of reloader function. Use task tree for ShowController. Make diff processing a part of task tree. Change-Id: I732d0a14eaf8de7ce0d1be891fb4700b22ea24b7 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Remove outdated commentOrgad Shaneh2022-12-131-2/+0
| | | | | | | Missed in eb1226df68edb2180425fda8411f57aab06c7b5f. Change-Id: Ib5d6d11bdb563882a2a651b3e26a30f006af973d Reviewed-by: hjk <hjk@qt.io>
* VcsBase: Don't return editor from annotate()Jarek Kobus2022-12-111-12/+10
| | | | | | | | | Take int firstLine as last arg instead. Switch the order of 3rd and 4th args as most callers provide lineNumber and don't provide revision. Change-Id: Iab60c1068a4d9829d10219af39bf3dcbf51e37bb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Reuse handleResponse() inside vcsExecAbortable()Jarek Kobus2022-12-101-61/+40
| | | | | | | | | Remove ConflictHandler::attachToCommand(). Rename handleResponse() into handleConflictResponse() and move it out of ConflictHandler class. Change-Id: I0a64bd19f288d9377a93cdb5eea2c44b65bf6fdb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Add CommandHandler into vcsExecAbortableJarek Kobus2022-12-101-15/+16
| | | | | | | | | Don't return VcsCommand anymore. Change-Id: I895951e8bd8d380d7b946380628e41b928c9b743 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VcsBase: Get rid of CommandOutputBindModeJarek Kobus2022-12-091-16/+20
| | | | | | | | | | | | | | | Simplify createCommand() implementation. All callers passed either non-null editor (in this case the bindMode was always NoBind) or passed a null editor and one of two values for bindMode (in this case the only effect was to add (or not) a RunFlags::ShowStdOut flag). Drop CommandOutputBindMode enum completely and pass directly RunFlags::ShowStdOut when needed (i.e. in cases we were passing CommandOutputBindMode::ToVcsWindow). Change-Id: Ic3af05818933a03f615ba02267403b9f0bd326ba Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VcsBase: Reuse CommandOutputBindMode instead of boolJarek Kobus2022-12-091-3/+3
| | | | | | | Reuse it inside vcsExec() and vcsExecWithHandler(). Change-Id: I6ff4044bf43e0883fc46a49718f5f44da87a7e13 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* GitClient: Simplify vcsExecJarek Kobus2022-12-091-4/+4
| | | | | | | | Get rid of editor arg. Reorder last two args (to conform to vcsExecWithHandler). Change-Id: Ia32757ac8b766640b76bef81f1b2e0f5efe4d48c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* GitClient: Introduce execWithEditor()Jarek Kobus2022-12-091-4/+4
| | | | | Change-Id: I3a7edde4b978cb8e99fe0020d69a0a5e3e09c0fb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VcsBase: Introduce vcsExecWithHandler()Jarek Kobus2022-12-091-122/+108
| | | | | | | | | | | | | | | | | | | Before, vcsExec() returned already started VcsCommand. Later, callers of vcsExec() were establishing connections to the retured VcsCommand::done() signal. However, when process fails to start (e.g. because of non-existing executable), the done() signal may be emitted synchonously from inside VcsCommand::start(). In this scenario callers of VcsCommand could miss the emission of done() signal and connect to already finished command. Instead, provide a vcsExecWithHandler() function which takes a handler to be called when command finished. In addition it takes the context object, too. Don't return VcsCommand from vcsExec() anymore. Change-Id: I2fb5fbe5d27632ea039c650d37e5d7d1b60cebc0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VcsBase, Git: Don't use queued connections to VcsCommandJarek Kobus2022-12-081-3/+3
| | | | | | | | | | | Otherwise, the destructor of VcsCommand could have been executed in meantime (since it's invoked automatically after done()) and we might access invalid pointer to the command inside the done handler. Change-Id: I031e2281952451d4e01c47f437097a1e7bf8899f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Git: Simplify ConflictHandlerJarek Kobus2022-12-081-49/+31
| | | | | | | | | Don't create QObject instance when handling conflicts. Operate on static functions only. Replace destructor of ConflictHandler with finalize() method. Change-Id: If579edc6213faa50c73a90cedf4b67cf985478ac Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Add instant line annotation (blame)Andre Hartmann2022-11-191-13/+19
| | | | | | | | | | | | | | | | | Inspired by the Visual Studio Code plugin GitLens. Add an annotation to the editor line the cursor is currently in. A tooltip contains the commit data and allows to invoke git show for the commit. When the automatic annotation is turned off, it can still be forced for the current line with an action. The default shortcut for this action is: Alt+G,Alt+I Task-number: QTCREATORBUG-23299 Change-Id: I58eef9efcf531afb11470e5f5456e19f282b18d0 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Proliferate FilePath a bit furtherhjk2022-11-091-1/+1
| | | | | Change-Id: I8490917bf0bde59b1cef2509ec14c3ca985fa43d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
View Lorry Controller Status