aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/subversion
Commit message (Collapse)AuthorAgeFilesLines
* Utils: Add a FilePath::isDir() convenience functionhjk2019-09-111-2/+1
| | | | | Change-Id: I1df0ee1b136299ae6e4f2e5bd0bdc24bfeca33dd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Add CommandLine convenience constructorshjk2019-07-231-1/+1
| | | | | | | | | | | | | ... taking a QString for the executable. This weakens the very explicit QString -> FileName conversion via the named constructors for the special case of constructing a CommandLine. I think that's worthwhile here, as it reduces the noise on the caller site under circumstance where the nature of the thing is obvious. Change-Id: I27b4a73639728893d053b2e7ba65cb745f0ffe83 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Avoid warning on empty expressionshjk2019-07-231-1/+1
| | | | | | | | For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: Use CommandLine in ShellCommandhjk2019-06-112-2/+2
| | | | | | | ... and adapt users. Change-Id: I218523ffe34720d5fe199aa0ca6892a8dc2985fc Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Utils: Rename FileName to FilePathhjk2019-05-286-9/+9
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt Creator CMake portCristian Adam2019-05-171-0/+13
| | | | | | | | | | | | | | Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Subversion: Do not close the editor if commit failsOrgad Shaneh2019-01-203-23/+17
| | | | | | Fixes: QTCREATORBUG-15227 Change-Id: I975c88d686e75bbb33e827a4a591b172b4f68bbd Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Subversion: ModernizeAlessandro Portale2018-11-262-3/+3
| | | | | | | modernize-* Change-Id: I904cadb62cc49b401cdaa80649d2ad1896749d22 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Improve dialog on submit promptOrgad Shaneh2018-11-121-6/+3
| | | | | | | | | | | The dialog appears when closing the commit dialog without committing, or when "prompt to submit" setting is enabled. Fixes: QTCREATORBUG-18799 Change-Id: I8eb20becbcee7281b9f673a35ec698c6f8e04a40 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Fix frequent typoRobert Loehning2018-10-231-1/+1
| | | | | | | can not -> cannot Change-Id: Ie872ada1bc9b4ed64bffb667c2e44dbb13b4ad11 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Subversion: ModernizeOrgad Shaneh2018-09-207-19/+20
| | | | | | | override, auto, nullptr Change-Id: If8a0d438299eecb876ec5a5ab2bea3d21a5256d8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Subversion: Fix missing overrideEike Ziller2018-09-181-6/+6
| | | | | Change-Id: I3f564f93afc94b2186794684356b82d2a16cf461 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Consolidate submit editor actions setupOrgad Shaneh2018-08-283-27/+2
| | | | | Change-Id: I36754779b6a9aa35de705b368daf8c2a1de058c6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* VCS: Unify default and maximum timeout in all setting pagesOrgad Shaneh2018-06-191-0/+3
| | | | | | | Task-number: QTCREATORBUG-16009 Change-Id: Ibbaaef441ac2dc0147af2bc0631e0b0d98b4f57d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Vcs/Text search: Remove a few addAutoReleaseObject useshjk2018-02-063-9/+8
| | | | | | | Using a QObject parent suffices here. Change-Id: I4dc5448511d55bf14fbd8f810e91336a49e94094 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Core: make useMacShortcut constexprDavid Schulz2018-02-021-3/+3
| | | | | Change-Id: I293b96428784b6efecac6dae4f2f9690af0027da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Subversion: fix forward declarationLaurent Montel2017-09-293-7/+3
| | | | | Change-Id: I4fa01e0fb5b2a56959a30737b6aea0acc4889334 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Offer to save-all before commitTobias Hunger2017-09-121-0/+3
| | | | | | Task-number: QTCREATORBUG-3857 Change-Id: I3ff3d90803eec4134b9da4af5567753ad7bffafb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* 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-2/+2
| | | | | | | | | | | | Change-Id: I21e6165e7e8858df8436c04c9afcc1be5242bda4 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-07-251-9/+9
|\| | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
| * Plugins: Fix that mimetype definition was not valid JSONEike Ziller2017-07-251-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | JSON officially does not support multiline strings, so we should use the same mechanism that we already use for the plugin description (i.e. additionally support arrays of strings which are interpreted as lines). This just happens to work because Qt's JSON parser eats it without choking. Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | VcsManager: Register IVersionControls with VcsManagerTobias Hunger2017-07-101-1/+1
|/ | | | | | | Get some more objects out of the pool. Change-Id: Id93021b712307c4777dc39b9d15aa18a46318885 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* VcsBase: Create common base diff editor controllerJarek Kobus2017-07-052-60/+49
| | | | | | | | | Reuse it in subversion and git plugins. It makes subversion diff more asynchronous than before. Make VcsBase plugin dependand on DiffEditor plugin. Change-Id: Iafea2941b890a95a269362e022af2dc03cdea550 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.2' into 4.3Orgad Shaneh2017-03-141-0/+1
|\ | | | | | | Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
| * QRegExp include cleanupSamuel Gaist2017-03-131-0/+1
| | | | | | | | | | | | | | This patch adds the missing include statements for QRegExp. Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Move mimetype definitions to plugin specsEike Ziller2017-02-276-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | - Avoids the hassle of QRC files and manually registering mime types - Avoids performance regressions because of mime types that are registered after mime database has been used - Makes it technically possible to detect that a disabled plugin could handle a mime type if it was enabled Change-Id: I373008b1b56e9c6b4853055f20b3eeb112a6eff9 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Prefix editor's uniqueId with plugin nameJarek Kobus2017-01-102-2/+6
| | | | | | | | | | | | | | | | In this way we minimize the chance of generating non-unique id. Change-Id: Idd177c5a4b44b17a58c2a944ec77b9517e91964e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | VCS: Use Qt5 connect for annotateOrgad Shaneh2016-11-282-14/+1
| | | | | | | | | | | | | | Connect directly to the editor widget, which has a strong type. Change-Id: I4d9778bc4a3c8ba1b37c5a5c0286fd72cda135de Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | VCS: Replace describe slots with lambdasOrgad Shaneh2016-11-282-5/+7
| | | | | | | | | | Change-Id: I05ca25aad8be43fdfa15d3fb5eaaa9bf753ee79f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Orgad Shaneh2016-11-211-1/+1
|\| | | | | | | Change-Id: I957c22020fbacb2f631220b0cdc7fa16a782798b
| * Add missing overridesJarek Kobus2016-11-171-1/+1
| | | | | | | | | | Change-Id: I7e27a273044542537423c8f4b9ab5235c3fabc22 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Orgad Shaneh2016-11-143-16/+28
|\| | | | | | | Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
| * SVN: Escape files containing '@' charactersTobias Hunger2016-11-073-16/+28
| | | | | | | | | | | | | | | | | | Append a '@' to files with a '@' in their name. The last '@' (and everything following it) is cut off by SVN and treated as a revision. Task-number: QTCREATORBUG-17229 Change-Id: Icab62345c18277c0327b1e548a45feda0906b3c3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Eike Ziller2016-10-271-9/+12
|\| | | | | | | Change-Id: Ia346d86ad5fabe9d91454ea642cbeac5ec862699
| * SVN: Fix topicTobias Hunger2016-10-261-9/+12
| | | | | | | | | | | | | | | | Use svnversion in favor of svn info to report the topic for SVN versions. Task-number: QTCREATORBUG-13611 Change-Id: Ia1f61c0d3b9bfb871d42449478029835c7b2796f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Rename VcsBaseEditorParameterWidget -> VcsBaseEditorConfigOrgad Shaneh2016-10-242-7/+6
| | | | | | | | | | | | Change-Id: I5626e66ba2b7a760ce55263edce9e716067ea6a4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | VCS: Replace QToolButtons in VCS toolbar with QActionsJarek Kobus2016-10-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change VcsBaseEditorParameterWidget to add actions/widgets to an existing toolbar, instead of being a widget itself. The class is renamed in a follow-up commit. Task-number: QTCREATORBUG-14934 Change-Id: I473a439d12a096f4cbb64f06faa0598ee72000de Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | VCS: Fix inverse conditionOrgad Shaneh2016-10-241-1/+1
| | | | | | | | | | | | | | compare returns 0 when the strings are equal Change-Id: I4dfd3b402d48a3043e9674f1d82e66c968e8ba94 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | VCS: Add a way to filter out files/directories that belong to a VCSTobias Hunger2016-10-214-0/+18
| | | | | | | | | | Change-Id: I4dcbe6242cfe327e3b72d3dd550309be45e326a9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | VCS: "final"-ize IVersionControl implementationsTobias Hunger2016-10-211-13/+13
|/ | | | | Change-Id: I123a8da9b08b2fe5de679d5caac7fa20bfb0ef4a Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: VcsBaseClient::vcsFullySynchronousExec returns a SynchronousProcessResponseTobias Hunger2016-07-152-10/+7
| | | | | Change-Id: Ic155da2ed1fd36f1f91327ac90f34a5cad3c210e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* SynchronousProcess: Store raw bytes from stdout/stderr of the processTobias Hunger2016-07-151-2/+2
| | | | | | | | | | | | | | | Only convert the raw output later in a stdOut() and stdErr() method of the SynchronousProcessResponse. This is necessary since we have processes that use different encodings for different sections of the file (I am looking at you, git). Also remove the signals for raw data on stdout/stderr, leaving only the signals returning buffered QString lines. This should be safe, even with UTF-16 output. Change-Id: Ida613fa86d1468cbd33bc6b3a1506a849c2d1c0a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* SVN: Avoid uncessesary QString creations.Andre Hartmann2016-05-302-7/+11
| | | | | | | | | | | | | | | | Commmits a5b7ba58f0bdab751a72b2ce647bc59070d88215 and a5720ca8af7e2a0f38ffe657767d1b751f7725dc remove some QLatinString uses. As the subversion status strings only contains Latin1 characters, the comparisons can be speed up by restricting to Latin1, instead using fromUtf8() as would be done otherwise. Change-Id: I734691bda6f5a1214ec6b15fe6d7ed4b028fbc1e Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* SVN: Show conflicted files in submit editorAndre Hartmann2016-05-264-13/+16
| | | | | | | | | | | | | So far, they didn't show up in the submit editor, so they could be forgotten during a commit. Unlike Git, these files don't prohibit the commit, but at least are shown in the list of modified files and can be diffed. Change-Id: Ia5cac7befb870321d2048622c1fac022d979c745 Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* SVN: Add constants for file change stateAndre Hartmann2016-05-221-4/+9
| | | | | Change-Id: Ie65a9b8f614856d3877d094910221d0150c26c49 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Colorize unmerged files in submit editorAndre Hartmann2016-05-201-0/+2
| | | | | | | | | | | So far, conflicted files were displayed like added ones. Now they are marked obvious, as they disable the commit button. Task-number: QTCREATORBUG-16297 Change-Id: Iedf834408a747c4fe5f2133790c5fb81e7fea265 Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* vcs: fix compiler warningNikita Baryshnikov2016-05-131-3/+3
| | | | | | | | this 'if' clause does not guard Change-Id: I91cdabf9b770f58cc59ca00df6574c757c2618b5 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wholesale conversion to #pragma oncehjk2016-03-309-36/+9
| | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 21:08:56 +0000