summaryrefslogtreecommitdiff
path: root/src/plugins/git/branchdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Git: Prevent double stash pop on branch checkoutOrgad Shaneh2013-07-111-1/+1
| | | | | | | | | | | | | | | | when Move Local Changes is selected Change-Id: I2c52e7fde56020370251c6eb93ed3f342fb8d9d8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | Git: Set remote-tracking branchOrgad Shaneh2013-07-101-1/+10
| | | | | | | | | | | | Task-number: QTCREATORBUG-8863 Change-Id: I06df735d85e2f9ed17c71385fed5057f8fc67d55 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.8' into HEADEike Ziller2013-07-081-4/+8
|\ \ | |/ | | | | | | | | | | Conflicts: qbs/pluginspec/pluginspec.qbs Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
| * Git: Remove wrong assertionsOrgad Shaneh2013-07-061-4/+2
| | | | | | | | | | | | | | | | | | Changed in 89523c14 Change-Id: I872c37633a877e982046b2a44266159d86defbde Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: hjk <hjk121@nokiamail.com>
| * Git: Update branches dialog when repository is changedOrgad Shaneh2013-07-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | and on fetch Task-number: QTCREATORBUG-9667 Change-Id: Id2e5080502bbc28d5f7900dd0433e468dda56c82 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | Git: Disambiguate branch/tag namesOrgad Shaneh2013-07-081-4/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-9700 Change-Id: I48e779fba65afc71ba13b426e526c3cb82070142 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Rename branchName -> fullNameOrgad Shaneh2013-07-081-12/+12
| | | | | | | | | | | | | | The model can contain tags Change-Id: I70a75534848232476447125801a5ca7e963bbdcc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Support remove/rename for tagsOrgad Shaneh2013-07-081-16/+34
| | | | | | | | | | Change-Id: I737d2405ef1a10ec451c4baceaea9a0bc194ac1e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Simplify button enabling conditions in branchesOrgad Shaneh2013-07-081-8/+9
|/ | | | | | Change-Id: I6484dd62eac80e1e4aba00890926e7dfb542f0be Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Prevent tracking tagsOrgad Shaneh2013-06-191-1/+2
| | | | | Change-Id: Iea935aa226b70de936653b7637b4b9bb5e9c64cf Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Display tracking branch for newly created branchesOrgad Shaneh2013-06-171-5/+6
| | | | | | | + Get rid of a workaround done for retrieving sha Change-Id: I4b7a6c6d9e9be5766f4fc540dc8b15037eb7948c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Execute rebase asynchronouslyOrgad Shaneh2013-06-171-1/+1
| | | | | | | | Rebase --continue might request an editor, which hangs if run synchronously Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Allow merge and rebase for detached HEADOrgad Shaneh2013-06-131-3/+2
| | | | | | Change-Id: Ia00c061b1f4a705cf815052921e6f6cf43d0867d Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Refactor stash handlingOrgad Shaneh2013-05-271-13/+8
| | | | | | | | | * Replace RebaseManager with ConflictHandler * Store StashGuard in GitClient, allow popping after a whole process is done (e.g. pull with resolved conflicts) Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove changeEvent(QEvent::LanguageChange) implementationhjk2013-05-271-12/+0
| | | | | | | | | This was implemented only for a small set of widgets. It's unlikely that we will ever have or even want a dynamic language selection, until then this code is only dead freight. Change-Id: I1bff4e1e89057786c0e5cb57225a508c5d390d9c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Git: Fix object leaksOrgad Shaneh2013-05-171-10/+10
| | | | | Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501 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: Support graph log for all log types (file, project, repo)Orgad Shaneh2013-04-291-1/+1
| | | | | | | | | * Added a Graph toggle button for log editor * Hide diff parameters when Diff is off * Remove GitClient::graphLog Change-Id: Ib87560bc4d6d7dbe866f0e58db8743a95df0622b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git - move ensureStash inside StashGuardPetar Perisin2013-04-261-3/+10
| | | | | | | this is where stash popup question belongs Change-Id: Ib3435f12eacd0b932ba2a67ecd728e5a41c0c64a Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: make ensureStash dialog more clear.Petar Perisin2013-04-191-3/+4
| | | | | Change-Id: I19ecde462d7a8a5fb00caa0414a9833ecab5057b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: bug fix for diff and log in BranchesDialogPetar Perisin2013-04-111-2/+4
| | | | | | | | | | | Branch log and diff were sometimes having problems. I have project in main git module, and I was not able to get branch diff and log in a submodule, because they open new editor and as soon as it is opened m_repository changes to the master module. Since repository working dir is set after editor opens, it is already changed in branchModel Branch diff and log should now work as expected. Change-Id: I72f730d77b8fe23ef6eac757415fe96321ef147b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: added rename branchPetar Perisin2013-04-081-0/+32
| | | | | Change-Id: I327a2bc91b871dc03797d9af52bb2d32be8e76d2 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>
* 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>
* | Git: Use StashGuard for merge and rebaseOrgad Shaneh2013-01-241-16/+6
| | | | | | | | | | | | Change-Id: I7c9059396aaac78c769518b34c7bf68bfe9932ec Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | Git: Explicitly pop stored stashesOrgad Shaneh2013-01-241-4/+4
| | | | | | | | | | | | | | | | | | If the user created another stashed between save and pop, this stash will be restored instead of the intended one. Change-Id: I605c9f440345d8c7e0876f4f60daa7146bebb212 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Replace synchronousStash with ensureStashOrgad Shaneh2013-01-231-3/+3
| | | | | | | | | | | | | | | | When flags are not used. syncStash doesn't return result, which can be useful for StashGuard Change-Id: I1327b5d8d10410e7a3b9fdb07a03b476d5abcdc4 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Use stash pop instead of apply...Orgad Shaneh2013-01-231-4/+1
| | | | | | | | | | | | | | ... when the stash should be removed on successful pop Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Fix issues in the branch dialogTobias Hunger2013-01-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split part/next/last into a 'part' node and a 'next/last' node instead of 'part/next' and 'last' node. This is closer to what git does. * Fix some model-issues along the way;) * Unhighlight remote checked-out branches again once they are no longer the current one. * Remove stale nodes after removing a branch. When removing 'first/next' kind of branches, do not keep a empty 'first' in the tree. Task-number: QTCREATORBUG-8518 Change-Id: Ia5650540aa58354aaab513199c8622392bdbd37f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* | Git: Auto stash for branchesPetar Perisin2013-01-071-1/+56
| | | | | | | | | | | | | | | | | | Allow user to handle local changes when switching branches. Task-number: QTCREATORBUG-8417 Change-Id: I62d615aadfbd81c8ae03f3cd292b98773a36e1e7 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Added Merge and RebasePetar Perisin2013-01-071-0/+39
|/ | | | | | | | | | | | | Added git functions - "Merge" and "Rebase" They are in the "Branches" dialog: - Merge - merge selected branch into current one - Rebase - rebase current branch on selected one Task-number: QTCREATORBUG-8367 Change-Id: I9ed306c64d5d4b7bd1d58730a5e1009f0bd4ec0e Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Git: Prompt to checkout after adding a branchOrgad Shaneh2012-06-041-0/+3
| | | | | Change-Id: Ifc215303f42dcba71298f906fb6d2e576d3033d3 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Git: Allow Checkout for remote branchesOrgad Shaneh2012-06-041-1/+1
| | | | | Change-Id: Ic1b402314c29c70a24d314ead674166839a61d42 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-4/+4
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Replace Q_ASSERTs with QTC_ASSERTsTobias Hunger2012-01-131-2/+3
| | | | | | | or even with QTC_CHECKs. Change-Id: I6df67f088bb2f944f0a1abd751fdb192db2be298 Reviewed-by: hjk <qthjk@ovi.com>
View Lorry Controller Status