aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/git.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove qmake build filesEike Ziller2022-01-201-61/+0
| | | | | | | | | | Removes qmake as a build system for building Qt Creator itself. Keep them for some tests that are not completely moved to CMake yet. Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb Reviewed-by: hjk <[email protected]> Reviewed-by: Christian Kandeler <[email protected]> Reviewed-by: Christian Stenger <[email protected]>
* Git: Aspectify settingshjk2021-03-191-3/+0
| | | | | Change-Id: I87dfeba360967cc77cc230811bcd9f67b3ea6e38 Reviewed-by: Orgad Shaneh <[email protected]>
* Vcs: Merge IVersionControl and VcsBasePlugin hierarchieshjk2020-01-311-2/+0
| | | | | | | | | | | | | | They were 1:1 in parallel, with quite a bit of function call ping-pong inbetween, for code-sharing-by-inheritance. Merge them by making VcsBasePlugin inherit IVersionControl and merge the derived classes below. Size of this patch is hard to avoid as all seven systems have to move simultaneously. Non-necessary potential follow-up cleanup have been left out on purpose. Change-Id: Icb71e4182af3db21069cc637e7ae87ffa3829791 Reviewed-by: Orgad Shaneh <[email protected]>
* Git: Inline BranchUtils in BranchViewAndre Hartmann2018-09-121-2/+0
| | | | | | | It is the only user now, after the branch dialog was removed. Change-Id: I3aa8409efeb52427cdc13799146c4aa87273b169 Reviewed-by: Orgad Shaneh <[email protected]>
* Git: Replace branch dialog with branches side panelAndre Hartmann2018-09-121-5/+4
| | | | | | | | | | 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 <[email protected]>
* Git: Extract BranchUtils for re-use in Branches Side PanelAndre Hartmann2018-03-011-2/+4
| | | | | | | Done-with: Orgad Shaneh <[email protected]> Change-Id: I1f48ffb3d9bb9b8d743ab6891c472fcfab778cf6 Reviewed-by: Orgad Shaneh <[email protected]> Reviewed-by: André Hartmann <[email protected]>
* Git: Eradicate Q_FOREACH loopsOrgad Shaneh2017-02-061-0/+3
| | | | | | Change-Id: I29b6071ea244d1b3ae0701d36c90b1e93cf21fbb Reviewed-by: André Hartmann <[email protected]> Reviewed-by: hjk <[email protected]>
* Git: Support Git GrepOrgad Shaneh2016-01-251-2/+4
| | | | | | Task-number: QTCREATORBUG-3556 Change-Id: Ieca1bdaa39281a2e085340f045e5a48b875f7967 Reviewed-by: Eike Ziller <[email protected]>
* Git: Replace CloneWizard with a Json wizardTobias Hunger2015-05-181-4/+0
| | | | | Change-Id: I2188c083665acc239bc98bf857ff57b071805fbc Reviewed-by: Orgad Shaneh <[email protected]>
* Git: Remove gitorious codeTobias Hunger2014-09-251-2/+0
| | | | | | | | | | | | | Gitorious has changed their APIs a while ago and nobody seems to have noticed. The only bug report I got was from Christian who tests Creator regularly. So the code seems to be unused, which I find not surprising considering the limited popularity of gitorious nowadays. Task-number: QTCREATORBUG-12858 Change-Id: Id92747fd146434ad737315320fa08afd96223a7e Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]> Reviewed-by: Christian Stenger <[email protected]>
* Git: Revive ChangeSelectionDialog UI fileOrgad Shaneh2013-10-011-1/+2
| | | | | | | | Much easier to maintain, real logic is more readable Change-Id: I7c5f7854ea9ee67a3e1eb7a328702fc19852fdb5 Reviewed-by: André Hartmann <[email protected]> Reviewed-by: Petar Perisin <[email protected]>
* Streamline mimetypes.xml filesOrgad Shaneh2013-06-071-2/+0
| | | | | Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d Reviewed-by: Eike Ziller <[email protected]>
* Git: Move submit highlighter to a separate fileOrgad Shaneh2013-06-031-2/+4
| | | | | Change-Id: I61e07b2abe3b1da1b56935bb3ce528a5f571705f Reviewed-by: Tobias Hunger <[email protected]>
* Git: Provide a commit editor for files opened externallyOrgad Shaneh2013-05-241-0/+2
| | | | | | Change-Id: I52fccf36cca032dda36102d4be2654eb7461de64 Reviewed-by: Eike Ziller <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
* Git: refactoring ChangeSelectionDialogPetar Perisin2013-04-041-2/+1
| | | | | | | | | | | > Dialog now combines show, cherry-pick and revert > has fixed path, and no way to change it > not created on stack Change-Id: I7cee0b2e775a80941b51a4ca023064baf0d6575c Reviewed-by: Orgad Shaneh <[email protected]> Reviewed-by: Petar Perisin <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
* derive TARGET from QTC_{LIB,PLUGIN}_NAMEOswald Buddenhagen2013-04-031-1/+0
| | | | | | | | the information is redundant now Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1 Reviewed-by: Tobias Hunger <[email protected]> Reviewed-by: Eike Ziller <[email protected]>
* centralize assignment of TEMPLATE = libOswald Buddenhagen2013-04-021-1/+0
| | | | | Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d Reviewed-by: Tobias Hunger <[email protected]>
* automatically include libs' and plugins' _dependencies.pri filesOswald Buddenhagen2013-04-021-1/+0
| | | | | Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e Reviewed-by: Tobias Hunger <[email protected]>
* factor out all plugin dependencies to _dependencies.pri filesOswald Buddenhagen2013-03-271-5/+1
| | | | | | | | this makes it uniform for all plugins Change-Id: I46ede2cb576059dfbaa74c2448517a102eb44ddf Reviewed-by: Eike Ziller <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
* Git: Rename ResetDialog -> LogChangeDialogOrgad Shaneh2013-03-011-2/+2
| | | | | | | Required for interactive rebase Change-Id: I024505bbde1c58a7ccb4ce931322e0f5b467552b Reviewed-by: Tobias Hunger <[email protected]>
* Generalize QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-161-1/+0
| | | | | Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 Reviewed-by: hjk <[email protected]>
* Git: Auto stash for branchesPetar Perisin2013-01-071-3/+6
| | | | | | | | | Allow user to handle local changes when switching branches. Task-number: QTCREATORBUG-8417 Change-Id: I62d615aadfbd81c8ae03f3cd292b98773a36e1e7 Reviewed-by: Orgad Shaneh <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
* Git: Introduce MergeTool supportOrgad Shaneh2012-11-071-2/+4
| | | | | Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d Reviewed-by: Tobias Hunger <[email protected]>
* Git: Offer recent list of changes for reset --hard.Friedemann Kleint2012-05-021-2/+4
| | | | | | | | This makes it easier to remove changed applied for review by Gerrit. Change-Id: I2e3407ae4e74b650d08d53fed37e9aeb11071a4e Reviewed-by: Tobias Hunger <[email protected]>
* Start on a gerrit plugin as a sub-plugin of git.Friedemann Kleint2012-04-261-2/+1
| | | | | | | | | | | | | | | - Add a gerrit window that shows a list of changes and buttons to display, apply or check out a change. - Uses the new Qt 5 Json API or the utils/json classes for Qt 4. Tested-by: Tobias Hunger <[email protected]> Tested-by: Orgad Shaneh <[email protected]> Change-Id: I14c6c2c2de8f95fb785752c7319be8638b386a1e Reviewed-by: Eike Ziller <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
* git: rename ScmGit into Githjk2012-02-241-1/+1
| | | | | Change-Id: I953008bbd9ae4d9e253e48f2562f6b1a34542a95 Reviewed-by: Tobias Hunger <[email protected]>
* Version control: Compile with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2012-01-311-0/+1
| | | | | Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819 Reviewed-by: Tobias Hunger <[email protected]>
* Git: Remove GitCommandTobias Hunger2011-10-051-2/+0
| | | | | | | | Use VCSBase::Command instead. Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb Reviewed-on: http://codereview.qt-project.org/6079 Reviewed-by: Tobias Hunger <[email protected]>
* Git: Rework branch dialogTobias Hunger2011-06-221-0/+6
| | | | | | | | | | | | | * Make adding new branches more discoverable * Make adding tracking branches more discoverable * Update UI Task-number: QTCREATORBUG-4943 Task-number: QTCREATORBUG-4944 Change-Id: Idcbf5f8321a3bd04c925e33d094bb479788a7d9b Reviewed-on: http://codereview.qt.nokia.com/588 Reviewed-by: Qt Sanity Bot <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
* Git: Add dialog to configure branchesTobias Hunger2011-05-121-3/+12
|
* centralize addition of pluginspecs to OTHER_FILESOswald Buddenhagen2010-11-031-1/+0
|
* Add icons for checkout and clone wizards.Daniel Molkentin2010-05-191-0/+3
|
* VCS[git]: Add support for stashes.Friedemann Kleint2010-01-151-4/+8
| | | | | | | | | | | Add non-modal stash management dialog and additional menu option "Stash snapshot..." to stash away changes prompting for a description, which will immediately replay the stash (take snapshot and continue working). Add interface to IVersionControl for creating/restoring/deleting snapshots for backup/complex undo operations (currently supported by git only). Add test options to VCSBasePlugin. Clean up and extend git client accordingly.
* Version control: Replace per-VCS output panes with a single one.Friedemann Kleint2009-08-101-2/+0
| | | | ...and give it some color and formatting.
* Added a gitorious clone wizard.Friedemann Kleint2009-07-241-0/+1
| | | | | | | ... based on the git clone wizard. Provide a wizard for browsing gitorious hosts. Task-number: 44831
* Add a clone wizard for version control (base classes + git/svn).Friedemann Kleint2009-07-171-2/+6
| | | | Task-number: 244831
* Rename qworkbenchplugin.pri to qtcreatorplugin.priAlessandro Portale2009-05-081-1/+1
|
* Add the *.pluginspec to OTHER_FILES so that we can use Locator for themdt2009-04-221-0/+2
| | | | Hopefully i didn't miss a plugin.
* Fixes: Enable multiselection in file list of git submit editorFriedemann Kleint2009-01-131-2/+4
| | | | Details: Refactor the git command to be able to run a batch. Run diff and diff --cached in a batch
* Fixes: Start a git branch dialog.Friedemann Kleint2008-12-191-6/+8
|
* Fixes: Refactor git settings code, add some more menu optionsFriedemann Kleint2008-12-041-2/+4
|
* Fixes: Enable switching of VCS according to currentProjectFriedemann Kleint2008-12-031-2/+4
| | | | | | Task: 205821 RevBy: con Details: Add a IVersionControl to git. Extend IF to able to return a name and add enabling options. Connect project explorer to enable the right VCS.
* Initial importcon2008-12-021-0/+35
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 03:16:02 +0000