summaryrefslogtreecommitdiff
path: root/src/plugins/git
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Compile fixes for Qt 4.8Robert Loehning2014-08-131-3/+3
| | | | | Change-Id: Ie28d5901fe27fec4f928204296bf1013e10c556a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Try to show some meaningful diff when in merging state.jkobus2014-08-131-5/+23
| | | | | | | | | Instead of showing 3-way diff, show simple diff of conflicted file compared to the head of current branch. Task-number: QTCREATORBUG-10099 Change-Id: I9419236f0249fd2752f89ea80a2a644fb80af095 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix const correctnessjkobus2014-08-132-66/+66
| | | | | Change-Id: I40728827423ef0832640de2ebd2ad6d637fb4a5c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Save / restore state in diff editor when reloadingjkobus2014-08-131-0/+3
| | | | | | Task-number: QTCREATORBUG-12650 Change-Id: I0bb25ed39f8a15dd5da798ebf0ce72898a2e3b3d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* GitClient: use "git show" for show instead of "git diff"jkobus2014-08-131-18/+41
| | | | | | Task-number: QTCREATORBUG-12755 Change-Id: Idc4427425a3ef3e70c8738f1062e20d50bab69ca Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditor: Fix double click inside commit editorjkobus2014-08-121-5/+10
| | | | | | | | | The bug was that if you double-click a file in the commit editor, then double-click another one, the diff remains with the first one. Change-Id: I1f49b549c9dfd3ebd4ec6950ed28dd8cbc7d0227 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Fix crash when returning to commit editor from diffOrgad Shaneh2014-08-041-4/+5
| | | | | | | | | The crash happens on Linux/Xming. 2 subsequents calls to slotRefreshCommitData occur, m_commitDataFetcher is released when the first one is handled, and the second call dereferences NULL. Change-Id: Ibc06fe5dd89b790ac84544f6842cbf345d118703 Reviewed-by: Tobias Hunger <tobias.hunger@digia.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>
* DiffEditor: Use explicit DirectConnection for context menuOrgad Shaneh2014-08-041-1/+1
| | | | | | | The menu is expected to be populated after the signal is emitted. Change-Id: Ibcb9eaf3742942801ad79b98000d48cb93d5ae31 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Git: Parse for-each-ref output as UTF-8Orgad Shaneh2014-07-301-1/+1
| | | | | | | | Adding a branch with non-ascii chars then refreshing the branch list on Windows invalidates the branch name. Change-Id: I59d3e092c66fdcc7cea38a8451de6b5e42cd5de0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Git: Fix soft assertion on Abort RebaseOrgad Shaneh2014-07-221-1/+2
| | | | | | | | When a rebase was initialized in a previous session or by command-line. Change-Id: I1a185f1bf1a9caeeba0d8358debc855cbd926d48 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Rename gitBinaryPath => gitExecutableOrgad Shaneh2014-07-1811-23/+23
| | | | | | | Avoid confusion with gitBinDirectory Change-Id: I335cf6bc82284e02e0652b057f0b80f292d6ddc0 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: replace "Url" with "URL" in UI textLeena Miettinen2014-07-171-1/+1
| | | | | Change-Id: I6cf721e84b33183c97c9db8f98842a461af2f0d1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Use Git bin directory as an additional pathOrgad Shaneh2014-07-161-1/+5
| | | | | | Change-Id: I4738a4aec3b1b83b6d596497842086aeb1278f27 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Factor out resolving of bin directory on WindowsOrgad Shaneh2014-07-165-8/+32
| | | | | | Change-Id: Ifbafa0f5cb8329faedfd1da3674b87e46001acc3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Fix suggested directory for cloneAndre Hartmann2014-07-162-27/+16
| | | | | | | | | | | | For: * remote paths with port number * local repositories Task-number: QTCREATORBUG-12651 Change-Id: I7fef5c78499291047781ab48a7fef31d52613198 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Fix opening repository log when commit editor is openOrgad Shaneh2014-07-151-1/+3
| | | | | | | | Opening a commit editor inside a submodule then executing Local Repository Log opens the log for the supermodule. Change-Id: I264925e0f23e2372a09a28e788174a747f5870a8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Add auto tests for CloneWizardPageAndre Hartmann2014-07-134-0/+39
| | | | | Change-Id: I6b186731eba56a70ce799f17fdf538bb674a5439 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Rename some methods and variables in DiffEditorjkobus2014-07-072-28/+28
| | | | | Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Hide reload button for diff editor when there is no reloaderjkobus2014-07-071-12/+12
| | | | | | | | Refactor code a bit. Now DiffEditorController has a pointer to DiffEditorReloader. Change-Id: I224579127f112923bc665cd59717b0c4d833981b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Replace findRepository with VcsManager::findTopLevelOrgad Shaneh2014-07-033-8/+11
| | | | | | | Take advantage of its cache Change-Id: Ibf3b3b59821a92cd4475c6f8d6dd8212983d5c96 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Factor source directory resolving to a functionOrgad Shaneh2014-07-032-11/+14
| | | | | Change-Id: Ica2f6ad01052fb7130397740fcf2396de7cbbf9d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: De-noise GitClientOrgad Shaneh2014-07-031-30/+32
| | | | | | Change-Id: I9b001bd47af826a3c4611071ca0b3a0674079b01 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Git: Fix double-clicking a diff chunk in Show invoked from BlameOrgad Shaneh2014-07-031-1/+4
| | | | | Change-Id: I31ba36245b8b62b9d1e3c4a9125dec5ce6610766 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Always pass Core::Id by value.Christian Kandeler2014-07-014-15/+15
| | | | | | | | | | | Currently we pass in some places by value, elsewhere by const ref and for some weird reason also by const value in a lot of places. The latter is particularly annoying, as it is also used in interfaces and therefore forces all implementors to do the same, since leaving the "const" off is causing compiler warnings with MSVC. Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803 Reviewed-by: hjk <hjk121@nokiamail.com>
* Git: Fix showing commits from rebase-todo editorOrgad Shaneh2014-06-301-4/+1
| | | | | | | | | We used to need the repository root in order to resolve the file. This is no longer needed, since the raw patch is parsed instead. Change-Id: Ifdbbcd686a5ef7bbbd472f37b20190b9e9abebe7 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Use a separate thread for updating commit dataOrgad Shaneh2014-06-244-9/+87
| | | | | | Task-number: QTCREATORBUG-12449 Change-Id: I3057ca458272daac72c54abce1d6f9acf6a5d4af Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Fix sha1 resolving when a branch is added from detached HEADOrgad Shaneh2014-06-241-2/+7
| | | | | Change-Id: I0d8ad988411256fc284b84f78be6f54362ab19ea Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Remove diff editorOrgad Shaneh2014-06-243-18/+0
| | | | | | | Not used anymore Change-Id: Ie1c79583938e24c3bad8acad7acc2f0574234450 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Add on-demand branches expandingOrgad Shaneh2014-06-242-15/+20
| | | | | | | | | | | | Make "branches expanding" on demand and asynchronous. After "git show" there is clickable text: "Branches: <Expand>" in description. If user clicks this text then branches for commit is triggered and done asynchronously. Task-number: QTCREATORBUG-11293 Done-with: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Change-Id: I772cfef823d3f95e2b3060dfb5973157d81fc11a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Discard commit if submit widget is disabledOrgad Shaneh2014-06-233-15/+6
| | | | | Change-Id: I8f11f56565f46919e93a30f754465de3bc44437e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Gerrit: Display dependent changes as tree.Friedemann Kleint2014-06-233-8/+60
| | | | | | | | | | Add a depth member to GerritChange indicating the tree depth and populate it by searches over the dependent changes. Display the root changes sorted by date and add dependent changes to their deph=1 parent, avoiding deeply nested items. Change-Id: I66ccf392ce47514841c661820797e81996e9e5cc Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Gerrit: Use magic branch options to specify reviewersOrgad Shaneh2014-06-231-10/+9
| | | | | | | | | | | | | Enables specifying reviewers over http[s]. Supported since gerrit 2.6 (specifying reviewers will be broken for earlier versions). Prepare for supporting other options (draft, publish, topic...) Change-Id: Id0b6508409123cddb9dec5ea9e78d7a6a1423057 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Git: Remotedialog, replace QTableView with QTreeViewAlessandro Portale2014-06-204-20/+29
| | | | | | | | | | QTreeView is a better list view with columns than QTableView. One special reason for this change is that QTreeView finds a proper default row height regardless of the system DPI. Change-Id: I3342e2295a3782b480ea811bfe335e3a77482891 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Gerrit: Refactor preparing the introduction of a hierarchical model.Friedemann Kleint2014-06-204-85/+89
| | | | | | | | | | Change model and dialog methods to use QModelIndex and remove obsolete methods. Split out method to populate a list of standard items from a change. Change GerritModel::itemForId() to recurse over the tree. Change-Id: I9393f498ffbdf63ba3ad78146d041bcda3835527 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Gerrit: Read out dependency information.Friedemann Kleint2014-06-193-30/+112
| | | | | | | | | | | Pass on the command line argument --dependencies to the client, read out dependent/needed by changes and display them in the detailed text view. Move the toHtml() method from GerritChange to GerritModel to be able to display titles of dependent changes. Change-Id: I1d0b67a995d45a9fe5b7bdb3ff51cc905d58478f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Reinvent deprecated qSort as Utils::sortNikita Baryshnikov2014-06-192-2/+4
| | | | | | | Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Centralize error/warning/info iconsAlessandro Portale2014-06-171-2/+2
| | | | | | | | | There are multiple copies of these pngs in different plugins. Let's have one version in core, also as @2x variant. Change-Id: Iedff1a6190a72c1947dd202ae1ee46f59f9fb13c Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Revert "VCS: Open diff/blame editors in other split"Tobias Hunger2014-06-171-4/+2
| | | | | | | | | | | | | | This change has lead to complaints about diff views opening in apparently random places for users with several splits. This reverts commit 02b3a79c5f30cd5c808408caff598f2f4f0a299f. Conflicts: src/plugins/diffeditor/diffeditorplugin.cpp src/plugins/subversion/subversionplugin.cpp Change-Id: I2eab8ff2d88a9e12f4dc7ec3a9ca65455daf15e2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Git: Preserve author on cherry-pickOrgad Shaneh2014-06-122-17/+45
| | | | | Change-Id: Ib3184631145ed6c6eb72dd5b7c33e415fc0cc799 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Replace string literal with constantOrgad Shaneh2014-06-121-1/+1
| | | | | | Change-Id: I457d69f1eac9810e2746d9f544151e421c147fac Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Implement unified diff editorjkobus2014-06-066-782/+412
| | | | | Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Git: Native separators in GitClient::StashInfo::stashPromptAlessandro Portale2014-06-031-1/+2
| | | | | Change-Id: I5090d8eb8f5e262785735ced81a12b9473721204 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Fix mergetool prompt repliesOrgad Shaneh2014-06-031-0/+2
| | | | | | Task-number: QTCREATORBUG-12335 Change-Id: I68c36412f517072f551102b53cac2eeeff22f1e6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-281-0/+1
|\
| * Git: Fix tab order in gerrit optionsOrgad Shaneh2014-05-261-0/+1
| | | | | | | | | | Change-Id: I6169b97ebbc412e41cf42d3c4d87d0b9c8ddd93e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Cleanup: Remove searchKeywords from optionspage widgetsTobias Hunger2014-05-261-1/+0
| | | | | | | | | | | | | | | | | | | | If no specialization is provided then the UI strings are searched. So get rid of extra code collecting all those strings in a lot of places. Change-Id: Ibcb48a67e5c7b74e5960fe38b1cb2f74259b503a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Git: Fix handling of Enter key on LogChangeDialogOrgad Shaneh2014-05-261-1/+1
| | | | | | | | | | | | | | Broken in 7e59415f Change-Id: Ibbcd784965d101207ef873b1ba4d6d45e865c8b9 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Suppress command logging for tooltip display in branches dialogOrgad Shaneh2014-05-261-1/+4
| | | | | | | | | | Change-Id: I933a68c566a9acd40913ccc78363645572aa8ff8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
View Lorry Controller Status