summaryrefslogtreecommitdiff
path: root/src/plugins/git/gerrit/gerritpushdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Gerrit: List remote branches also for non-fetched remotesOrgad Shaneh2015-02-161-2/+6
| | | | | | Task-number: QTCREATORBUG-13718 Change-Id: I0259d06f4f06b68af459d747176dc46b14a55008 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Gerrit: Gracefully handle error retrieving branch distanceOrgad Shaneh2015-02-161-9/+11
| | | | | Change-Id: If4f6babe654a6f667c36ac3afb851b078439d3b6 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Gerrit: Simplify loop in setRemoteBranchesOrgad Shaneh2015-02-161-14/+11
| | | | | Change-Id: I9f32080c15ca48a2eb9feb1693eabcc1d8f20dd5 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Gerrit: Polish push to gerrit dialogTobias Hunger2015-02-161-14/+9
| | | | | | | | | Make the UI a bit nicer and simplify the code to find remotes. Task-number: QTCREATORBUG-13718 Change-Id: I3b973fee30061232188c9aed3ad95abc8f8f095d Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-5/+5
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Gerrit: Rename memberTobias Hunger2015-02-041-4/+4
|/ | | | | | | This is more in line with what we do elsewhere. Change-Id: If5fb57a498c021c2c2f830d9aaa375bc13afeb19 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* PushToGerrit: Do not allow spaces in the reviewers editOrgad Shaneh2014-08-141-2/+3
| | | | | | Task-number: QTCREATORBUG-11930 Change-Id: I0566fe2ef1d6e5ad9d99256d8a57a8e876a2e0c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* PushToGerrit: Do not calculate number of commits for empty inputOrgad Shaneh2014-02-141-1/+4
| | | | | Change-Id: Ib2e5305dd47b486a963edf5bb04e6d16d76d5e68 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* PushToGerrit: Pass local branch to determineRemoteBranchOrgad Shaneh2014-02-141-7/+6
| | | | | | | Simpler Change-Id: Ice180200a1b78e57b8ff6b246db7b2e8f3b39eb1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Fix target branch auto-detection in Push to GerritOrgad Shaneh2014-02-141-18/+26
| | | | | | | | | | | | | | Initialization order is important. * updateCommits populates the LogChangeWidget. * determineRemoteBranch looks up by earliest commit (for which the LogChangeWidget must already by populated) * Assignment to m_suggestedRemoteBranch must come before calling setRemoteBranches * remoteComboBox was wrongfully used instead of targetBranchComboBox Change-Id: Ib0db057313c8fd65910b0ec7394b6b8c7d997dab Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Suppress "No local commits" error message in Push to GerritOrgad Shaneh2014-02-121-1/+2
| | | | | Change-Id: Ib0cf79acf48d24848fda92a8b7b06efe62b46dbc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Enable local branch selection in Push to GerritOrgad Shaneh2014-02-111-14/+28
| | | | | | | Show dialog even if there are no local commits in current branch Change-Id: I11e0c6505981712df51bb33694a6cba9704d7324 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Rename branch -> targetBranch in Push to GerritOrgad Shaneh2014-02-111-9/+9
| | | | | Change-Id: I725a7e9ece2bf1e8854dc077cb93a1f7cc1eb90c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Factorize ctor of Push to GerritOrgad Shaneh2014-02-111-50/+49
| | | | | Change-Id: Ib668d0e29bac25bc2f78d8885b4dfa89c292b489 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Replace bool argument with flagsOrgad Shaneh2014-01-291-1/+1
| | | | | | | | | For a start, it's a single flag. Will be extended. Also change the default for includeRemotes to false (most callers pass false) Change-Id: I969f89a06b85a42c134c0232d2947d58fe19ea0d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Add using Git::Internal to GerritPushDialogOrgad Shaneh2014-01-291-5/+6
| | | | | Change-Id: I7b2dab05809040397c7221ed830730bc1c5a019d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-1/+1
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Git: Fix draft ref for gerritOrgad Shaneh2013-12-311-1/+1
| | | | | | | | | | Change-Id: I884bcab46a7e11cbc3ea6c453bddd8b9d599e4cc Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | Git: Improve Push to Gerrit iconOrgad Shaneh2013-12-061-3/+1
| | | | | | | | | | Change-Id: I5ee6d308409eef60a240b89bb10ef35e2d5f1f62 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-061-2/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
| * Git: Prefer first match on Push to Gerrit with detached headOrgad Shaneh2013-11-051-2/+5
| | | | | | | | | | | | | | | | Following matches are likely to be merges, and not the branch that the first commit originated from. Change-Id: I80a442bf9f7bc7f5859a1f4c3d3e167d55b28241 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-291-0/+4
|\ \ | |/
| * Git: Disallow whitespace in topic on Push to Gerrit dialogOrgad Shaneh2013-10-281-0/+4
| | | | | | | | | | Change-Id: I02416c8a55fcdfdea1cbe349f7e78204c0200fd9 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | Git: Indicate affected commits for range operationsOrgad Shaneh2013-10-171-0/+21
|/ | | | | | | | | | * Reset: Strikethrough discarded commits * Interactive Rebase: Mark included commits * Push to Gerrit: Mark pushed commits Change-Id: I5599a72055fd94b88c55b74b3a1116c07e35c113 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* PushToGerrit: Filter out stale branchesOrgad Shaneh2013-07-121-13/+30
| | | | | | Change-Id: Ib4f1d7ead2c40f27be28fa45e042c3694c0444fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Gerrit: Replace --remotes with -r for "git branch"Orgad Shaneh2013-06-101-2/+2
| | | | | | | | | --remotes was added in 1.7.7 Change-Id: I691bfada8e0b4d2f00924caa76271ee256edf62c Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Remove double warning for gerrit pushOrgad Shaneh2013-06-041-18/+11
| | | | | | Change-Id: I5581521753fa525c6bb9f53725c28f947c8bbd44 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Enable commit selection in Push to Gerrit dialogOrgad Shaneh2013-05-071-2/+7
| | | | | Change-Id: Ie0ca8322858ac75d4bacf8b3efe66fa40577e3a2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Git: Fix changing remote in GerritPushDialogOrgad Shaneh2013-05-071-0/+2
| | | | | Change-Id: I881a0402b4ba2fd887e62e02cf64406324bd9dbe Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Prefer remote tracking branch in GerritPushDialogOrgad Shaneh2013-05-071-4/+14
| | | | | | | | In case it contains the latest remote commit Change-Id: Id9e4cc40b7d1aa9daac3a9a2cf9ba41f589da7eb Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Preserve reviewers list in GerritPushDialogOrgad Shaneh2013-05-071-1/+2
| | | | | | | | | 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: Some cleanup in GerritPushDialogOrgad Shaneh2013-05-071-6/+5
| | | | | | Change-Id: I452f7d929d9abc1224fa9f694c106345dcc96caa Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Fix validation in GerritPushDialogOrgad Shaneh2013-05-071-7/+13
| | | | | | Change-Id: I1764ccd4950d5d5fee3cbd00515716ef5f524bf0 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Hide remote in Push to Gerrit dialog if there is only 1Orgad Shaneh2013-05-061-5/+9
| | | | | Change-Id: Id4b701e16f6edc74b2ad19b5255d84ceca5ec216 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Allow reviewers specification in Push to Gerrit dialogOrgad Shaneh2013-05-041-0/+5
| | | | | Change-Id: I6126411209d73797cc7e4f7c15a6a49b50366c63 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Gerrit: Add topic in Push to Gerrit dialogOrgad Shaneh2013-04-301-0/+5
| | | | | Change-Id: I4f2df0d40d7518b1a88595ad2ff52fd50b8ac92d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clean headers in Git.Friedemann Kleint2013-04-051-2/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Gerrit: Added pushToGerrit dialogPetar Perisin2013-04-051-0/+203
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>
View Lorry Controller Status