summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitplugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Git: Wait with stashing on interactive rebase until user approvesOrgad Shaneh2013-12-051-5/+3
| | | | | Change-Id: Ieb8d0cd0906cdf0ea7a37e60e92a263c359c7a41 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Git: Use initStyleOption instead of setting options in paintOrgad Shaneh2013-12-031-4/+3
| | | | | Change-Id: Idc14c157478c7092fce7d688044cb0a99e47bebe Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Git: Allow push after fixupPetar Perisin2013-11-081-1/+8
| | | | | | | | Direct push after fixup is really useful, especially on gerrit, because it allows easy fixing and direct pushing commits under HEAD. Change-Id: I83980e451c9ae86ac1ac0a55170d6d4141f27d49 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Remove function pointer in changeRelatedActionsPetar Perisin2013-10-291-6/+4
| | | | | | | makes code more readable Change-Id: I8f6369bf571144dde468546b8f47695fd4ffdf44 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-221-2/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/git/gitplugin.cpp src/plugins/qt4projectmanager/qmakeproject.cpp Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
| * Git: Open LogChangeDialog on top of the main windowOrgad Shaneh2013-10-171-2/+2
| | | | | | | | | | | | | | Change-Id: I9fe92f4e1e91e7a4a80a34e802d0d6b8d92b77e4 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: Indicate affected commits for range operationsOrgad Shaneh2013-10-171-0/+31
|/ | | | | | | | | | * 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>
* Vcs: Remove snapshot supportTobias Hunger2013-10-151-12/+0
| | | | | | | | The functionality is unused. Change-Id: I45017106509b8dbff9f3eff3aaef6de19be31ce7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DVCS: Never prompt before committingOrgad Shaneh2013-10-111-2/+2
| | | | | | | Commit is local. There's no reason to prompt. Change-Id: I3aed5ad4931bc49c62d52f906100273739f4af89 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Rename "[Mm]ethod(s)" to "[Ff]unction(s)"Nikolai Kosjar2013-10-101-1/+1
| | | | | | | | | | | Only methods as programming functions are affected. Besides renaming some actions like "Switch Between Function Declaration/Definition" this mostly touches (api) code comments. This is a follow-up patch to commit 872bfb7. Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92 Reviewed-by: hjk <hjk121@nokiamail.com>
* Git: Disallow Commit and Push if rebase is in progressOrgad Shaneh2013-10-051-13/+10
| | | | | Change-Id: I35a6cf850bccf076d22a73b98b0422663c61b1d3 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Git: Rename push enum valuesPetar Perisin2013-10-021-2/+2
| | | | | Change-Id: I2809096774882ba1e7e98e2805ad94f03a70dbdc Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Allow direct push after commitAndre Hartmann2013-09-301-0/+13
| | | | | | | | | | | 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>
* Git: Set default button for change-related actions by triggering actionOrgad Shaneh2013-09-301-1/+4
| | | | | Change-Id: I536618e9b80f3ed213c6c54dd6c2becbb64c709b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Apply 'static' pattern to VcsManagerhjk2013-09-031-2/+2
| | | | | | | Adapt user and surrounding code. Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Core::Id: Remove some explicit casts to Core::IdTobias Hunger2013-09-031-62/+61
| | | | | Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb Reviewed-by: hjk <hjk121@nokiamail.com>
* Apply 'static' pattern to MimeDatabasehjk2013-09-031-1/+1
| | | | | | | | Also adjust and streamline using and surrounding code. Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* EditorManager: Use interface directly instead of going through ICorehjk2013-08-301-1/+1
| | | | | | | | In the majority of cases we were doing that anyways, having two ways is just needlessly confusing. Change-Id: Ied362a702c23beee528368d74df1f2aabe5807f8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Introduce message styleOrgad Shaneh2013-08-201-1/+1
| | | | | | | Similar to compile and app output panes Change-Id: Ib9ac6d8be880739ae78d0a39f7051cbe616e46c2 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Add reflogOrgad Shaneh2013-08-191-0/+12
| | | | | | Change-Id: Id328492826bdcf4b7f7e6933a9dc3931174de0fb Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Use correct output styleOrgad Shaneh2013-08-121-3/+3
| | | | | Change-Id: I95ea8078ae53e7339213765fbb8a79bff33f899c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Use a single filename for logOrgad Shaneh2013-08-071-2/+4
| | | | | | | | | 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>
* Revert "Git: Use a single filename for log"Orgad Shaneh2013-08-061-2/+2
| | | | | | | | | Breaks compilation This reverts commit a05ea7113368a807057410b84d7ef21409d818af Change-Id: I713f06a1fe1ff24f4721cda082fb732dc3f5c270 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Use a single filename for logOrgad Shaneh2013-08-061-2/+2
| | | | | | | The list always contains a single entry (or none) anyway Change-Id: I567b622efd42dd6f676bebb92fbf1c8774bd80ff Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix usage of EditorManager::editorsForFileNameEike Ziller2013-07-181-7/+2
| | | | | | | And move to using the corresponding method in document model. Change-Id: I80b12ceab8a91c5393b9c0422d660a8896ae09d8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix coding style for else statementsOrgad Shaneh2013-07-171-2/+2
| | | | | Change-Id: I1309db70e98d678e150388c76ce665e988fdf081 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make document model static and add some document related methodsEike Ziller2013-07-121-4/+1
| | | | | Change-Id: Ibcb863e67a2433529c9d2b6dec237f9d8b1d8d50 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Git: Remove args from diffOrgad Shaneh2013-07-111-4/+4
| | | | | | | They are unused Change-Id: I6cff3c6028208f1c7c0937c53b3f5090dae719a6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Move displayName from IEditor to IDocumentEike Ziller2013-07-101-1/+1
| | | | | | | | The display name is not editor instance specific, but belongs to the document. Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Rename IDocument::fileName --> filePathEike Ziller2013-07-091-1/+1
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Git: Use direct settings member instead of accessorsOrgad Shaneh2013-07-091-2/+2
| | | | | Change-Id: Iba2954934218bec92716a8df1c04fe9347defd17 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Merge remote-tracking branch 'origin/2.8' into HEADEike Ziller2013-07-081-0/+8
|\ | | | | | | | | | | | | Conflicts: qbs/pluginspec/pluginspec.qbs Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
| * Git: Fix crash on checkout branchOrgad Shaneh2013-07-081-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-9756 Change-Id: I3bdba870737bbffde6c0e6a9046a58ba78f097be Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Git: Update branches dialog when repository is changedOrgad Shaneh2013-07-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | 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: Always allow stash before cherry-pick/revertOrgad Shaneh2013-07-081-7/+2
| | | | | | | | | | | | | | | | Currently done only from "Actions on Commits" Change-Id: Ide34e198e72f554ba6fd75ef21aaaf35917b4f6a Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git - added ability to launch git guiPetar Perisin2013-07-051-0/+13
|/ | | | | Change-Id: I65ed3e0408e43e354a289bbbd385aec2e254746c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git - stash scope guard in submoduleUpdatePetar Perisin2013-06-171-1/+1
| | | | | Change-Id: I888d4013e88fdc6977f29ef3e27d243e55a1f1a7 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Disable rebase and fixup when there's a command in progressOrgad Shaneh2013-06-171-6/+13
| | | | | | Change-Id: Ifa2f781cb1f31afaf7b0af4e4a0dd08fb58296d3 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Execute rebase asynchronouslyOrgad Shaneh2013-06-171-2/+2
| | | | | | | | Rebase --continue might request an editor, which hangs if run synchronously Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Ensure documents are saved before executing destructive callsOrgad Shaneh2013-06-111-0/+24
| | | | | | Change-Id: I9ec0ae0ff6a1b70e5d4c322dbf2e53be57e3009f Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Fix title for Fixup CommitOrgad Shaneh2013-06-111-1/+11
| | | | | Change-Id: I9d2e9f76a165a57588c29bc1db1a087fc7cb441b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Style fixesOrgad Shaneh2013-06-111-1/+1
| | | | | | Change-Id: I600e939e99de77e92de1ff068a5ebad98eb736ca Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git - Get changes actions dialog back to where it wasPetar Perisin2013-06-101-4/+5
| | | | | | | | | | | | | | This dialog was before, in QtCreator 2.7, used only for show. It was in main git menu, and available always. Although a lot of new options were added to the dialog, I think it is good to get it back to where it was before, so that 2.7 users can find it easier. Also, I prefer this location for it, since it is easier to access here. Change-Id: I510ab0efb081194e70f6297125012034103e13e1 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Add Reset to locatorOrgad Shaneh2013-06-051-1/+1
| | | | | | Change-Id: I81b52b8f349cfd5e9d67bd48b0be32c48e5b2f8e Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Start interactive rebase in topLevelOrgad Shaneh2013-06-051-6/+8
| | | | | | Change-Id: I99edfed36b12942e64ee1947a46eddd1ca08b9ba Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Switch less often to edit modeEike Ziller2013-06-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This change * Removes IMode::type, ModeManager::activateModeType, and IEditor::preferredModeType, and adds IEditor::isDesignModePreferred instead * Adapts the mode switching code in EditorManager to handle multiple windows, for example switching to edit mode should only happen if the editor/view is in the main window. Otherwise the editor window should be raised and focused * Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor * Reverts the EditorManager::ModeSwitch logic to switch mode or make the current editor visible by default, introducing DoNotMakeVisible flag instead * Fixes a few instances where EditorManager::ModeSwitch should have been used One non-trivial problem left: If you open a .ui file and switch to an external editor window, edit mode is activated, because the current editor no longer is a .ui file, which means that the design mode gets deactivated. Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41 Reviewed-by: David Schulz <david.schulz@digia.com>
* Remove unused codejkobus2013-06-051-7/+0
| | | | | Change-Id: Icc4bb2648fc4e18e95216012ce08365940a80937 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git - remove unnecessary member m_createRepositoryActionPetar Perisin2013-06-041-3/+3
| | | | | Change-Id: I3b3f72c5699e63f3f273b1564ea0a093b6c9725b Reviewed-by: Orgad Shaneh <orgads@gmail.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 - execute fetch asynchronouslyPetar Perisin2013-06-041-1/+1
| | | | | | Change-Id: Ic2243adaa36444099f834676186331927f3f4588 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
View Lorry Controller Status