feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

2048 Commits

Author SHA1 Message Date
Tobias Hunger
e506bdba93 Git: Improve handling of author information 
Task-number: QTCREATORBUG-2610
Reviewed-by: Robert Loehning
 2010-10-05 17:40:04 +02:00
Tobias Hunger
13b442f289 Git: ignore spaces in diff 
Ignore spacing changes in diff (based on same setting as used to
ignore spacing in git blame).

Task-number: QTCREATORBUG-2526
 2010-10-05 12:30:24 +02:00
Tobias Hunger
6694994823 Git: Unbreak cloneing of non-default branches from local repos. 
Do not fail when cloning non-defautl branches from local repositories:
Branches do already exist in this case, so do not try to set them up
again.
 2010-10-05 11:28:37 +02:00
Tobias Hunger
cd6009c276 Git: Handle unusual HEADs 
Handle detached HEADs as well as cloning from repositories that default
to another branch but master. This is relevant when clonig local
repositories.

Reviewed-by: Friedemann Kleint
 2010-10-05 11:28:36 +02:00
Tobias Hunger
c9147b36e7 Git: Change mapping of repository to directory name 
Change the mapping of repository name to checkout directory name.
This should now work better with windows.
 2010-10-04 17:19:17 +02:00
Tobias Hunger
6b85c2d520 Polish the checkout wizard (base and git) 
* Polish the base checkout wizard
    * Make UI easier to grasp
    * Add tooltips explaining things

Task-number: QTCREATORBUG-2540
Reviewed-by: Robert Loehning
 2010-10-04 17:19:16 +02:00
dt
2ec3acaf4e Merge remote branch 'origin/2.1' 2010-10-04 16:15:57 +02:00
dt
6b6d9871b8 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
 2010-10-04 16:07:46 +02:00
Tobias Hunger
5ff8054862 Fix build on non-windows 2010-10-04 16:02:14 +02:00
Tobias Hunger
c7142affef Git: Only allow commit if author information is valid 
Check author information to be valid before enableing
the commit button.

Task-number: QTCREATORBUG-2410
 2010-10-04 15:49:22 +02:00
hjk
e6dd3ff5f0 version bump 2.0.91 -> 2.1.81 
Should have been done earlier. 2.1.80 was burned in the pre-2.1.0->2.0.1
days, and we'd like to have odd subminor for 'working' and even subminor
numbers for pure cherry-picking release branches anyway.
 2010-09-30 13:49:10 +02:00
Tobias Hunger
2cf9910070 Fixup formating of mr2178 
Merge-request: 2178
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2010-09-29 12:29:13 +02:00
Tuomas Puranen
65e95c3aba Added few new functions to IVersionControl, VCSManager and GeneratedFile to 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>
 2010-09-29 12:29:12 +02:00
Tobias Hunger
7a40a7bb0e Git: Do not require the path to be set in the config 
Fix regression where creator was no longer able to run git if the
PATH was not explicitly set in the configuration.

Task-number: QTCREATORBUG-2478
Reviewed-by: Robert Loehning
 2010-09-28 13:50:10 +02:00
hjk
4389f02097 version bump 2.0.90 -> 2.0.91 2010-09-27 16:57:34 +02:00
Tobias Hunger
1613208c00 Git: Fix commiting with Author and Email set 
Fix commiting with Author and Email set on Windows.

Task-number: QTCREATOR-2397
 2010-09-24 17:31:44 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment 
Reviewed-by: dt
 2010-09-23 13:40:26 +02:00
Leena Miettinen
e779886ab0 UI text - fix capitalization 2010-09-21 17:19:50 +02:00
Robert Loehning
1551faa678 git: Added workaround for older versions which don't know format:%B 2010-09-20 12:48:08 +02:00
Robert Loehning
96e06a9fbb git: Fixed launching of gitk 
In cases where binary 'wish' is not in PATH variable this could not be
started.
 2010-09-17 13:38:01 +02:00
Leena Miettinen
224b43034c UI text - fix capitalization 2010-09-17 11:14:38 +02:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching 
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
 2010-09-14 15:23:11 +02:00
Friedemann Kleint
66ad76de4f I18n: tr-fixes. 2010-09-13 16:51:43 +02:00
hjk
ff0ac20a42 coreplugin: use Core::Id is some places 2010-09-10 17:22:28 +02:00
dt
bde1ebaaea Remove EditorManager::ensureEditorManagerVisible() 
The function always switched to Edit Mode, which was the cause for
several bugs. Since openEditor() already does switch to the right mode,
the function is not really needed.

The following actions now respect the prefered mode of the editor:
"f file"-locator
The Open Documents list
Editor history navigation
 2010-09-06 13:56:53 +02:00
Friedemann Kleint
36a05bb5e3 VCS[git]: Remove unneeded 'success' confirmation of pull. 2010-09-01 16:03:00 +02:00
Robert Loehning
b719bbda42 VCS[git]: Added git fetch 2010-09-01 13:09:20 +02:00
hjk
63bc8a0050 replace version 2.1.80 by 2.0.90 2010-08-30 10:38:38 +02:00
Robert Loehning
e02e0f8c4a VCS[git]: Added showing logs of all branches 2010-08-27 15:52:18 +02:00
Robert Loehning
8e5edbec9e VCS[git]: Allow diff with current or remote branch 2010-08-27 15:52:17 +02:00
Robert Loehning
0d18732347 VCS[git]: Do not show pseudo branch "(no branch)" 2010-08-27 15:52:16 +02:00
Robert Loehning
ce24dfa378 VCS[git]: Ensure that only one branch is selected at a time 2010-08-27 15:52:16 +02:00
Friedemann Kleint
56e800927e VCS[git]: Environment settings. 
Make GitClient::synchronousGit use the process environment.

Windows: Add a setting to fake a 'HOME' environment variable
(%HOMEDRIVE%%HOMEPATH%) to make msysgit look for its SSH-keys
there not only when run from git bash, but also from Qt Creator.
Useful in MinGw-setups, where git must not be in the path.
 2010-08-26 13:45:01 +02:00
Friedemann Kleint
0f0c17111d VCS[git]: Add menu option for git amend. 
Task-number: QTCREATORBUG-1642
 2010-08-23 12:18:01 +02:00
Jarek Kobus
c072293ef0 Typos spotted while translating 2010-08-19 14:06:50 +02:00
Friedemann Kleint
817d4370d5 VCS: Add 'Check/Uncheck' all context menu to submit file list. 
Update 'Commit' button to show number of files to be committed.
Task-number: QTCREATORBUG-2090
 2010-08-19 10:04:21 +02:00
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