aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/commitdata.h
Commit message (Collapse)AuthorAgeFilesLines
* Git: SubmitEditor: Add untracked files without stagingAndre Hartmann2025-11-161-0/+1
| | | | | Change-Id: Ib91180d04ab4b6ba06a311dcdce8d1524b789bc9 Reviewed-by: Orgad Shaneh <[email protected]>
* Git: SubmitEditor: Fix unstaging added filesAndre Hartmann2025-11-161-0/+1
| | | | | | | | | When added files are staged, the need to be unstaged in a two step sequence: First unstage, then intend to add. Otherwise they appear as untracked. Change-Id: If270cbbd81e4bb83c84d2f55d55f1f0a6a3b32ae Reviewed-by: Orgad Shaneh <[email protected]>
* Git: SubmitEditor: Add remove untracked files actionAndre Hartmann2025-08-041-0/+1
| | | | | Change-Id: I6586d595fa58da965f965a80612a9e9bfde85b8b Reviewed-by: Orgad Shaneh <[email protected]>
* Git: SubmitEditor: Add actions for conflicted filesAndre Hartmann2025-08-041-1/+7
| | | | | Change-Id: I2368eb97faf844cd010b005fc19691fec30242d7 Reviewed-by: Orgad Shaneh <[email protected]>
* Git: SubmitEditor: Add actions for untracked filesAndre Hartmann2025-07-301-1/+2
| | | | | | | | | | | | | | Add actions to stage and unstage them for commit or to add them or a mask to gitignore. The leading '/' makes the path anchored to the repository root: "/foo/bar/CMakeList.txt.user" "/foo/bar/CMakeList.txt.*" "/foo/bar/*.user" Change-Id: I38583f4e097597486f5ded680f1048ed1f9ea4c0 Reviewed-by: hjk <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]>
* Add FilePath variant for EditorManager::addContextMenuActionsEike Ziller2025-07-211-4/+0
| | | | | | | | | | | | And use that for the new file based context menu items in the git submit editor. That adds more actions like directory search, file properties, and Open With, and generally unifies the items better. Amends a9d6ae57ab49bc484def3c94e304b57683fe11a8 Change-Id: I8698bc8bf5259b8cb61c65cb7444d316616ffc5c Reviewed-by: André Hartmann <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]>
* VCS: Further reduce QTextCodec dependencyhjk2025-06-131-1/+1
| | | | | | | | | Use the new Utils::TextEncoding (a thin wrapper containing a codec's name) instead of a codec itself. Change-Id: I29d61c9884b7e35dc59d8123e697c63f6b748caa Reviewed-by: André Hartmann <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]>
* Git: SubmitEditor: Add more file context menu actionsAndre Hartmann2025-05-261-4/+12
| | | | | | | | | | | | * Copy to clipboard * Open file in editor * Show file in file manager, file system or terminal * Stage and unstage file Change-Id: I1f1d16009e7d943071f746267ef3143e19e1a07d Reviewed-by: Leena Miettinen <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]> Reviewed-by: André Hartmann <[email protected]>
* Git: SubmitEditor: Add recover and revert actionsAndre Hartmann2025-05-211-0/+6
| | | | | | | | | | ... for deleted and modified files to the context menu. This also provides the setup for other file context menu actions for git and for other version control systems. Change-Id: Ide388fcce997185ed4de2a8b04d9d2aeb2a2617b Reviewed-by: Orgad Shaneh <[email protected]>
* Some QTextCodec related cleanupshjk2025-05-191-4/+0
| | | | | Change-Id: I8ccd5e26bfced1be913713ace12e63f0ff338998 Reviewed-by: David Schulz <[email protected]>
* Utils: Introduce a Utils::TextCodec classhjk2025-05-141-1/+2
| | | | | | | | | | | | | Meant as replacement for QTextCodec, which is deprecated. The initial attempt to just use the codec name everywhere turned out to be a bit limited and lead to "non-speaking code" (!isEmpty, ...), so this here is a bit more class-y. For now, the new Utils::TextCodec still uses QTextCodec internally. Change-Id: I001e0769acd4e2a044063dde98ffaca278b1ca03 Reviewed-by: David Schulz <[email protected]>
* VCS: Replace more uses of QTextCodec with its namehjk2025-05-091-1/+1
| | | | | | | | QTextCodec is as part of Qt5Compat still deprecated, and may not survive a Qt 6 -> Qt 7 transition. This here reduces its direct use in some places. Change-Id: I71f1c0faf20b00125dee8eb4fb0cd5d7316ce369 Reviewed-by: Orgad Shaneh <[email protected]>
* Git: Initialize GitSubmitEditorPanelDatahjk2025-04-291-5/+3
| | | | | | | | | | ... and remove the since 6e552e43416df72 unused clear() methods of CommitData members. Amends 6e552e43416df72. Change-Id: I94d1cad5266306057330f076149b996dff9a0828 Reviewed-by: Christian Kandeler <[email protected]>
* Git: Return Result<CommitData> from GitClient::getCommitData()hjk2025-04-241-1/+1
| | | | | | | | ... and make the template part of CommitData to remove the need of "out" parameters. Change-Id: I1d28e71392bd08e13970fc6c1c8cefac0079b094 Reviewed-by: David Schulz <[email protected]>
* Git: Replace "SHA1" with "hash" in code and commentsAndre Hartmann2024-09-091-1/+1
| | | | | Change-Id: Iaa6712338b86a5a7fd4889734d5650c6751fcf95 Reviewed-by: Orgad Shaneh <[email protected]>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <[email protected]>
* Git: Convert to Tr::trAlessandro Portale2022-10-061-11/+4
| | | | | Change-Id: I7fb1753109a9263c70c01713f5f4895db6b73662 Reviewed-by: Alessandro Portale <[email protected]>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <[email protected]>
* Git: Support user configured comment characterOrgad Shaneh2022-08-261-0/+1
| | | | | | Task-number: QTCREATORBUG-28042 Change-Id: I96aea27434ba138637728a7fd7d1450e1eee260a Reviewed-by: André Hartmann <[email protected]>
* Vcs: Use more FilePath for file pathshjk2021-08-021-1/+3
| | | | | Change-Id: I855cde65d034a9647972a7fddf1e8266d7ccfa88 Reviewed-by: Orgad Shaneh <[email protected]>
* More QRegularExpression and include for Qt 6hjk2020-06-251-0/+4
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: Ia537e26efd3f37319c38d906e569b255768371f9 Reviewed-by: Eike Ziller <[email protected]>
* Git: ModernizeAlessandro Portale2018-11-101-1/+1
| | | | | | | | | modernize-use-using modernize-use-default-member-init modernize-use-equals-default Change-Id: Iaccd5611cfc2056d357a0545f8522f02d6f8f0ed Reviewed-by: Orgad Shaneh <[email protected]>
* Git: ModernizeOrgad Shaneh2018-09-191-2/+2
| | | | | | | | | * Use auto * Use override * Use some member initializers Change-Id: I3ca000d1c8e4d02331d58b85e68e4d771c636b29 Reviewed-by: André Hartmann <[email protected]>
* Git: Add Sign off feature in git commit viewTasuku Suzuki2017-01-051-0/+1
| | | | | | | | | Change-Id: Icb0a8818f707d6a874a9b97318fc6a93205b4ce9 Signed-off-by: Tasuku Suzuki <[email protected]> Reviewed-by: André Hartmann <[email protected]> Reviewed-by: Leena Miettinen <[email protected]> Reviewed-by: Tobias Hunger <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]>
* Git: Fix missing includeChristian Stenger2016-11-091-0/+1
| | | | | Change-Id: Id77828b24df73f6e28f1c2ae6fd7533e826a99c2 Reviewed-by: Orgad Shaneh <[email protected]>
* Git: Support typechangeOrgad Shaneh2016-11-091-0/+1
| | | | | | | Replacing a normal file with a symbolic link. Change-Id: Id07ab339e8fcdf039b61d6e459b8d751d499f4f6 Reviewed-by: Tobias Hunger <[email protected]>
* Git: Simplify translationsOrgad Shaneh2016-11-091-0/+2
| | | | | Change-Id: I6b1af54d6cb5bc5569f5fffdec29f00b37a34436 Reviewed-by: Tobias Hunger <[email protected]>
* Git: ModernizeTobias Hunger2016-02-101-14/+5
| | | | | | | | | | * pragma once * member initialization * s/struct/class/ * Introduce a static GitPlugin::client() method and use it Change-Id: Ifdcac86dd16f3cdba11d564d03e9a15f00a6afdb Reviewed-by: Orgad Shaneh <[email protected]>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <[email protected]>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <[email protected]>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <[email protected]>
* Git: Simplify commit message codec handlingOrgad Shaneh2014-03-181-1/+1
| | | | | Change-Id: I5f90d7f5a17ccbe8585efd8ac7f731440b10db61 Reviewed-by: Tobias Hunger <[email protected]>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <[email protected]> Reviewed-by: Kai Koehne <[email protected]>
* 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 <[email protected]>
* Git: Rename push enum valuesPetar Perisin2013-10-021-3/+3
| | | | | Change-Id: I2809096774882ba1e7e98e2805ad94f03a70dbdc Reviewed-by: Orgad Shaneh <[email protected]>
* 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 <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]>
* Git: Add commit type to CommitDataOrgad Shaneh2013-05-021-0/+4
| | | | | Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f Reviewed-by: Tobias Hunger <[email protected]>
* Git: Make file state resolving more accurateOrgad Shaneh2013-02-111-1/+2
| | | | | Change-Id: I238ef964df126a341c87dacf9344ff1570f31845 Reviewed-by: Tobias Hunger <[email protected]>
* 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 <[email protected]>
* | Git: Readd operator< for StateFilePairOrgad Shaneh2012-12-301-0/+10
| | | | | | | | | | Change-Id: Iabf481486582e61b08baf8d71416ae41984b9cff Reviewed-by: hjk <[email protected]>
* | 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 <[email protected]>
* | Git: Place conflicted files last in submit editorOrgad Shaneh2012-12-301-0/+2
| | | | | | | | | | Change-Id: Ie4c7423d85f3f568d04d6c86e8b8123c73dab5fb Reviewed-by: Tobias Hunger <[email protected]>
* | Git: Remove description from PanelInfoOrgad Shaneh2012-11-301-1/+0
| | | | | | | | | | | | | | It is not used anywhere Change-Id: I9884c4c015bc14cb78e35950c7544c8d004a73ca Reviewed-by: Tobias Hunger <[email protected]>
* | Git: Support merge statusOrgad Shaneh2012-10-291-0/+3
| | | | | | | | | | Change-Id: If0338d066a2844a8bedf3e5ecf89979dc5c20385 Reviewed-by: Tobias Hunger <[email protected]>
* | 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 <[email protected]>
* | Git: Remove unused default valueOrgad Shaneh2012-10-291-1/+1
| | | | | | | | | | Change-Id: I2e9354cc675281a5025706d023e92d43c81910f6 Reviewed-by: Tobias Hunger <[email protected]>
* | Git: Refactor checkLine as a member function in CommitDataOrgad Shaneh2012-10-291-0/+3
|/ | | | | Change-Id: I9a19cc7fd8cb2102eb8c5a1589b81164498d3c34 Reviewed-by: Tobias Hunger <[email protected]>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <[email protected]>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 01:14:09 +0000