feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,189 Commits 108 Branches 368 Tags
50f522b2f7b3f81caf30dfcba0b8b267dcfc7fff
Commit Graph

455 Commits

Author SHA1 Message Date
Petar Perisin
83d51b2691 Gerrit: added ability to save path for applying patches 
Change-Id: I3cc8f1d19784145a7fbf19c321ccbc079847fbc2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 11:27:57 +02:00
Petar Perisin
42547062af Git: dereference topic result 
sometimes tags are annotated, and have different hash than head - now
all will be good with them too.

Change-Id: Ibd66b78e6dbc7f181ba05f45339f2d97bb611602
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 11:27:41 +02:00
Petar Perisin
5d4c4a6968 Git: Added submodule update 
Change-Id: If8a4b0c572b0ca2d57f80f1304c7ebf141a40148
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-04 19:18:23 +02:00
Petar Perisin
31ed90b47b Git: Show remote branch in topic 
No extra terminal commands are executed.

Change-Id: Ia875b5dbce2784962b9fc2b7c9c1b0a696a02ec8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-04-02 12:03:45 +02:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
Orgad Shaneh
82679ff61c Git: Support SQUASH_MSG for commit message 
Created for a squashed merge commit

Change-Id: I984a02cb27c678ff96950e788b212d85b8516a5b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-19 15:17:29 +01:00
Orgad Shaneh
56881e3179 Git: Interactive rebase 
Change-Id: I3d106ce5b071df4a7a3d77be43e7c24bd7c91dfa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:49:39 +01:00
Orgad Shaneh
8705862786 Git: Use Qt Creator as an editor for Git 
Qt Creator runs Git in a "dumb" terminal which does not
allow opening an editor. Use Qt Creator itself as an editor
when needed.

Change-Id: Ide073299964803d02479dade24ddee0283ebd83b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:49:28 +01:00
Orgad Shaneh
cc3f1ad07d Git: Run continue command asynchronously 
Git might request an editor on continue

Change-Id: I374e9889e32ea1b1b5ed04f9be9d2a829f3b6440
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-03-15 12:49:11 +01:00
Orgad Shaneh
a195ec5298 Git: Introduce ConflictHandler 
Streamline conflict detection in output

Change-Id: I40c90b1d4fa15a32606ddfbc58e8627bdc8dd444
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:49:04 +01:00
Orgad Shaneh
34191f3cc1 Git: Detect rebase-merge 
Change-Id: I2107a2fad456d52989002e560750af78281bd5db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:48:52 +01:00
Eike Ziller
8c280440dd Git: Don't use variable manager to get current document path 
There's just no sense in going through the expensive variable manager.

Change-Id: I800766ed3c58f789de85e8ff000a8f702125b9ed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-12 14:10:58 +01:00
Petar Perisin
c4ac55cc72 Git: speed up findRepositoryForDirectory 
Change-Id: I50ccb0f6e0e70f463e45feaea8237c434f5f76c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-03-10 23:00:57 +01:00
Eike Ziller
7545ce072f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
 2013-03-04 15:07:19 +01:00
Orgad Shaneh
17019955cd Git: Move some functions from MergeTool to GitClient 
Needed for interactive rebase

Change-Id: I5ba82735f6521087e7d23d8ee3e1beacd10db30a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:25:35 +01:00
Peter Kümmel
e4e43352a8 Git's config is UTF-8 encoded on Windows 
'git config' command returns UTF-8 strings if the encoding of the file was not hijacked by the user.

Task-number: QTCREATORBUG-8696

Change-Id: I6181a26e56e2883ad5d46194f974e799bfd2aafb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 11:09:43 +01:00
Orgad Shaneh
391094ed2c Git: Do not detect repository inside git dir 
Change-Id: I74f7c7eab6dee584bd4c42499ce8e1613d008043
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:40 +01:00
Orgad Shaneh
0cabae0f77 Git: Remove unneeded class qualification 
Change-Id: I7f604973ba1fdb974d6097abeb7127273786f69c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:25 +01:00
Orgad Shaneh
75c15d1f9d Git: Remove redundant check 
outputWindow() cannot be null.

Change-Id: Ie50bff33a3590a20e9de6b2602dac9cd70eb77bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:11 +01:00
Orgad Shaneh
9376c24fd0 Git: Fix regexp for cherry-pick and revert conflict 
Output should contain a \n in the end, so $ is counter-productive

Change-Id: I3a7d1dcbed1aa7c78e9a96cafdb3c0d1e65edc7a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:51:58 +01:00
Orgad Shaneh
a547b6af46 Git: Fix unstaging modified files 
Regression introduced in ab85e7342e

Change-Id: I92ec1f9d45b713d426fdae99d16e93ba5eb455cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-26 12:54:48 +01:00
Orgad Shaneh
cdcc8256a0 Git: Require 1.7.2 
Remove legacy code

Change-Id: I0ce03f7a34c92b48ceb705a0feec43e0ba89ef5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-20 13:29:11 +01:00
Orgad Shaneh
4e3f83e388 Git: Mute status calls 
Called from several places for which popping the pane is strange

Change-Id: Ib83cb51e7926a6b27ff59631f6f4452a41f6a950
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:19:28 +01:00
Orgad Shaneh
7f2191ddb6 Git: Disambiguate file argument on log 
Change-Id: Ie89dc32b59af8900764e2af4b8b93354a6c56a51
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:06:21 +01:00
Orgad Shaneh
610a355eb3 Git: Fix cherry-pick/revert commit resolving on conflict 
Change-Id: I3dee32864f1000afce098c1716307929b4da2462
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:06:12 +01:00
Orgad Shaneh
e5e384a237 Fix popping a saved stash 
stash pop accepts only explicit object (stash@{N})

Change-Id: Ie3d40173ffd94849bde30076235f65d5e4e92cc2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:05:54 +01:00
Orgad Shaneh
0e86785019 Git: Preserve multiple branches that link to the same commit 
If remote HEAD commit is referenced by multiple branches, only the last
one is currently listed

Change-Id: Iac689125610aaf49c0bc31285a0d283fd48a271c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-14 15:00:18 +01:00
Orgad Shaneh
976c052c0b Git: Remove debug output 
Change-Id: I5610ce9117c997a82ce8d28ff2440bebd28d9181
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-13 21:12:01 +01:00
Orgad Shaneh
34fd5ca532 Git: Handle "no changes" case on conflict resolving 
Change-Id: I75bb18c9564ffac3de2654bd388465794481b487
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-12 18:41:39 +01:00
Orgad Shaneh
c68adbf9c0 Git: Enable skipping a commit on rebase 
Change-Id: Ib83ca453c86b93cb359a2a0a9774c7d39533be4e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-12 18:41:31 +01:00
Orgad Shaneh
bf61858375 Git: Show conflicted commit 
Change-Id: I398437db96082e8813090b5eb78ae1c8b8158ffe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-12 18:41:15 +01:00
Orgad Shaneh
2c68c80196 Git: Make file state resolving more accurate 
Change-Id: I238ef964df126a341c87dacf9344ff1570f31845
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-11 11:10:11 +01:00
Leena Miettinen
81a69f3e42 UI text: fix Git messages 
Fix capitalization and punctualization of Git messages.

Change-Id: I76de86dc87727b17eca6d0deabc530f889fa284e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-09 19:27:03 +01:00
Yuchen Deng
79e8f88536 Git: Fix log encoding 
We should using "i18n.logOutputEncoding" as we can.
In default, it should be 'utf-8'.

Change-Id: Ic5af2869e5fd5273a712f28e8e59149a4c2ef2b7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-05 10:50:12 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Orgad Shaneh
cf5f109b68 Git: Remove "Branch" from synchronousCheckoutBranch 
Other refs can also be checked out using this function

Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-24 13:25:06 +01:00
Orgad Shaneh
120f03061d Git: Remove unused functions 
Change-Id: I6cb9752f435255379cf7a8a321b3192a410d91df
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-24 12:32:52 +01:00
Orgad Shaneh
177f774036 Git: Use StashGuard for merge and rebase 
Change-Id: I7c9059396aaac78c769518b34c7bf68bfe9932ec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-01-24 12:32:40 +01:00
Orgad Shaneh
5551c1e906 Git: Introduce StashGuard 
Offers the user to stash changes (if relevant), stores
the results and pops the stash when it goes out of scope
(unless disabled)

Change-Id: Ibc0d2a5d3e3c953062fb17ecba903ca814524837
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-24 12:32:26 +01:00
Orgad Shaneh
c670a66fe1 Git: Explicitly pop stored stashes 
If the user created another stashed between save and
pop, this stash will be restored instead of the intended
one.

Change-Id: I605c9f440345d8c7e0876f4f60daa7146bebb212
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-24 12:32:17 +01:00
Orgad Shaneh
e463c56c32 Git: Fix calls to ensureStash 
Change-Id: I581afbe314055796d22f883e501dfb5fd17117fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 17:56:57 +01:00
Orgad Shaneh
89d16332d1 Git: Replace synchronousStash with ensureStash 
When flags are not used. syncStash doesn't return result,
which can be useful for StashGuard

Change-Id: I1327b5d8d10410e7a3b9fdb07a03b476d5abcdc4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 15:13:27 +01:00
Orgad Shaneh
8b67ae7395 Git: Write error to error stream in executeSyncStash 
Change-Id: I36c70fc3df5958b7bb5378e2529a451c497d6632
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 15:11:03 +01:00
Orgad Shaneh
246f8e9aaf Git: Fix indentation in ensureStash() 
Change-Id: I5243fce895ae21a2b07cb9e0d98a60d69f848b10
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 15:05:27 +01:00
Orgad Shaneh
daef1fbb88 Git: Use stash pop instead of apply... 
... when the stash should be removed on successful pop

Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 14:59:24 +01:00
Orgad Shaneh
53443616e5 Git: Fix pull 
regression from 40eecd87c9

Change-Id: Ibbf4082f9949ca25d22d7ba707281ae6652249ce
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 14:57:27 +01:00
Petar Perisin
65aef73ec4 Git: Added Revert and cherry-pick 
Change-Id: Ic8ba7434e79b12eca680a67c2845c82915dc0088
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-21 10:41:01 +01:00
Petar Perisin
b7faf4d674 Git: added custom message to EnsureStash popup 
Better overview in stash dialog.

Change-Id: Icb6d3f8e2e068882e661e017ce8a0bb00ec6dba5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-17 11:18:28 +01:00
Petar Perisin
40eecd87c9 Git: Refactored "synchronousPullOrRebase" to be more general. 
This can ease adding commands that can cause conflicts like cherry-pick,
revert, merge, rebase, stash pop ...

Change-Id: Id9df7f11307dbbcb60036a20a2c22c5097ba239f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-11 10:58:17 +01:00