summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitcommand.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Git: Remove GitCommandTobias Hunger2011-10-051-232/+0
| | | | | | | | Use VCSBase::Command instead. Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb Reviewed-on: http://codereview.qt-project.org/6079 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* git: Reuse more code from vcsbaseTobias Hunger2011-10-051-7/+1
| | | | | | Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24 Reviewed-on: http://codereview.qt-project.org/6071 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Git: Remove debug codeTobias Hunger2011-10-051-10/+0
| | | | | | | Change-Id: Icf23c7c3c1c8858d281434f519accc96984cdd09 Reviewed-on: http://codereview.qt-project.org/6069 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* minor stylehjk2011-09-191-1/+1
| | | | | | Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7 Reviewed-on: http://codereview.qt-project.org/5122 Reviewed-by: hjk <qthjk@ovi.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
|
* Git: Fix commiting with Author and Email setTobias Hunger2010-09-241-8/+6
| | | | | | Fix commiting with Author and Email set on Windows. Task-number: QTCREATOR-2397
* Merge remote branch 'origin/2.0'con2010-07-051-1/+1
|\ | | | | | | | | | | Conflicts: doc/qtcreator.qdoc src/plugins/bineditor/bineditorplugin.cpp
| * Git: Fix misleading status message.ck2010-07-021-1/+1
| | | | | | | | Reviewed-by: Friedemann Kleint
* | VCS: Show message box on timeouts/Add SSH prompt.Friedemann Kleint2010-05-211-13/+30
|/ | | | | | | | | | | - Use message boxes on timeouts. - Add a configuration for a graphical SSH password prompt binary with defaults - Launch commands that require authentification with no terminal on UNIX and environment variable SSH_ASKPASS set accordingly. - First attempt at introduce a common function to synchronously run VCS commands in base plugin with flags. - Use standard execution log entries in all VCS plugins (outputwindow).
* VCS[git]: Introduce optional pull --rebase.Friedemann Kleint2010-03-191-3/+16
| | | | Do 'git rebase --abort' if something fails.
* Long live the king!hjk2010-03-051-1/+1
|
* VCS: Fix time-out handling for synchronous processes.Friedemann Kleint2010-03-011-22/+13
| | | | | | | | | | Introduce static utilities to Utils::SynchronousProcess for synchronous processes that mimicks the handling of Utils::SynchronousProcess (apply timeout after no more data are available on stdout/stderr as opposed to waitForFinished()). Task-number: QTCREATORBUG-777
* Git: Improve Timeouts.Friedemann Kleint2010-02-261-3/+20
| | | | | | | - Observe timeout setting when running synchronous commands. - Increase Default on Windows - Stop process with terminate first (signal). Task-number: QTCREATORBUG-777
* Merge remote branch 'origin/1.3'Oswald Buddenhagen2010-01-291-1/+1
|\ | | | | | | Trailing whitespace removal re-applied manually.
| * remove trailing whitespaceOswald Buddenhagen2010-01-291-1/+1
| | | | | | | | doing it in 1.3 as well to avoid possible later conflicts
* | Add functionality to show progress for the application in task bar/dock.con2009-11-271-2/+1
|/ | | | | | Move the API to the progress manager. Added a first Mac implementation, other platforms are pending.
* Code model: Update on changes from the versioning system.Friedemann Kleint2009-11-111-0/+2
| | | | | | | | | 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>
* Revert "Code model: Update on changes from the versioning system."con2009-11-101-2/+0
| | | | | | | | This reverts commit 7aa24116935249a840e1350a6f8de73bc794fb09. It breaks the code model updates completely. So reverting this change until we have the right thing. Reviewed-by: Roberto Raggi
* Code model: Update on changes from the versioning system.Friedemann Kleint2009-11-091-0/+2
| | | | | | | | | | | Add state logic to CppCodeModelManagerInterface, making it aware whether an indexer is running, protect the update methods from another invocation while running. Add changed signals to IVersionControl and VCSManager and wire them to the update methods. Add a menu action for manually updating. Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: con <qtc-committer@nokia.com>
* VCS/git: Make blame go to current editor lineFriedemann Kleint2009-10-011-1/+9
| | | | using queued slot/variant cookie magic in command
* long live the kinghjk2009-08-141-1/+1
|
* Add a clone wizard for version control (base classes + git/svn).Friedemann Kleint2009-07-171-21/+8
| | | | Task-number: 244831
* Update license headers and sales contact details.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* It may come as a total surprise, but Unix doesn't like cmd.exe :-DDaniel Molkentin2009-06-021-1/+5
| | | | Reviewed-By: Ossi
* Fix for recent git version where git.exe became git.cmd.Daniel Molkentin2009-06-021-1/+3
| | | | | | | | Run git as a cmd.exe subprocess as a workaround. In the long term we should look into enabling QProcess to properly handle .bat and .cmd files. Reviewed-By: Ossi
* Fixed b390e56d676cd0a838e4b59b51b431535f760bb0Friedemann Kleint2009-05-291-4/+7
| | | | | | Do not check for existence of the binary, breaks on Windows due to .exe (and potentially paths). Use waitForStarted(). On this occasion, kill on timeout in case of password prompts.
* Fixes: don't timeout trying to run git when git cannot be found.Lorn Potter2009-05-291-0/+4
| | | | | Task: <task number> Details: <additional information>
* Close write channels of git processes.Friedemann Kleint2009-05-281-0/+1
| | | | ..in an attempt to suppress password prompts.
* Report termination of git pull/push (which was missing feedback).Friedemann Kleint2009-04-091-1/+36
|
* Fixes: Using a git configuration with colored output breaks much of the git ↵Friedemann Kleint2009-03-171-0/+27
| | | | | | | plugin. Task: 248067 Details: Use --no-color where appropriate. Use a hack to remove color sequences from output for "status" since it does not support the option as of git 1.6.2.
* Fixes: change file license headers to include LGPLhjk2009-02-251-21/+17
|
* Make the git plugin look for the binary in the path specified in the ↵Friedemann Kleint2009-02-191-2/+4
| | | | settings. Previously, the environment was passed to the process, but that did not affect the location of the binary.
* Fixes: add timeout value to git pluginlowinu2009-02-131-5/+6
| | | | | | RevBy: tba Details: - as on windows some git commands take much longer it happens fairly often, that git timeouts. - added a timeout value to the option to let the user choose maximum timeout value (minimum is 10 seconds, maximum 5 minutes)
* replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() ↵hjk2009-01-201-2/+1
| | | | by Core::ICore::instance()
* Remove #include <extensionsystem/pluginmanager.h> from icore.h, ahjk2009-01-191-0/+1
| | | | forward declaration is sufficient.
* Bump year in licence header.Daniel Molkentin2009-01-131-1/+1
|
* Fixes: Enable multiselection in file list of git submit editorFriedemann Kleint2009-01-131-0/+138
Details: Refactor the git command to be able to run a batch. Run diff and diff --cached in a batch
View Lorry Controller Status