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
Orgad Shaneh
30d548ea3a Git: Really consider untracked flag 
Default behavior is to show all untracked files. To hide them,
we need to pass --untracked-files=no

Change-Id: I45ad6323273112e6724127d4bd8e8687066467f4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-30 12:54:36 +01:00
Orgad Shaneh
60129c40ef Git: Only stash pop if pull succeeds 
Change-Id: I7861d862fdd3d24201e39bb4c7a9cb91643acc35
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-30 12:54:21 +01:00
Orgad Shaneh
aed53a70ee Git: Place conflicted files last in submit editor 
Change-Id: Ie4c7423d85f3f568d04d6c86e8b8123c73dab5fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-30 12:54:13 +01:00
hjk
e833b794b3 Use Core::Id in ICore::showOptionsDialog 
Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-29 19:04:30 +01:00
Orgad Shaneh
af1cc6831c Git: Avoid running wish if git/cmd is in PATH 
It always fails and falls back to git/bin

Change-Id: I367ff33c864adebf438cbcc00332520ec6e0d454
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-12-29 17:38:27 +01:00
Orgad Shaneh
2e3a88b5ec Git: Only handle conflicts after rebase if they are present 
rebase might fail for other reasons (detached head, unconfigured upstream...)

Change-Id: If80844dcbfd4f61fdd44d77f934e86ff96f0a1d3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-23 15:17:34 +01:00
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
 2012-12-18 17:42:04 +01:00
Eike Ziller
da4ee1308a Reduce height of version control settings pages. 
This is basically about the git page, but the others have similar
controls.
I'd actually like to get rid of the gitk and repository browser boxes,
but don't want to change too many strings for 2.6.1.

Task-number: QTCREATORBUG-8345
Change-Id: Iea3bae85522a06ab681768ef60fdd36f4dceb497
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-17 16:56:36 +01:00
Christian A. Reiter
a6eb1b2640 add branch name validation to git VCS plugin 
Task-number: QTCREATORBUG-8370

Change-Id: Iadca383dc01a55deab2cbfdb5ef439dfb0f2ab12
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-12 12:21:37 +01:00
Petar Perisin
4ffc1a2f10 Git: Custom gitk launch 
Launch gitk only for current file,
or for the folder that current file belongs to

Task-number: QTCREATORBUG-8327

Change-Id: I2ffbd44e3b3eeaffad32e84af9ca2085b16fdaa2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-12 12:19:57 +01:00
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
Friedemann Kleint
45b4ff4e74 Gerrit: Disable buttons while fetch operation is in progress. 
Gerrit operations should not be started in parallel since
they use FETCH_HEAD, which can cause mix-ups.

Change-Id: Icb421c8065f680a4bb93acd63e1ffe6309ce774a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-11 15:19:35 +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
Petar Perisin
9f276bddb8 Reorganized Git menu 
Suggestion for reorganized Git menu,
because there are a lot of items in there

Task-number: QTCREATORBUG-8363

Change-Id: I00bcf6b210d9a2bcb081a17a0ea288d71f65a9f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-11 14:38:49 +01:00
Tobias Hunger
1b1c008a37 Fix warning 
Fix warning about values not being covered in switch statement

Change-Id: I9c2fed95b5fb9ee2e2ee344a8ca4524e26bcaf8a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 14:26:24 +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
7c4e2b6c60 Id: Add QByteArray constructor 
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-20 08:57:35 +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
Orgad Shaneh
7ba0433b2b Git: Write mergetool input/output to VCS output window 
Change-Id: I75fdf1535da610e6300c76a0b11b3ae032899484
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-16 14:12:11 +01:00
Mathias Hasselmann
c9b45c0d61 Git: Report current branch 
Change-Id: Ied5ac2749b111d3b646080311ac6b52b3f86dc33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-16 14:11:24 +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
5011ba940f Git: Support merge status 
Change-Id: If0338d066a2844a8bedf3e5ecf89979dc5c20385
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-29 14:59:42 +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
Orgad Shaneh
0f2f2a59d2 Git: Remove unused default value 
Change-Id: I2e9354cc675281a5025706d023e92d43c81910f6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-29 14:59:24 +01:00
Orgad Shaneh
b45393461a Git: Refactor checkLine as a member function in CommitData 
Change-Id: I9a19cc7fd8cb2102eb8c5a1589b81164498d3c34
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-29 14:59:18 +01:00
Orgad Shaneh
2198fa90eb Git: Add tests for status line parsing 
Change-Id: I1519672ffbaafc1367addde5cd2111b1fe9810b2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-26 14:18:29 +02: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
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia 
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 11:10:50 +02:00
Friedemann Kleint
0f27043fe6 Add a timeout to the gerrit query process. 
Task-number: QTCREATORBUG-7977
Change-Id: I35c3e6f916a690595a6fc03ad3a995b361c76f54
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-08 15:55:15 +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
Orgad Shaneh
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin 
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-05 10:18:56 +02:00
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
 2012-10-04 12:23:39 +02:00
Orgad Shaneh
a00b291484 qbs files: Sort files 
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-03 09:26:34 +02:00
Leena Miettinen
174226e21e UI text: write Git in upper case 
Change-Id: I012af35287b0ee478eb99c95c54ba438f8e4e6d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-10-01 14:31:30 +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
Orgad Shaneh
69e022d112 Git: Fix binary lookup with path setting 
Task-number: QTCREATORBUG-7889

Change-Id: I251ef68e8dbb0a70565708053e368db89d5999e5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-09-27 12:09:13 +02:00
Tobias Hunger
ac6c11ec19 Git: Simplify code a bit 
Change-Id: Iac245c92039f522cc0a599461572f9fd54cf43ae
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2012-09-27 11:50:03 +02:00