summaryrefslogtreecommitdiff
path: root/src/plugins/clearcase
Commit message (Collapse)AuthorAgeFilesLines
* ClearCase: Fix unreserved checkoutOrgad Shaneh2014-09-151-2/+4
| | | | | | Task-number: QTCREATORBUG-12847 Change-Id: I8b42631adf62cd9b6afea619a17bf01a725a2968 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ClearCase: Initialize checkout dialog after sync has finishedOrgad Shaneh2014-09-101-5/+6
| | | | | | | | If it is initialized too early, activities combo is empty. Change-Id: I6ca34e7bcae5d9960b1f84cd3f95ce13ae45ccca Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Reinvent deprecated qSort as Utils::sortNikita Baryshnikov2014-06-191-1/+2
| | | | | | | Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Revert "VCS: Open diff/blame editors in other split"Tobias Hunger2014-06-171-3/+1
| | | | | | | | | | | | | | This change has lead to complaints about diff views opening in apparently random places for users with several splits. This reverts commit 02b3a79c5f30cd5c808408caff598f2f4f0a299f. Conflicts: src/plugins/diffeditor/diffeditorplugin.cpp src/plugins/subversion/subversionplugin.cpp Change-Id: I2eab8ff2d88a9e12f4dc7ec3a9ca65455daf15e2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Nuke plugins PROVIDER settingsOrgad Shaneh2014-05-082-3/+0
| | | | | | | | Place all plugins in lib/qtcreator/plugins Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Project: Use Utils::FileName as return type for projectDirectory(...)Tobias Hunger2014-05-061-1/+1
| | | | | Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* VCS: Do not check for existence of ProjectExplorerTobias Hunger2014-05-051-3/+2
| | | | | | | | All VCS plugins depend on the ProjectExplorer, so it is there. No need to test. Change-Id: Ie6ec210af0f63f1bdad0e4973743ae68f9279a5c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Use more descriptive progress bar titlesEike Ziller2014-04-281-1/+1
| | | | | | | Change-Id: I70450a2aa675d69f820de48dd75909f36051efe0 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-2/+2
| | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* ClearCase: Update view data when topLevel is changedOrgad Shaneh2014-03-251-2/+7
| | | | | | Change-Id: I9d471dea120dd78382245faac04acc9cd44c3b4a Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ClearCase: Fix detection when file is opened from vob rootOrgad Shaneh2014-03-251-1/+2
| | | | | | Change-Id: I480ea1f1f73ce80b75d428a4fd16501eda539529 Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix tooltips, add lacking dotsJarek Kobus2014-03-131-2/+2
| | | | | Change-Id: Id54a11b6868d5033fd1ecfd6324b7e50b94e305c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Use ICore::dialogParent for message boxes without parent so farhjk2014-03-121-2/+3
| | | | | | Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* VCS: Open diff/blame editors in other splitTobias Hunger2014-03-071-1/+3
| | | | | | | | ... if there are other splits that is. Task-number: QTCREATORBUG-11623 Change-Id: Icb3b1c86c39d88e90916079e8ab347574ae9a361 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* EditorManager: Add OpenEditorFlags to openEditorWithContentsTobias Hunger2014-03-071-1/+0
| | | | | | | | | | 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>
* Fix some typosSergio Ahumada2014-03-051-1/+1
| | | | | | Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* VCS: Introduce NoOutput command flagOrgad Shaneh2014-02-121-5/+1
| | | | | | | Suppresses all kinds of output Change-Id: I3bd2173fc3efcfcc2ce7434d9545cd1492d7c0ab Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clean up single namespace forward-declarationsOrgad Shaneh2014-02-122-6/+2
| | | | | | | | | | | | | | | | | | Done using the following ruby script: Dir.glob('**/*.h').each { |file| if File.file?(file) s = File.read(file) t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') } if t != s puts file File.open(file, 'w').write(t) end end } Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e Reviewed-by: hjk <hjk121@nokiamail.com>
* Qbs/qmake: Fix dependencies of pluginsTobias Hunger2014-02-112-0/+3
| | | | | | | | | ... based on output from dependencyinfo.py script Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* BaseTextEditor: Remove some unnecessary indirections through widgetEike Ziller2014-01-141-1/+1
| | | | | Change-Id: I4f71448d6788a4e553b1495b72263a004e65d8c0 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Core: Merge Find and Locator into Core pluginhjk2014-01-144-7/+4
| | | | | | | Change-Id: I7053310272235d854c9f409670ff52a10a7add8b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-0826-26/+26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * Incremented year in copyright infoRobert Loehning2014-01-0826-26/+26
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | VCS: Remove unnecessary indirectionEike Ziller2013-12-191-3/+2
| | | | | | | | | | Change-Id: I73d70da7e6cc6006da92c05bf0b15da6b8bbf5bf Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Preferences: Add default implementation for filteringEike Ziller2013-12-102-34/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | The default "matches" method now takes the widget and looks for all child labels, checkboxes, push buttons and group boxes. Because of that, the former "createWidget" method can be called multiple times without creating a new widget (-->widget()), and the "finished" method must ensure that the created widget gets deleted, since not all widgets that were created are added to the UI anymore. Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | ClearCase: Give warning if editing a Derived ObjectKnut Petter Svendsen2013-12-052-0/+30
| | | | | | | | | | | | | | | | | | | | | | Derived objects (DO) are created during builds with ClearCase build tools (e.g., clearmake). They are used for build avoidance and derived object sharing. DOs are typically object files, but can also be source code generated from code generation tools. It is probably never a good idea to edit such a file. Change-Id: If4248f09409424ee771aab720851bb6ce1aa40c9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ClearCase: Handle Derived ObjectsKnut Petter Svendsen2013-12-052-6/+14
| | | | | | | | | | | | | | | | | | Derived Objects (DO) should not be checked in or out. Ideally they should not be edited at all, but in the case where a user by accident opens a DO and it is read only do not offer to vcsOpen() the file. Change-Id: I5aee9655ca8696c6d7291950946052261526c751 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ClearCase: Improved performance for indexing dynamic viewsKnut Petter Svendsen2013-12-054-49/+294
| | | | | | | | | | | | | | | | | | | | For dynamic views we only at initial sync/indexing check for checked out files. When a file is opened it will be reindexed if needed. The very time consuming recursive listing of all vobs is not needed as for snapshot views. Change-Id: I83d4ab70efdd311b6f3239ab45569c6d1810e10f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ClearCase: Refactor and add testsKnut Petter Svendsen2013-12-055-67/+373
| | | | | | | | | | | | | | | | | | Refactored code to make it more testable, and added tests. When running WITH_TESTS the TestCases will make the plugin fake ClearTool such that ClearTool is not needed to run the current tests. Change-Id: I49b50a667309cf337a07ef20dabb4801c680700d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-12-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
| * Limit cdUp to rootOrgad Shaneh2013-12-031-1/+1
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-10860 Change-Id: I22550b4415e07cac0d78f36595dc7ee781a837c0 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | ClearCase: Add history completer to path chooserTobias Hunger2013-11-261-0/+1
| | | | | | | | | | Change-Id: Ie0a2112bd9892fbcd0bd7955b0c69cc976e141ec Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-251-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I0485b1bf75cc02f9fbcb5c05e350da91f491abe3
| * ClearCase: Fix: Cancel when renaming managed fileKnut Petter Svendsen2013-11-221-1/+1
| | | | | | | | | | | | | | | | | | ccFileOp returned true even if the user pressed "cancel". This resulted in the DocumentManager being incorrectly notified that the file was renamed. Change-Id: I000c28204083c2e52de9bffb66611acb710be1cd Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-221-2/+2
|\ \ | |/
| * ClearCase: Fix: File operations in already checked out dirsKnut Petter Svendsen2013-11-211-2/+2
| | | | | | | | | | | | | | cleartool reports errors to stdErr not stdOut. Change-Id: Ice47e40f56157d52f8e4f73ba6ed8d87ad39f3c4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ClearCase: Handle read-only view private filesKnut Petter Svendsen2013-11-132-6/+19
| | | | | | | | | | | | | | | | | | View private files have state NotManaged. In the corner case where a NotManaged file is read-only they should be made writeable by the ReadOnlyFilesDialog, and not vcsOpen()-ed. Change-Id: Icfeab6bebb76cc01da693b3bfff7b46c45b106b4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-291-1/+2
|\ \ | |/
| * Remove most leading/trailing blanks from translated messages.Friedemann Kleint2013-10-241-1/+2
| | | | | | | | | | | | | | They are a hassle for translators and reviewers alike. Change-Id: I363138212b692cf75fe1605df8af3721315d37e1 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Revert "ClearCase: Check if ClearCase command is executable"Friedemann Kleint2013-10-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It introduced a warning: SOFT ASSERT: "QFileInfo(m_settings.ccBinaryPath).isExecutable()" in file .\clearcaseplugin.cpp, line 382 on machines that do not have clearcase installed (which is the majority). This reverts commit d3bef1b08833ea4e9076582b10abdca481e7a00f. Change-Id: I7c5c599a9b2af175fd4d4c8d81b5c59dcbdffdba Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-162-25/+0
|\ \ | |/
| * Vcs: Remove snapshot supportTobias Hunger2013-10-152-25/+0
| | | | | | | | | | | | | | | | The functionality is unused. Change-Id: I45017106509b8dbff9f3eff3aaef6de19be31ce7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ClearCase: Check if ClearCase command is executableKnut Petter Svendsen2013-10-161-0/+2
| | | | | | | | | | Change-Id: I8e873fcb1bdc3543a031a55b8e027a574a101752 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ClearCase: Better debug outputKnut Petter Svendsen2013-10-161-1/+23
| | | | | | | | | | Change-Id: I1daeda0159558377a43f04845b974155ddc77d57 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ClearCase: Enable Diff, History and Annotate only for elementsKnut Petter Svendsen2013-10-161-0/+3
|/ | | | | | | Diff, History and Annotate only makes sense for ClearCase elements. Change-Id: I81f6f5d3fcc81d7c493cc6b3a621902fb57cabe4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Do not try to add files that are already trackedOrgad Shaneh2013-10-114-0/+14
| | | | | | | | Task-number: QTCREATORBUG-2455 Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: Cristian Tibirna <tibirna@kde.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Rename diffBaseDirectory -> workingDirectoryOrgad Shaneh2013-10-101-5/+5
| | | | | | | Can have other usages than diff Change-Id: Ieb01a88eb95503ac89b2f2c1120eddf404cdce5a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Pass workingDirectory for annotateOrgad Shaneh2013-10-102-8/+8
| | | | | | | | | | Required for supporting renames on annotate. The renamed file (and possibly its parent directory) doesn't exist anymore, so it shouldn't be passed as a working directory. Change-Id: I809e8df17c1dc5199e533b525244a668eccbcd5f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
View Lorry Controller Status