summaryrefslogtreecommitdiff
path: root/src/plugins/git/gerrit/gerritplugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Git: Allow direct push after commitAndre Hartmann2013-09-301-3/+6
| | | | | | | | | | | Git commit dialog: Added a drop-down menu to the commit button to execute "git push" or open the "Push to Gerrit" dialog directly after a commit or amend. Task-number: QTCREATORBUG-8854 Change-Id: I00ff8f816d1768e0cdaf6929126b55826788e578 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Core: Clean up some ICore::instance() useshjk2013-09-241-2/+2
| | | | | Change-Id: I888b30094ed75818ee3af58c94ebf8468afa5eb9 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectManager: Use Core::Id for progress typeshjk2013-09-041-1/+1
| | | | | Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Apply 'static' pattern to VcsManagerhjk2013-09-031-2/+1
| | | | | | | Adapt user and surrounding code. Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Core: Static pattern for ProgressManager, clean up all usershjk2013-09-021-20/+21
| | | | | Change-Id: I4af8793ca69a3af9e99baeb7c31dad3864266f91 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Gerrit: Notify on invalid configurationOrgad Shaneh2013-07-081-0/+2
| | | | | | Task-number: QTCREATORBUG-9548 Change-Id: I4c5f9a4c6b7a818d296a923df1d665c22afd8292 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Add Gerrit to LocatorAndre Hartmann2013-06-111-2/+3
| | | | | | | | | The Gerrit dialog itself was missing while Push to Gerrit was already there. Change-Id: Ie4b85cad9dba96beafb595c505daf28d0a1ceeb5 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Gerrit: Close write channel for fetch processOrgad Shaneh2013-06-111-0/+1
| | | | | Change-Id: I1557d2e57f5838d7820bcb41190ff2bb4b9a0473 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Git - execute push asynchronouslyPetar Perisin2013-06-041-1/+1
| | | | | | Change-Id: I0d5b0eaf562d30f34f01bcf344791a4ce766bdab Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Remove double warning for gerrit pushOrgad Shaneh2013-06-041-4/+1
| | | | | | Change-Id: I5581521753fa525c6bb9f53725c28f947c8bbd44 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Gerrit - Removed all patch set stuffPetar Perisin2013-05-311-92/+29
| | | | | | | Change-Id: I013c116fc7e0ac1571513005b8ea49992e0771a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Git - added submoduleDataMap to handle submodule dataPetar Perisin2013-05-281-9/+7
| | | | | Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Gerrit - use new diff editor for diffPetar Perisin2013-05-281-4/+11
| | | | | | Change-Id: I7ba84491a5f6796ff446c2e21487ed4c04441b82 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Gerrit Dialog - renamed "Apply" to "Cherry Pick"Petar Perisin2013-05-261-7/+7
| | | | | | | | | | Cherry pick is git command that everyone who works with git knows. First time I saw "Apply" I thought it was some git or gerrit command unknown to me. Renaming it to "Cherry Pick" makes dialog more clear, since user knows what command will execute when button is pressed. Change-Id: Ifbcad697ef5f5909a36dc008f716025d48a26ad0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Fix object leaksOrgad Shaneh2013-05-171-18/+10
| | | | | Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Use Git process environment for Gerrit plugin processesOrgad Shaneh2013-05-171-0/+2
| | | | | | Change-Id: Iab0124d3aeed189c5ffd900c02ce6b87293b9c79 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* UI text: fix VCS related stringsLeena Miettinen2013-05-161-2/+2
| | | | | | | Fix capitalization and punctuation and a typo. Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Git: Enable commit selection in Push to Gerrit dialogOrgad Shaneh2013-05-071-1/+4
| | | | | Change-Id: Ie0ca8322858ac75d4bacf8b3efe66fa40577e3a2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Git: Preserve reviewers list in GerritPushDialogOrgad Shaneh2013-05-071-2/+3
| | | | | | | | | Not stored in settings (it is not important enough), but usually the same reviewers are required for consequent changes Change-Id: I28564791419ac441478db65e51b09189b9f2f196 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Fix leak when GerritPushDialog is canceled or failsOrgad Shaneh2013-05-071-4/+8
| | | | | | Change-Id: Id7479f44ee01f68e1423cc8346bc80f78ddfedb4 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Fix validation in GerritPushDialogOrgad Shaneh2013-05-071-1/+7
| | | | | | Change-Id: I1764ccd4950d5d5fee3cbd00515716ef5f524bf0 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Allow reviewers specification in Push to Gerrit dialogOrgad Shaneh2013-05-041-0/+12
| | | | | Change-Id: I6126411209d73797cc7e4f7c15a6a49b50366c63 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Gerrit: Add topic in Push to Gerrit dialogOrgad Shaneh2013-04-301-1/+5
| | | | | Change-Id: I4f2df0d40d7518b1a88595ad2ff52fd50b8ac92d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git - added continue and abortPetar Perisin2013-04-211-1/+1
| | | | | Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* tr()-Fixes in git/gerrit.Friedemann Kleint2013-04-151-1/+1
| | | | | | | | Introduce common message for "Cannot run", remove exclamation marks. Change-Id: Ib3f36e95c67136041cde56e697ec4ba0a3b9549e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Add a function for getting current local branchPetar Perisin2013-04-081-9/+1
| | | | | | Change-Id: Ibda70cb896633cc7afa3a845b99aac523246c558 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Coding style modificationsPetar Perisin2013-04-081-1/+2
| | | | | Change-Id: I098cbde76e844229f189eb05d0e0b5013af8c5fd Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Gerrit: Added pushToGerrit dialogPetar Perisin2013-04-051-0/+52
| | | | | | | | Change-Id: Ic16eae2def11343ef7be5ce8378d24b5fd11a386 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Gerrit: added ability to save path for applying patchesPetar Perisin2013-04-051-8/+75
| | | | | | | | Change-Id: I3cc8f1d19784145a7fbf19c321ccbc079847fbc2 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Gerrit: Use GitClient functions for checkout and cherry-pickOrgad Shaneh2013-01-241-32/+14
| | | | | | | | | | | | | | This is cleaner, and for cherry-pick also handles conflicts Change-Id: I50a7035c532a2cfa07fdd960e70ffb4af666a80e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Use Core::Id in ICore::showOptionsDialoghjk2012-12-291-2/+2
| | | | | | | | | | Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04 Reviewed-by: hjk <qthjk@ovi.com>
* | Gerrit: Disable buttons while fetch operation is in progress.Friedemann Kleint2012-12-111-0/+5
| | | | | | | | | | | | | | | | | | Gerrit operations should not be started in parallel since they use FETCH_HEAD, which can cause mix-ups. Change-Id: Icb421c8065f680a4bb93acd63e1ffe6309ce774a Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | qbs files: Consolidate includePaths in QtcLibrary and QtcPluginOrgad Shaneh2012-10-051-4/+4
|/ | | | | | | Avoid using "." as includePath when it is unneeded Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* UI text: write Git in upper caseLeena Miettinen2012-10-011-1/+1
| | | | | Change-Id: I012af35287b0ee478eb99c95c54ba438f8e4e6d7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Make IOutputPane behaviour more granularDaniel Teske2012-09-131-1/+2
| | | | | | | | | The commit looks big, but it's mostly trivial. Also any build/run related popups are now "flashes" if the current mode has no placeholder. Task-number: QTCREATORBUG-7875 Change-Id: I3af40557f7af01798f905c0d1829423c80058cb6 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Changed return type of :ICore::mainWindow() to QWidget*Konstantin Tokarev2012-07-191-1/+0
| | | | | | | | Also removed all <QMainWindow> includes which are not needed anymore. Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4 Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* ActionManager API cleanup.Eike Ziller2012-05-251-2/+1
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.com>
* editormanager: simplify use of interfacehjk2012-05-111-1/+1
| | | | | | | Less code on the user side, same meaning. Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Gerrit: Make patch display behave like git diffOrgad Shaneh2012-04-261-2/+12
| | | | | Change-Id: If6b0b449d29b43a2eb6a135504c12caaf6fcd43b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Start on a gerrit plugin as a sub-plugin of git.Friedemann Kleint2012-04-261-0/+488
- Add a gerrit window that shows a list of changes and buttons to display, apply or check out a change. - Uses the new Qt 5 Json API or the utils/json classes for Qt 4. Tested-by: Tobias Hunger <tobias.hunger@nokia.com> Tested-by: Orgad Shaneh <orgads@gmail.com> Change-Id: I14c6c2c2de8f95fb785752c7319be8638b386a1e Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
View Lorry Controller Status