aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/mercurial
Commit message (Collapse)AuthorAgeFilesLines
* Mercurial: Fix "view" invoked from editorOrgad Shaneh2015-11-201-0/+2
| | | | | | | The editor is initialized with a SLOT reference to view. Change-Id: Ia793878f12c8caf8a71b565f78bf05db6bac74ca Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Mercurial: Make commiter/commiter email work againTobias Hunger2015-09-032-3/+2
| | | | | | | | | | We tried to get the data from a settings object that was removed elsewhere:-/ Task-number: QTCREATORBUG-14945 Change-Id: Ib7c1b9ced0cae776f24f250ebda24bcf14d3a782 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* VcsBase: Make some slots protected and update users accordinglyTobias Hunger2015-06-111-2/+2
| | | | | Change-Id: If38be72e9037126b6b697c5064a07de29a2ef8e5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add override keyword to IEditor & TextEditorWidget implementationsEike Ziller2015-06-091-5/+6
| | | | | Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Mercurial: Replace CloneWizard with a Json wizardTobias Hunger2015-05-189-268/+0
| | | | | Change-Id: Idcf5c523010ecb46d0ec6fa9475d182d14984852 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* CheckoutWizards: Use IVersionControl::createInitialCheckoutCommandTobias Hunger2015-05-111-16/+5
| | | | | Change-Id: I09dd38f66b9cad46d561493c2e27a833595d8728 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* CheckoutWizards: Simplify code to look up specific pagesTobias Hunger2015-05-111-8/+4
| | | | | Change-Id: I0098e17585d73e05632027676e7712ef9c843da2 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* IVersionControl: Add method to get a ShellCommand for initial checkoutsTobias Hunger2015-05-112-0/+21
| | | | | Change-Id: Iabc056dad186d788003b221afb34303c37fef728 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Sprinkle overrides over IVersionControlsTobias Hunger2015-05-081-12/+13
| | | | | | | Do this in a separate step to keep the next patch more readable. Change-Id: I37cfd5481dcbfda52135eccec30852aefde1b950 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Split up VcsCommandTobias Hunger2015-05-041-6/+6
| | | | | | | | | Move the biggest chunk into Utils::ShellCommand, add some Qt Creator specific magic in Core::ShellCommand and leave the rest in VcsBase::VcsCommand. Change-Id: I5fe6f7076e96023ad2164bcfaacfb3b65a7ff8a8 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Push the binary into the Jobs of VcsCommandTobias Hunger2015-04-291-3/+2
| | | | | | | This is the first step to generalizing the class for wider use. Change-Id: I40ccb5bec4fdcb9d0a67388160c867799331007b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Make VcsBaseClient return stderr on fullySynchronous executionTobias Hunger2015-04-131-1/+1
| | | | | Change-Id: I7a72a2f865148d7cf375897ec944a45f4b440818 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Vcs: Standardize on second based timeoutsTobias Hunger2015-04-131-1/+1
| | | | | Change-Id: Ia273fda05a4c4a1934819f26e5dc1b6b80a89f6f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Vcs: Move createVcsEditor into VcsBaseClientImplTobias Hunger2015-04-131-2/+4
| | | | | | | ... and use that in Git as well. Change-Id: I81c85fcf5a7da7e9f756f117ea6c38c15294a401 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Move createCommand and enqueueJob into VcsBaseClientImplTobias Hunger2015-04-101-2/+1
| | | | | Change-Id: I86a4ddfd6c53a3be61c56579d8eaf5d49258a8f1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Vcs: Unify options pages for VcsBaseClientImpl based VCSesTobias Hunger2015-04-093-46/+8
| | | | | Change-Id: Ia5dd7746f5857e7254251e3510c0987737cfad6d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Move handling of settings from VcsBaseClient to VcsBaseClientImplTobias Hunger2015-04-089-53/+32
| | | | | | | | | | ... and update users of that functionality accordingly. Unexpected plus: Now every supported VCS actually saves their setting when requested. Change-Id: I02db7b2ce14e5f52d26409b2a01aea290c2a294a Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClientTobias Hunger2015-03-261-3/+1
| | | | | Change-Id: I966a76ee4c1e5c45ac7332613e90cf511afc584c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Rename DiffHighlighter -> DiffAndLogHighlighterOrgad Shaneh2015-03-251-1/+1
| | | | | | | It is also used for log editors Change-Id: I8755d2aaa717ca47b0d9bbf935b121d4e099ef1b Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Vcs: fix missing icons in SubmitFileModelHugues Delorme2015-03-111-3/+3
| | | | | | | | | | | | | In SubmitFileModel, filetype icons are missing for not "overlaid" icons in Core::FileIconProvider. This is fixed by ensuring valid file paths are passed to QFileInfo. VcsBase::SubmitFileModel has now a "repositoryRoot" property so it can constructs absolute file paths. VcsBaseSubmitEditor::setFileModel() now relies on SubmitFileModel::repositoryRoot() instead of passing this info as annex parameter. Change-Id: Ie045c3a7b247a5b5d48d10aaaf67cb3fdcf9fa7e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Add accelerators to context menu entry in editorsOrgad Shaneh2015-03-101-2/+2
| | | | | Change-Id: I57b89670999d1f4857dcbdf94d8dc1f480e337c1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* VCS: Remove dead storesOrgad Shaneh2015-03-081-3/+3
| | | | | | Change-Id: I998e523c76bdc0b76cbc6089092a0dda4812ca16 Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Vcs: rename overload SubmitEditor::diffSelectedFiles() for rowsHugues Delorme2015-03-061-2/+2
| | | | | | | | | | | -> Renamed to diffSelectedRows() This allows to use easily Qt5 connects, without ugly casting to pick the right overload Change-Id: Ifaa0242febccb4e1aadd53470cc4b3be79b07c18 Reviewed-by: Orgad Shaneh <orgads@gmail.com> (cherry picked from commit 12fac12e8f78ed8770b90ae9f2aa80e1e78ee68c)
* Clean exported headers of the Core plugin.Friedemann Kleint2015-03-051-0/+1
| | | | | Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Mercurial: Transform path separators on statusOrgad Shaneh2015-03-021-1/+1
| | | | | | | | hg status uses native separators. Filtering untracked files assumes normalized ones. Change-Id: I63934f45e5787b895428b6c560f6d214d6689fbb Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Prefix duplicate names in Open Documents to make them uniqueOrgad Shaneh2015-02-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | If a document has a file name associated with it then the prefix is composed from path components (subdirectories), starting from the one where the file is located and going up the parents until the resulting name becomes unique among other open documents. If a document doesn't have an associated file name, then a sequential number (starting from 1) is appended to the display name of the document. This feature is useful when working with big projects that have lots of idendical file names across different subdirectories (e.g. Makefile.in, main.cpp, etc.) that need to be edited at the same time. It allows to easily recognize such a file when switching between documents in the editor, w/o the need to place the mouse pointer over the name entry to get its full path. Started-by: Dmitriy Kuminov <coding@dmik.org> Task-number: QTCREATORBUG-10185 Change-Id: I633ea6d9b9b4fce8b67335dbcce1bda29254efde Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Clean exported headers of the VcsBase plugin.Friedemann Kleint2015-02-262-0/+3
| | | | | Change-Id: Ibfe20bc7156e14e33fd0448586f5cc625494e008 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix layouts for OSX: Set the obligatory ExpandingFieldsGrowAlessandro Portale2015-02-241-0/+6
| | | | | | | | In Qt Creator, we want line edits to take up the free horizontal space. Change-Id: I4ff78035ab2481cc2f944fc02569638f06f0b090 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-1230-177/+177
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-1630-177/+177
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | VCS: Remove unneeded qualificationsOrgad Shaneh2015-02-043-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I061c7bdcade96961aed226a8348f8ab07ee95f5f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Do not use QDir::separator() for internal pathsOrgad Shaneh2015-02-021-4/+2
| | | | | | | | | | | | | | Internal paths are supposed to be normalized Change-Id: Ic6943ce13ad389dfdb44054a9e6f03da8c6cd88d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Vcs: in VcsBaseClient use functors to create log/diff parameter widgetsHugues Delorme2015-01-222-47/+16
| | | | | | | | | | | | | | | | | | | | Also API of VcsBaseEditorParameterWidget was changed to take benefit of C++11 lambdas. Slot executeCommand() is no longer virtual and only fires signal commandExecutionRequested(). The Vcs client just has to bind a lambda to this signal instead of some boiler-plate code like keeping track of the arguments of diff/log with "struct XxxDiffParameters", etc. Change-Id: I347c97d84a8324e9c661df4e6d9a6075980b020f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Mercurial: Sprinkle with autoTobias Hunger2015-01-222-13/+9
| | | | | | | | | | Change-Id: Id2a4adb5c4759e64affed8c5988feb58389ec1ea Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | VcsBase: Make VcsConfiguration page more dynamicTobias Hunger2015-01-211-2/+5
| | | | | | | | | | | | | | ... again making it more useful for the JSON wizard Change-Id: Ic7a454c4efc93eb48a44ab2a37ecd39f8c6f3ba7 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | VcsBase: Move vcsconfigurationpage into wizard subfolderTobias Hunger2015-01-211-1/+1
| | | | | | | | | | | | | | | | | | I will try to move all the wizard code that is still relevant there and then get rid of the rest. Change-Id: I3963f53fd39ef0f84c71218eb59b05213121cc90 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Vcs: Remove unused GetRepositoryRootOperationTobias Hunger2015-01-194-20/+0
| | | | | | | | | | Change-Id: I2443aef788c75a96ba19e2499dfb3f17c201d468 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Core: Remove unused functionality to checkout from VCSTobias Hunger2015-01-152-7/+0
| | | | | | | | | | Change-Id: I1ee17142e14200c5ae9597bbf9bee3f3978704f4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Core: Use FileName for file path in IDocumentOrgad Shaneh2015-01-121-1/+1
|/ | | | | Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* VCS: Rework disabling of ambiguous actionsOrgad Shaneh2014-11-173-8/+7
| | | | | | Task-number: QTCREATORBUG-13364 Change-Id: Ib9dc98964983f1a2808a89d90969089a09d2b55e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Remove unneeded import statements.Christian Kandeler2014-11-101-2/+0
| | | | | | | The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Mercurial: Disable hidden menu entriesOrgad Shaneh2014-11-102-29/+31
| | | | | | | | To avoid shortcut ambiguity Task-number: QTCREATORBUG-13364 Change-Id: Ibce1701be72376845624856b5de097332aaaccae Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Mercurial: Replace Alt+H with Alt+G for acceleratorsOrgad Shaneh2014-11-071-4/+4
| | | | | | | | Alt+H triggers the Help menu. Task-number: QTCREATORBUG-12531 Change-Id: I357db8f01fa28209a818e8c9a9587f213e0d0ca5 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Mercurial: Fix highlightingOrgad Shaneh2014-11-051-16/+22
| | | | | | | | * Hash is not a comment, "HG:" is. * First line *that is not a comment* is a summary Change-Id: If4e3428bfd4461dc105583a998be5d8185be3ab6 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Mercurial: Use TextEditor::SyntaxHighlighterOrgad Shaneh2014-11-051-17/+14
| | | | | Change-Id: Ic215b778a6365d8bce5cb8eeb0d016d8ce80e476 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Mercurial: Properly cleanup commit messageOrgad Shaneh2014-11-052-0/+12
| | | | | Change-Id: If035d3a2476408d3c54aa30f9b276bc5921845b3 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Mercurial: Show full commit message on describeOrgad Shaneh2014-11-051-1/+2
| | | | | Change-Id: I6631655f2795d887070f5e621ae5e25d72644578 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Mercurial: Remove invalid TODOsOrgad Shaneh2014-11-051-2/+0
| | | | | Change-Id: I7a4f4aef7d673d784ba7390fb9857a72b61a3799 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Mercurial: Remove unused functionOrgad Shaneh2014-11-052-10/+0
| | | | | | | | There is still createRepositoryManagementActions, but it can be used for reference of missing functionality... Change-Id: I5d4cf71c8bec8034890215a77a8ff9d136475837 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Mercurial: Use explicit namespace in cpp filesOrgad Shaneh2014-11-059-12/+47
| | | | | Change-Id: Ic6aaa88dfdc33966e0e8007a9420461811ae48c2 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 14:11:01 +0000