Commit Graph

307 Commits

Author SHA1 Message Date
con
a9c803d310 Version bump. 2010-12-02 10:38:04 +01:00
con
d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
Oswald Buddenhagen
ddf5a01a30 kill dead source string 2010-10-25 17:50:56 +02:00
Tobias Hunger
11fb6d1c52 Git: Rename "reset" back to "undo uncomitted changes"
Rename "Reset..." back to "Undo Uncommitted Changes..." to be more
in line with git gui as well as the file-based operations.

Reviewed-by: Leena Miettinen
2010-10-15 18:02:47 +02:00
Tobias Hunger
e419119bb9 Git: Update string
Refer to "blame", not "annotate" since that is what we call the
action elsewhere.

Reviewed-by: Leena Miettinen
2010-10-15 18:02:46 +02:00
Daniel Molkentin
551ed8228c Git integration: Disambiguate precedence to silence gcc warning
Reviewed-by: Tobias Hunger
2010-10-15 13:18:06 +02:00
Tobias Hunger
e78b8cf4cc VCS: String update
String update as suggested by Leena.
2010-10-08 14:30:33 +02:00
Tobias Hunger
eb9b15be8c Git: Clean up the menu of the git plugin 2010-10-08 14:30:32 +02:00
Tobias Hunger
9293ecabc3 Git: Show native pathes to repositories 2010-10-08 14:30:31 +02:00
Tobias Hunger
bb02af93dd Git: Consider new files a diff
When checking for a difference and being asked to handle untracked
files: Actually consider the presence of untracked files a change.

Fixes git commit editor not coming up when there were no changes,
only additions of new files.
2010-10-08 14:30:27 +02:00
hjk
880312c549 version bump: 2.0.92 -> 2.0.93 2010-10-08 13:50:04 +02:00
hjk
4f05687ed0 version bump: 2.0.91 -> 2.0.92 2010-10-07 15:05:56 +02:00
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
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
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