summaryrefslogtreecommitdiff
path: root/src/plugins/git/branchdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Git: Replace branch dialog with branches side panelAndre Hartmann2018-09-121-216/+0
| | | | | | | | | | This allows all kind of typical Git workflow (rebasing, merging, cherry-picking) without having the branches dialog on top of all windows. Task-number: QTCREATORBUG-19618 Change-Id: Iab078d79a589ff60fa8385c98ec2a23b352c084c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Utils: Purge asConstOrgad Shaneh2018-04-091-1/+0
| | | | | | | | Replace by qAsConst. Change-Id: I3301366f73c066c86f08df7188d70dc3b613c55c Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Git: Extract BranchUtils for re-use in Branches Side PanelAndre Hartmann2018-03-011-224/+13
| | | | | | | Done-with: Orgad Shaneh <orgad.shaneh@audiocodes.com> Change-Id: I1f48ffb3d9bb9b8d743ab6891c472fcfab778cf6 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Git: Fix initial button enabling in Branches dialogOrgad Shaneh2017-07-191-0/+1
| | | | | Change-Id: Iad99dd1468457b8de262ee16c4182ac9ff82e0b8 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Git: Move "Include tags" to branches dialogOrgad Shaneh2017-06-291-0/+6
| | | | | Change-Id: Icc06dbf8b80a55c3962967c1f37a9c506b8e5bd8 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Git: Expand branches also on internal model refreshOrgad Shaneh2017-03-261-0/+4
| | | | | Change-Id: I91e3b875be1a2c3b5da9ae7720709b34a7d83232 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Remove spaces in initializer listsTim Jenssen2017-02-221-1/+1
| | | | | | | Format initializer lists code style like. Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013 Reviewed-by: hjk <hjk@qt.io>
* Git: BranchDialog: Disable buttons when selection disappearsAndre Hartmann2017-02-091-3/+3
| | | | | | | | | | | | | Steps to reproduce the old and wrong behavior: 1. Open branch dialog 2. Select a branch 3. Select checkout 4. Branch is checked out, but no longer selected 5. Buttons like "Log" stay enabled, but don't serve any purpose Change-Id: I3974b7cb87553d1ff57fd5578b908f02c949a509 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Git: BranchDialog: constify local variableAndre Hartmann2017-02-091-2/+1
| | | | | Change-Id: I3c7d1fe63471127cd2d4b344d2341ccf6c3c93c0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Eradicate Q_FOREACH loopsOrgad Shaneh2017-02-061-4/+6
| | | | | | Change-Id: I29b6071ea244d1b3ae0701d36c90b1e93cf21fbb Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: hjk <hjk@qt.io>
* Git: Move msgRepositoryLabel from StashDialog to GitPluginOrgad Shaneh2017-02-051-2/+1
| | | | | | | It's being used by many dialogs. Change-Id: I3ef484cf8b9cc56210be1de5b4f201eb2f96ef67 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Git: Some more QStringList cleanupOrgad Shaneh2016-08-151-1/+1
| | | | | Change-Id: I0c6e8f768ee46985dab8ae14f88f2bc8d34fed26 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Git: De-noiseOrgad Shaneh2016-07-221-9/+7
| | | | | | | | | * Remove QLatin1{String|Char} where possible * Use initializer lists for QStringList Change-Id: I8479f87f4fc909b5d74d854956885564209538e4 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Git: Resize columns in branches dialog when data is changedOrgad Shaneh2016-06-231-2/+10
| | | | | | | When setting a tracking branch, creating or deleting a branch. Change-Id: I58dd06912fbf23900674a8714224ee414f1da4b7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Git: Show date and time in branches dialogOrgad Shaneh2016-05-191-0/+2
| | | | | | | | | This helps discovering recently active branches. Change-Id: Ic82e1257c2a3407149e62768ddf2fc25c1a54b6b Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Git: Use numerous formRobert Loehning2016-05-101-2/+2
| | | | | | | Change-Id: I5a5f8cc4f607f0dd80772eb97128bdefa753c201 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Git: Hide obsolete branches by default in branches dialogOrgad Shaneh2016-03-101-0/+9
| | | | | | | Task-number: QTCREATORBUG-15544 Change-Id: I411c7eacd2c154cad08234c0bd22e16dfecb961c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Git: ModernizeTobias Hunger2016-02-101-16/+16
| | | | | | | | | | * pragma once * member initialization * s/struct/class/ * Introduce a static GitPlugin::client() method and use it Change-Id: Ifdcac86dd16f3cdba11d564d03e9a15f00a6afdb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Git: BranchDialog: Remove unneeded copyAndre Hartmann2016-01-041-3/+1
| | | | | Change-Id: Ice31081fa11f73fa1e13287dcd3935c88b207b65 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Use Qt5-style connectsTobias Hunger2015-11-231-17/+17
| | | | | | | The heavy lifting was done by clazy. Change-Id: I60dcd378419b92f96dc681921701c9231ef8ee57 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Fix source repository resolution in Stashes dialogOrgad Shaneh2015-08-121-4/+2
| | | | | | | | | Remove workaround done in Branches and store copies where they're needed. Task-number: QTCREATORBUG-14850 Change-Id: I6a81fc5ac02fb11d444906af6cfbe768695c9965 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: s/GitPlugin::gitClient/GitPlugin::client/Tobias Hunger2015-04-081-8/+8
| | | | | | | ... same name as with almost all other plugins. Change-Id: I964159044d86685735e8b1e816a0bf67e0576fd8 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Replace QLatin1String("x") with QLatin1Char('x') where possibleKai Koehne2014-09-041-1/+1
| | | | | | | | | | Change-Id: I2f90c8ae7b5e968b9de882833f8661ab540a9232 Reviewed-by: hjk <hjk121@nokiamail.com>
* | VcsBase: Use static pattern for VcsBaseOutputWindowhjk2014-08-271-2/+4
|/ | | | | | | | Also rename to VcsOutputWindow. Change-Id: I79547b1154603a8c7b3604eadc5b460930c6109c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Git: Do not suggest tag name for local branchOrgad Shaneh2014-08-041-6/+10
| | | | | | | This causes unnecessary name ambiguity. Change-Id: Id27060edb19b4902f2a93da042eb8389754b8e04 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Implement unified diff editorjkobus2014-06-061-1/+1
| | | | | Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Git: Remove redundant null validationsOrgad Shaneh2014-05-261-2/+2
| | | | | Change-Id: I6977b7c7633191d768c39d0bfff43c8aedecae9d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Remove redundant null validationOrgad Shaneh2014-05-061-1/+1
| | | | | Change-Id: Id4b8629fcb0c4b7d26d849bc15ab0cbd61c19fd2 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-4/+4
| | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Git: Conditionally enable Reset button in branches dialogOrgad Shaneh2014-02-271-0/+1
| | | | | | | | | | Conditions: * There is an active local branch * The selected node is a leaf * The selected node is not the active branch Change-Id: I539dd13750737934378e503484646634e50a1aa7 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Remove refs/heads/ prefix from reset message in branches dialogOrgad Shaneh2014-02-271-2/+2
| | | | | Change-Id: Ia93cbb52038c1ea29f5fa441c9eb0e88cb11d9aa Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Add reset button to branches dialogTobias Hunger2014-02-251-0/+17
| | | | | | | | Task-number: QTCREATORBUG-11391 Change-Id: I5146a8b00a88124f96c788cba2bbfa786618ee20 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Branches dialog - ensure all documents are savedPetar Perisin2014-01-271-0/+9
| | | | | | Change-Id: Ia48157b10fb2f9eb3a8b9b8e7e541a736dd75b4f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Enable choosing non-fast-forward mergeOrgad Shaneh2013-12-091-1/+14
|/ | | | | | | Change-Id: I5972489d06637616953bd0d93a3b65c4d9918377 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Git: Improve branch name validationOrgad Shaneh2013-10-101-8/+2
| | | | | | | | * Do not allow leading dash * Do not allow existing local branches Change-Id: I3efbb90b7099719a7e90cada85a58a0f91bd9730 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.8'Oswald Buddenhagen2013-08-211-2/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/cpptools/cpptoolsplugin.h src/plugins/projectexplorer/customtoolchain.cpp src/plugins/vcsbase/command.cpp Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
| * Git: Fix autostash for branchesOrgad Shaneh2013-07-281-2/+2
| | | | | | | | | | | | | | Broken by 771fe03cfeda0b8514556ca29889fb35116a41c5 Change-Id: Ifb629535d2197bbee771050c94952068834614f3 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | Git: Cancel adding a branch if the git operation failsOrgad Shaneh2013-08-151-0/+2
| | | | | | | | | | | | | | e.g. If a branch with the chosen name already exists Change-Id: I22be3001ed68d6bf6f45d9180ad60403267d4ad9 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | VCS: Use a single filename for logOrgad Shaneh2013-08-071-1/+1
| | | | | | | | | | | | | | | | | | The list always contains a single entry (or none) anyway Take 2. This time it actually compiles ;-) Change-Id: I71a9822360a9b569ba79afa0f575e27918bb2e03 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git - Add Cherry Pick in branches dialogPetar Perisin2013-07-241-0/+11
| | | | | | | | | | | | Change-Id: Ic01846e3f8622cfa7b6c6ada8b626af6fa8cb3e9 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.8' into HEADEike Ziller2013-07-181-8/+10
|\ \ | |/
| * Git - couple fixes in branch based auto stashPetar Perisin2013-07-151-8/+10
| | | | | | | | | | | | | | | | - do not start stash scope when creating auto stash - return if reset fails Change-Id: I471abc1d430351192c46ac78041949ba81f11b09 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | tr()-fixes in git.Friedemann Kleint2013-07-151-4/+5
| | | | | | | | | | | | | | | | | | - Do concatenate message pieces that may not fit grammatically. - Common message for "Cannot launch". - Add period marker. Change-Id: Ic67b27e30143febebc9153a3cefe523ebfd4bc49 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-07-121-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I1310d473584f1e2cd44008d45747c868103bbde1
View Lorry Controller Status