summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitversioncontrol.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Git: Really add new/existing filesOrgad Shaneh2013-11-181-2/+1
| | | | | | | | Task-number: QTCREATORBUG-10117 Change-Id: Ic254cb2f7860ca0973cfda58cf66f62b1b8eaeb7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Vcs: Remove snapshot supportTobias Hunger2013-10-151-93/+0
| | | | | | | | The functionality is unused. Change-Id: I45017106509b8dbff9f3eff3aaef6de19be31ce7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Do not try to add files that are already trackedOrgad Shaneh2013-10-111-0/+5
| | | | | | | | Task-number: QTCREATORBUG-2455 Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: Cristian Tibirna <tibirna@kde.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Show active branch next to command in progressOrgad Shaneh2013-08-271-1/+5
| | | | | | | | | Revised topic is "master (MERGING)" instead of MERGING This should also fix topic getting stuck as REBASING Change-Id: I934643f5b4e632318495f141536c666f775bd15d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Capitalize display nameOrgad Shaneh2013-06-111-1/+1
| | | | | Change-Id: I1274cf39ad02e214c64b0ca3308381adae2a5a80 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Style fixesOrgad Shaneh2013-06-111-2/+3
| | | | | | Change-Id: I600e939e99de77e92de1ff068a5ebad98eb736ca Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clean headers in Git.Friedemann Kleint2013-04-051-2/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ClearCase: Don't show Hijack button for dynamic viewKnut Petter Svendsen2013-03-111-2/+0
| | | | | | | | | The Hijack button (makeWriteableButton) should only be shown for snapshot views. Change-Id: I809981885d18b6057d82f73b5104b0f1041cd255 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Require 1.7.2Orgad Shaneh2013-02-201-17/+3
| | | | | | | | Remove legacy code Change-Id: I0ce03f7a34c92b48ceb705a0feec43e0ba89ef5c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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: Remove "Branch" from synchronousCheckoutBranchOrgad Shaneh2013-01-241-2/+2
| | | | | | | | | | | | | | Other refs can also be checked out using this function Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Use stash pop instead of apply...Orgad Shaneh2013-01-231-1/+1
| | | | | | | | | | | | | | ... when the stash should be removed on successful pop Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Rename synchronousBranch -> synchronousTopicOrgad Shaneh2012-11-301-2/+2
| | | | | | | | | | Change-Id: I272e9db7a560f6e72dda6a0368d463da820f5b0b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Add whitespace after control keywordsOrgad Shaneh2012-11-281-1/+1
| | | | | | | | | | | | | | | | find -name \*.cpp -o -name \*.h | \ xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g' Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390 Reviewed-by: hjk <qthjk@ovi.com>
* | Id: Add QByteArray constructorOrgad Shaneh2012-11-201-1/+1
| | | | | | | | | | | | | | | | | | Distinguish from const char * one. QString ctor is yet to be removed Change-Id: I2da231036c6417353b0566d39666d918ad141c6d Reviewed-by: hjk <qthjk@ovi.com>
* | Git: Report current branchMathias Hasselmann2012-11-161-1/+6
| | | | | | | | | | Change-Id: Ied5ac2749b111d3b646080311ac6b52b3f86dc33 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Refactor branch/HEAD accessOrgad Shaneh2012-10-221-6/+10
|/ | | | | Change-Id: I0c9955737033c0f839ac1f6ea053fecc20c24d48 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: CleanupOrgad Shaneh2012-07-021-2/+2
| | | | | | | | * Remove unused 'silent' argument * Do not output 'git --version' command Change-Id: Ia940efd5ae7e9f262552841c11d20c3d6df559a3 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: Find correct topLevelOrgad Shaneh2012-01-111-1/+1
| | | | | | | Task-number: QTCREATORBUG-6756 Change-Id: Iefaa8cb112f7da6e6eb76ec852f8f61abcd626ef Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* core: use Core::Id for IVersionControl::id()hjk2012-01-111-2/+2
| | | | | Change-Id: I54e17c91c3e2a69d598ed485235dbf7ec62b4615 Reviewed-by: hjk <qthjk@ovi.com>
* vcs: s/VCS/Vcs/hjk2012-01-091-1/+1
| | | | | | | | According to style guide. Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* 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: Reuse more code from vcsbaseTobias Hunger2011-10-051-1/+1
| | | | | | Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24 Reviewed-on: http://codereview.qt-project.org/6071 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* VCS: Add id to IVersionControlTobias Hunger2011-04-201-0/+6
| | | | ... and all derived classes
* VCS: Notify project wizard about config changesTobias Hunger2011-04-151-0/+5
| | | | | | ... and have the project wizard update the available VCS. Task-number: QTCREATORBUG-4423
* VCS: Do not claim to support any operation if unconfiguredTobias Hunger2011-04-151-29/+27
| | | | | | | Make sure none of the VCS systems claims it does support any VCS operation while unconfigured. This stops the specific VCS from showing up in wizards, etc. till they can actually be used.
* Update license.hjk2011-04-131-14/+13
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* Merge branch '2.1'con2010-12-171-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
| * License headers.con2010-12-171-7/+11
| |
* | Git: Add options to diff editorTobias Hunger2010-11-221-1/+1
|/
* Fixup formating of mr2178Tobias Hunger2010-09-291-3/+3
| | | | | Merge-request: 2178 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Added few new functions to IVersionControl, VCSManager and GeneratedFile to ↵Tuomas Puranen2010-09-291-0/+15
| | | | | | | | | | | | support the funcationality needed by the trac plugin. All the version control plugins updated to have implementations according to the interface changes. Merge-request: 2178 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Merge-request: 2178 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Version control: Improve detection.Friedemann Kleint2010-05-201-7/+5
| | | | | | | | | | | | Merge managesDirectory() and findTopLevelForDirectory() into one giving managesDirectory() an optional topLevel parameter. This removes the need to go up the directory hierarchy twice when checking for Merurial or git and also saves some checks for CVS/Subversion. VCSManager: Check cache in reverse order starting out with the full path first to improve handling of nested repositories. Rubber-stamped-by: con Acked-by: dt
* File renamingdt2010-05-121-0/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-By: con Reviewed-By: Friedemann Kleint We now support renaming files. The version control system tries first to rename, if that doesn't support or can't rename the file we do a normal rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not. (perforce untested)). We correctly notify all editors of the renamed file and tell the project manager to rename the file in the project. Note: Only the qt4projectmanager knows how to rename files. Note: renaming folders, moving files to different folders, renaming .pro/.pri files is not supported. Those things can be later added after this has proven to work correctly in the simple case. Also we don't do any actions based on the renaming like renaming classes, changing include guards or #include lines.
* VCS: Add 'Annotate' context menu entry to build issues task window.Friedemann Kleint2010-03-191-0/+10
|
* Long live the king!hjk2010-03-051-1/+1
|
* VCS[git]: Make version fail warning less obtrusive.Friedemann Kleint2010-02-161-1/+1
| | | | | | | Display correct warning if git is not installed. Do not display it as error (popping up the log pane) from IVersionControl. Introduce separate caching flag to avoid repeated execution if git is not installed.
* VCS[git]: Implement add using '--intent-to-add' depending on version.Friedemann Kleint2010-02-021-5/+23
| | | | | | Implement IVersionControl::vcsAdd() using --intent-to-add with a cached version check. On this occasion, implement vcsDelete() as well using 'git rm -f'.
* VCS[git]: Add support for stashes.Friedemann Kleint2010-01-151-1/+100
| | | | | | | | | | | 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.
* VCS[hg, git]: Add support for repository creation.Friedemann Kleint2010-01-121-1/+9
| | | | | | | | | | | | | Add repository creation operation to IVersionControl, implement for hg and git, add convenience slot with prompts to VCSBasePlugin. Add respective menu options and make menus are visible in case no VCS is active. Change project wizards extension page to list VCS that are capable of repository creation in a QComboBox in case the directory is not managed by another VCS (in which case it lists that one for operation 'add'). On that occasion, polish the Project selection to use a QComboBox as well and add some smartness to find the most suitable project to add via path matching.
* Make method naming more consistent.Tobias Hunger2010-01-071-1/+1
| | | | | | | | | | | | * Use id() for methods returning a string used to represent some type of object. * Use displayName() for strings that are meant to be user visible. * Quieten some warnings while touching the files anyway. * Move Factories to their products in the plugins where that was not done before. Reviewed-by: dt
* VCS: Introduce Base class for VCS plugins, use in git.Friedemann Kleint2009-12-081-13/+0
| | | | | | | | | | | | | | | | | | | | Fixes: - Cannot diff a file that does not belong to a project - Cannot commit when a temporary diff/log view is open due to the current file pointing to a temporary directory - git's project-related actions not passing the correct relative path. Implementation: - Centralize code to listen for Qt Creator's relevant state changes in VCSBasePlugin, dispatching the changes to the instances affected. (avoiding multiple invocations of searches/QFileInfo on current). - Do the same for the corelistener catching closing SubmitEditors. - Introduce VCSBasePluginState representing the relevant state (current file/project). - Call git with working directory set and relative arguments - Remove setEnabled/isEnabled() logic of IVersionControl - Pass toplevel from VCSManager to avoid duplicate searches.
* Code model: Update on changes from the versioning system.Friedemann Kleint2009-11-111-0/+5
| | | | | | | | | Add changed signals to IVersionControl and VCSManager and wire them to the update methods. Add a menu action for manually updating. Improved version of reverted 7aa24116935249a840e1350a6f8de73bc794fb09. Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
View Lorry Controller Status