feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
57,014 Commits 108 Branches 368 Tags
8278b4a24d11b0bb6dcd571287dcd5e58ad4093c
Commit Graph

743 Commits

Author SHA1 Message Date
Orgad Shaneh
4c5376dc99 Git: Do not use hash for topic 
Use "(detached)" instead

Change-Id: If1d295cb5dcfe2995e13c7b5b02b00bebf0e1b20
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-11 15:20:22 +01:00
Orgad Shaneh
ef53047f48 Git: Mute for frequent operations 
Change-Id: Ia517542242ce5a971728c4712190abaa0bbcb5a4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-11 14:39:40 +01:00
Orgad Shaneh
f782f9b901 Git: Cache findGitDirForRepository results 
Change-Id: Ia22ec20d3934dbdfa42461f66230b62bf6c1df07
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 13:41:23 +01:00
Orgad Shaneh
1712b86e0e Git: Remove description from PanelInfo 
It is not used anywhere

Change-Id: I9884c4c015bc14cb78e35950c7544c8d004a73ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 13:25:18 +01:00
Orgad Shaneh
25981d918e Git: Support alternative topics on detached HEAD 
Use tag if applicable, otherwise use HEAD hash

Change-Id: I5c7298446e5a325a27d6d9b5effc02d32155b583
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 13:25:02 +01:00
Orgad Shaneh
5ec925f7e7 Git: Cache synchronousTopic results 
Refresh when HEAD timestamp changes

Change-Id: Ibb365d03074dabb700a55b96a924e31fed26c6ab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 13:24:56 +01:00
Orgad Shaneh
6a58cdffc2 Git: Rename synchronousBranch -> synchronousTopic 
Change-Id: I272e9db7a560f6e72dda6a0368d463da820f5b0b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 13:24:49 +01:00
Orgad Shaneh
6a337561c5 Git: Show Precedes/Follows tags on Show editor 
Known limitation: Commit that has a tag shows its own tag on Precedes
field

Change-Id: I533e48b4bb5d57809d8e9f12fa7db5d8706f7372
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 12:03:43 +01:00
Orgad Shaneh
17a73005fc Git: Fix findGitDirForRepository 
Returned directory is relative

Change-Id: I13c9812825cfe57e880c21ad94178b5e9135b8e9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 11:07:28 +01:00
Orgad Shaneh
a44aa55502 Add whitespace after control keywords 
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>
 2012-11-28 20:20:46 +01:00
Orgad Shaneh
3e9f2d688c Git: Suggest continuing rebase after conflicts are resolved 
Change-Id: Icf74397ee7a3cedd7e46c63777832e1fc9f46033
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-16 14:12:47 +01:00
Orgad Shaneh
099345d110 Git: Suggest running mergetool if pull fails 
Change-Id: Ic2fe525ea9e63a5ecdd1ab23dc07ede810aa192e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-16 14:12:41 +01:00
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
 2012-11-09 11:20:10 +01:00
Orgad Shaneh
7b2ef0a3b3 Git: Fix detection for 2-digit versions 
1.7.10 is currently detected as 1.7.1

Change-Id: Iaba8ba3e1f6ba880ae088811ccfd133fd7f70e14
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-08 12:15:37 +01:00
Orgad Shaneh
cf6298ff32 Git: Introduce MergeTool support 
Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-07 16:12:27 +01:00
Orgad Shaneh
ab85e7342e Git: Extract FileState from CommitData 
* Add a QFlags type for it and use it
* Clean up GitClient::addAndCommit
* Rename Updated -> Unmerged

Change-Id: Id96f71fb78af923605f5773f65a5625244a49499
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-29 14:59:29 +01:00
Mathias Hasselmann
97925eaf54 git: Don't use the "--short" for git symbolic-ref 
We cannot use the "--short" switch since it only got introduced with git
1.7.10, which is not installed by default on popular Linux distributions
like Ubuntu 12.04.1 LTS.

Therefore stripping the "refs/heads/" prefix manually.

Change-Id: I3fb8e07e90e2ee8fdaa50836c1e982b47219e790
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2012-10-23 23:02:41 +02:00
Orgad Shaneh
a1e3a5de9e Git: Refactor branch/HEAD access 
Change-Id: I0c9955737033c0f839ac1f6ea053fecc20c24d48
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-22 12:38:43 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
 2012-09-27 20:38:57 +02:00
Tobias Hunger
9e9dd99310 Remove useless headers 
Change-Id: Iee4a6f549f8a7c028f52a1e6113b33034ef621e2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-09-26 15:44:41 +02:00
Christian Kandeler
3c6f76d16c HostOsInfo: Add some more useful abstractions. 
Namely:
- path list separator
- executable suffix
- file name case sensitivity

All of these are duplicated in various places in the current Creator
code.

Change-Id: I86eb4662fa3c2071759bd728cae1aaf7111ae686
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-09-05 13:54:48 +02:00
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class. 
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-27 17:00:03 +02:00
Orgad Shaneh
69eeb94b7e Git: Support gitfile on commit 
Change-Id: Ia2b8c7705129937a60585d881e1fbfa7815d858f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-03 18:02:37 +02:00
Orgad Shaneh
12a99d476c Git: Do not display invalid commit as blame candidate 
Change-Id: Ia08775b2e4364f405d223a9b49971ae70c04965a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-26 20:57:45 +02:00
Orgad Shaneh
bd7499b896 Git: Do not append formatting when log failed 
Happens for 00000000 for example

Change-Id: I1ab3157dd87744a4b16284d91dd26f42898965e9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 22:24:57 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget* 
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-19 15:15:53 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Orgad Shaneh
960bfeb46d Git: Limit length for revisions displayed in context menu 
Change-Id: I335b49ed9af9c3f2ae083a03e4109173b3783f76
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 00:42:54 +02:00
Orgad Shaneh
0fb6aafdc3 Git: Use HEAD as parent revision for 00000000 
Change-Id: I4f583bb184fff00ea49a27de9df96aa348b81004
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 00:40:57 +02:00
Orgad Shaneh
202ce8ad70 Git: Improve Clean dialog 
Check file iff it is not ignored

Change-Id: I16a489bdd772ea9b4df462b449a23324b5ef3b77
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-02 11:13:33 +02:00
Orgad Shaneh
3b5c40ba47 Git: Cleanup 
* Remove unused 'silent' argument
* Do not output 'git --version' command

Change-Id: Ia940efd5ae7e9f262552841c11d20c3d6df559a3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-02 11:10:34 +02:00
Orgad Shaneh
59417df92a Git: Keep author information on amend 
Change-Id: I15982b746656536ae79a612ee563f69b58a4baa7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-28 22:22:08 +02:00
Orgad Shaneh
616cb86ea7 Git: Better status resolving 
Do not consider new files as Changed

Change-Id: Id1ddb870e51a974a2d20fc2ecc9fb499d1db6f8c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-26 10:29:20 +02:00
Orgad Shaneh
a452db5055 VCS: Fallback to raw revision if decorate fails 
Change-Id: I64537306723dc1bd3c979f22af2213f0f5cd8f84
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-05 10:43:47 +02:00
Orgad Shaneh
671bfb9250 VCS: Always allow "Revert Chunk" 
Remove revertDiffChunkEnabled property

Any diff view might relate to previous changes, so it makes sense
to always allow reverting them

Change-Id: I8da0fb2d8625ac98140d1bde0296a4478bc6a0b7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-04 11:35:07 +02:00
Orgad Shaneh
3c342a49dc VCS: Add 'Blame current revision' in blame context menu 
Internal change: added decorateVersion() function for decorating
a revision. This is called for both the current version and previous ones

Change-Id: I8b23fd628c9db01b005c19d46580979c5a21c687
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-04 11:34:24 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface 
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-11 13:51:14 +02:00
Friedemann Kleint
043c179376 Git: Fix warning about invalid connection. 
Change-Id: Iabf33b764dc451d51bfc523d6b3c9b247adab383
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-05-03 20:32:09 +02:00
Friedemann Kleint
9a5fa0dd48 Git: Offer recent list of changes for reset --hard. 
This makes it easier to remove changed applied for review
by Gerrit.

Change-Id: I2e3407ae4e74b650d08d53fed37e9aeb11071a4e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-05-02 11:12:49 +02:00
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9 
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-30 14:32:08 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style 
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-17 09:53:44 +02:00
Orgad Shaneh
d207165f6a Git: Allow commit (or amend) when not on a branch 
Git allows that so why can't we?
Useful when in the middle of merge/rebase.

Change-Id: Id09da3417904ff29e6dd1b4ef383157e9c4920d3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-14 11:18:41 +01:00
Orgad Shaneh
6a3f9460d7 Git: Enable --no-verify for commit 
Change-Id: I88cfb7839b41467e3f6b25bea329eb15765e440e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-14 11:18:18 +01:00
Francois Ferrand
4d1bbebf2a Git: Add customizable repository browser command. 
Change-Id: Iac297e3665b18d97ca80097c4dd33dd70e64b9a1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-12 15:49:17 +01:00
Orgad Shaneh
8b6a2b0a85 Git: Do not fail on amend if no files were modified 
Task-number: QTCREATORBUG-6916
Change-Id: I44d69bdd11487388163723dffa56a6690ac14239
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 11:28:04 +01:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
Tobias Hunger
ca4efa4a34 Git: Speed up diff/show output 
* Avoid calling git --version repeatedly
* Use VcsManager to find toplevel directory which does caching.

Task-number: QTCREATORBUG-6906
Change-Id: Ib9ba94751bbecac686a0e116baeded9b2f6f3d90
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-02-03 15:23:36 +01:00