feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,788 Commits 108 Branches 368 Tags
ddf4b613f3ebf3799f23f51a68c00649bfb84e95
Commit Graph

362 Commits

Author SHA1 Message Date
Friedemann Kleint
42b39023db VCS polishing: Change context menu entry for 'Blame parent'. 
... for git, hg as it is not obvious from the SHA1 displayed.
 2010-08-13 09:12:27 +02:00
Friedemann Kleint
b160c8a06d VCS[git]: Fix branch checkout: Use absolute path. 2010-08-12 14:52:36 +02:00
Friedemann Kleint
cb33332311 VCS[git]: Add branch combo to the checkout wizard. 
Provide UI with manual refresh button in BaseCheckoutWizardPage.
Change ProcessCheckoutJob to be able to execute several steps.
Implement in git.
 2010-08-12 14:44:57 +02:00
Friedemann Kleint
7e739985b2 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
 2010-08-06 10:46:50 +02:00
Robert Loehning
e2347b3d92 git: Added an option to undo unstaged changes only 2010-07-30 19:39:55 +02:00
con
6bd790bd0f Version bump 2010-07-22 18:05:53 +02:00
con
6503099bec Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/bineditor/bineditorplugin.cpp
 2010-07-05 13:54:07 +02:00
Friedemann Kleint
c3eb4b6611 VCS: Windows slash display fixing spree. 
Task-number: QTCREATORBUG-1795
 2010-07-05 09:52:32 +02:00
Alessandro Portale
679b5e91f1 User visible paths need to go through QDir::toNativeSeparators() 
Task-number: QTCREATORBUG-1795
 2010-07-03 20:05:20 +02:00
ck
07c83490cf Git: Fix misleading status message. 
Reviewed-by: Friedemann Kleint
 2010-07-02 13:17:42 +02:00
con
ede2a7c975 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
 2010-06-30 14:25:09 +02:00
Friedemann Kleint
38e91624de VCS[git]: Adapt to 1.7.0, handling of renamed files. 
Reviewed-by: con
 2010-06-28 12:34:39 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
Friedemann Kleint
6793f1f962 VCS[git]: Add arguments setting for gitk, add to locator. 
Task-number: QTCREATORBUG-1577
 2010-06-16 09:05:50 +02:00
Friedemann Kleint
59592c820c VCS: Do not force LANG=C on all commands. 
Introduce extra flag.

Task-number: QTCREATORBUG-1623
 2010-06-15 12:17:09 +02:00
con
2e10016210 Version update to match the planned version naming. 2010-06-11 16:41:11 +02:00
con
9250d0007d Version update to match the planned version naming. 2010-06-11 16:37:10 +02:00
Bill King
55edbe1c5b Fix parameters hidden by local variables. 2010-06-11 13:35:22 +10:00
Friedemann Kleint
33ec71adda VCS[git]: Use QProcess::startDetached() if possible for gitk. 
Task-number: QTCREATORBUG-1577
 2010-06-08 16:02:11 +02:00
Friedemann Kleint
7dc2760f0e VCS[git]: Add menu option to launch gitk. 
Task-number: QTCREATORBUG-1577
 2010-06-08 15:55:12 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
 2010-06-08 10:39:45 +02:00
Friedemann Kleint
c745155191 VCS/Diff editors: Set readonly attributes correctly. 
Make VCS-generated editors read-only, enable editing
when opening a patch.
Make VCS-Editor non-read-only by default, add setter
for "Forced read-only" that makes it a temporary,
read-only file.

Task-number: QTCREATORBUG-1528
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-06-07 14:53:28 +02:00
con
d326c16747 Version bump. 2010-06-07 13:45:49 +02:00
Friedemann Kleint
7b60fd1b89 VCS[Mercurial]: Make push/pull synchronous commands. 
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
 2010-05-25 12:24:18 +02:00
Friedemann Kleint
1c69b97ca6 VCS[git]: Make push/pull synchronous commands. 
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
 2010-05-25 11:48:53 +02:00
Friedemann Kleint
385ea8c9e0 VCS: Polish 91c4b0305c 
Do not clobber environment setting for SSH_ASKPASS.
Pass on QProcessEnvironment to CheckoutWizard.
 2010-05-25 09:38:41 +02:00
Friedemann Kleint
5364f5c152 VCS: Show message box on timeouts/Add SSH prompt. 
- 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).
 2010-05-21 17:46:00 +02:00
Friedemann Kleint
7003b82e2b Version control: Improve detection. 
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
 2010-05-20 16:24:56 +02:00
con
7f4cbe2383 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
 2010-05-20 09:28:00 +02:00
Friedemann Kleint
20f26c987f VCS[git/hg]: Prevent search for repository from creating folders 
... when autofs is involved. Check for files instead of folders
and stop checking/recursing up at '/' or $HOME. Further fixup
will follow.

Task-number: QTCREATORBUG-1361
Task-number: QTBUG-10495
 2010-05-20 08:48:17 +02:00
Daniel Molkentin
c58fedbf45 Add icons for checkout and clone wizards. 2010-05-19 18:40:45 +02:00
Friedemann Kleint
b4b177fa27 VCS[git/hg]: Prevent search for repository from creating folders 
... when autofs is involved. Check for files instead of folders
and stop checking/recursing up at '/' or $HOME. Further fixup
will follow.

Task-number: QTCREATORBUG-1361
Task-number: QTBUG-10495
 2010-05-19 17:41:14 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-05-17 17:40:40 +02:00
Friedemann Kleint
9432070656 Fix clone wizard texts. 2010-05-17 13:01:45 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00
con
1fd12ab63b Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
 2010-05-12 17:25:40 +02:00
Daniel Molkentin
bf95a99c51 New texts for the wizard types in the new dialog 
Reviewed-by: Leena Miettinen
 2010-05-12 14:16:49 +02:00
dt
9bc9fe73e1 File renaming 
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.
 2010-05-12 14:14:44 +02:00
con
a186982d4f Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdocconf
 2010-05-04 17:48:38 +02:00
Robert Loehning
5e3eb47e55 Using bold underlined font for active git branch. 2010-05-04 17:29:47 +02:00
con
84d9b647ee Version bump. 2010-04-30 11:58:05 +02:00
Friedemann Kleint
aa0926901b VCS: Initially enable menus. 
Fix breakage introduced by:
5923733889
 2010-04-26 09:12:58 +02:00
Friedemann Kleint
5923733889 VCS: Speed up 
Do not listen on ICore::contextChanged to update actions
(became slow after additional contexts).
git: Make code to find top level faster, avoid
constructing file info lists.
Acked-by: con
 2010-04-23 16:21:09 +02:00
Thorbjørn Lindeijer
5e96fa3a91 Create a single parent options page for the Version Control category 
Cleans up some duplication for each page.

Reviewed-by: Friedemann Kleint
 2010-04-12 18:54:05 +02:00
con
ded5ed975a Version bump 2010-03-31 18:06:02 +02:00
Jarek Kobus
20c0817a3f Replace QWizard with Utils::Wizard 2010-03-31 15:22:14 +02:00
dt
412486c2d0 Fix resizing of Show Commit dialog 2010-03-29 16:30:20 +02:00
Friedemann Kleint
93eb7d7be0 VCS[git]: Refuse to show sha 000000 or ^xxxx. 
Task-number: QTCREATORBUG-978
 2010-03-29 16:24:48 +02:00
Thorbjørn Lindeijer
2d21060bc9 Added icons to options dialog categories 
Some categories do not have icons yet, unfortunately.
 2010-03-26 17:47:31 +01:00