summaryrefslogtreecommitdiff
path: root/src/plugins/git/commitdata.h
Commit message (Collapse)AuthorAgeFilesLines
* Git: Move hasRemotes out of panel dataOrgad Shaneh2013-10-051-1/+1
| | | | | | | | | It is input only, and doesn't belong to the panel Also rename it enablePush Change-Id: I9d5e2246ce76854a54b02e69980214dd35a402ee Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Git: Rename push enum valuesPetar Perisin2013-10-021-3/+3
| | | | | Change-Id: I2809096774882ba1e7e98e2805ad94f03a70dbdc Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Allow direct push after commitAndre Hartmann2013-09-301-0/+8
| | | | | | | | | | | 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: Add commit type to CommitDataOrgad Shaneh2013-05-021-0/+4
| | | | | Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Make file state resolving more accurateOrgad Shaneh2013-02-111-1/+2
| | | | | Change-Id: I238ef964df126a341c87dacf9344ff1570f31845 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: Readd operator< for StateFilePairOrgad Shaneh2012-12-301-0/+10
| | | | | | | | | | Change-Id: Iabf481486582e61b08baf8d71416ae41984b9cff Reviewed-by: hjk <qthjk@ovi.com>
* | Git: compile fixhjk2012-12-301-2/+0
| | | | | | | | | | | | | | | | bool operator<(const CommitData::StateFilePair &a, ...) needs to be defined _after_ Q_DECLARE_OPERATORS_FOR_FLAGS(Git::Internal::FileStates) Change-Id: I03d5d79e2b77d0063c588aff1c549afd78a0ee3d Reviewed-by: hjk <qthjk@ovi.com>
* | Git: Place conflicted files last in submit editorOrgad Shaneh2012-12-301-0/+2
| | | | | | | | | | Change-Id: Ie4c7423d85f3f568d04d6c86e8b8123c73dab5fb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Remove description from PanelInfoOrgad Shaneh2012-11-301-1/+0
| | | | | | | | | | | | | | It is not used anywhere Change-Id: I9884c4c015bc14cb78e35950c7544c8d004a73ca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Support merge statusOrgad Shaneh2012-10-291-0/+3
| | | | | | | | | | Change-Id: If0338d066a2844a8bedf3e5ecf89979dc5c20385 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Extract FileState from CommitDataOrgad Shaneh2012-10-291-25/+20
| | | | | | | | | | | | | | | | | | * Add a QFlags type for it and use it * Clean up GitClient::addAndCommit * Rename Updated -> Unmerged Change-Id: Id96f71fb78af923605f5773f65a5625244a49499 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Remove unused default valueOrgad Shaneh2012-10-291-1/+1
| | | | | | | | | | Change-Id: I2e9354cc675281a5025706d023e92d43c81910f6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Refactor checkLine as a member function in CommitDataOrgad Shaneh2012-10-291-0/+3
|/ | | | | Change-Id: I9a19cc7fd8cb2102eb8c5a1589b81164498d3c34 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: Enable --no-verify for commitOrgad Shaneh2012-03-141-0/+1
| | | | | Change-Id: I88cfb7839b41467e3f6b25bea329eb15765e440e Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-2/+2
| | | | | | | | 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>
* Git: Flag conflictOrgad Shaneh2011-12-131-7/+7
| | | | | Change-Id: I3518367afeeb27b4408f396daf3362ae76148846 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Git: Do the right thing when commitingTobias Hunger2011-10-311-11/+27
| | | | | | | | | | | | | | | | Do the right thing when commiting in git. This allows staged files to be commited without additional changes, etc. Change-Id: Ib04c91cf9c105c4a2bbe013926112d6d5d3bade6 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Git: Support encoding convert of commit messagesYuchen Deng2011-10-211-0/+1
|/ | | | | | | | | We need read i18n.commitEncoding value, to write correct encoding of the commit file. In Windows OS, the default encoding is GBK, So we need convert to correct encoding of the commit messages. Change-Id: Id5f35745dba15da2c9ceb1266e0ea537cba7da73 Merge-request: 382 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Use classes in favor of structsTobias Hunger2011-08-021-1/+2
| | | | | | | Change-Id: I6ad2df70b7ad9b5fdc5baddc3ef85d0fed0c139c Reviewed-on: http://codereview.qt.nokia.com/2518 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* VCS[git]: Add menu option for git amend.Friedemann Kleint2010-08-231-0/+1
| | | | Task-number: QTCREATORBUG-1642
* Long live the king!hjk2010-03-051-1/+1
|
* long live the kinghjk2009-08-141-1/+1
|
* Update license headers and sales contact details.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* Fixes: change file license headers to include LGPLhjk2009-02-251-21/+17
|
* Bump year in licence header.Daniel Molkentin2009-01-131-1/+1
|
* Fixes: Make git diff work for staged files, do not launch submit if file ↵Friedemann Kleint2009-01-131-0/+2
| | | | | | list empty, make file model read only, add conveniences Details: Add a type data field to the git file model
* Fixes: Use a model for the submit file list (to resolve the git diff mess)Friedemann Kleint2009-01-121-2/+16
|
* chancge Nokia GPL exception version from 1.2 to 1.3hjk2008-12-161-1/+1
|
* Fixes: Add revert to git, name stage options according to git guiFriedemann Kleint2008-12-041-2/+2
|
* more file cosmeticshjk2008-12-021-28/+32
|
* off-by-one in headershjk2008-12-021-1/+0
|
* end-of-line whitespace correction of the new headershjk2008-12-021-10/+11
|
* Initial importcon2008-12-021-0/+81
View Lorry Controller Status