feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
42,569 Commits 108 Branches 368 Tags
054ed354e08d3ff32974fb19e922409b6c46dfa8
Commit Graph

648 Commits

Author SHA1 Message Date
Orgad Shaneh
5d39fcf7cf Git: Better wording for rebase in progress message 
Change-Id: I13d002773dd81206c70b7eb91727f152d7e84507
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-03 10:41:30 +02:00
Orgad Shaneh
bcd8c02aea Git: Prevent or close fixup editor if no local commits are found 
Change-Id: I546241fb3531cbc542b97d6d0f53382c9225dcf4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-03 10:36:22 +02:00
Petar Perisin
55e087ab05 Git: fix bug with Log and Blame not showing stuff correctly. 
Task-number: QTCREATORBUG-9375
Change-Id: I4e18e4c2d4db71392aa305d49ffce924f8451a0b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-06-03 09:28:11 +02:00
Orgad Shaneh
05a6fc48ba Git: Support change links on commit editor 
Useful for commit messages with "reverts <hash>" for example.

Can later be extended for interactive rebase

Change-Id: Ibf77433ecddfacbd8d443636ddbc406bda474aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-31 14:53:02 +02:00
Petar Perisin
77c136646b Gerrit - Removed all patch set stuff 
Change-Id: I013c116fc7e0ac1571513005b8ea49992e0771a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-05-31 06:08:35 +02:00
Petar Perisin
86d7e28db4 Git - added submoduleDataMap to handle submodule data 
Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-28 21:53:26 +02:00
Orgad Shaneh
e9f901be15 Git: Don't pop VCS pane on stage 
The command is appended anyway, and it usually produces no output
to stdout

Change-Id: Ie5f685b090ead8a0e888c9c0cfa6db2411e91f33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-28 10:02:43 +02:00
Orgad Shaneh
b75cf96868 Git: Refactor stash handling 
* Replace RebaseManager with ConflictHandler
* Store StashGuard in GitClient, allow popping after
  a whole process is done (e.g. pull with resolved conflicts)

Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-27 10:43:44 +02:00
Orgad Shaneh
829357b397 Git: Only execute stash if there are changes 
...even when NoPrompt is specified

Change-Id: I735133e390403a0f8f6aa573d6f9c63cf0784187
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-27 10:00:48 +02:00
Orgad Shaneh
5d558c141c Git: Add m_ prefix to StashGuard members 
Change-Id: Ice9f33e986688e8d2c5250435a30cd7cb1ac3b28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-27 10:00:36 +02:00
jkobus
b43027ac38 Git - Use new diff editor also for show and diff branch 
Change-Id: I94d28dbc1cc5f753beda2284244bcd5c2c9df236
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 14:49:50 +02:00
jkobus
2ddb726dd5 Add file list combobox to diff editor 
Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 14:14:06 +02:00
jkobus
a033beecc8 Simplify code 
Change-Id: I1576c3b8d370fdae660a399654b77af11a5f5d36
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-05-23 10:19:23 +02:00
Orgad Shaneh
c60ab1ca3c Git: Fix object leaks 
Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-17 17:59:10 +02:00
Leena Miettinen
bc9bb4b93c UI text: fix VCS related strings 
Fix capitalization and punctuation and a typo.

Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-05-16 14:33:32 +02:00
Petar Perisin
84520b37e7 Git - fetch from all remotes in repository 
Change-Id: I024e6905ad9ef246bf30b898c654ba99e73b42e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-15 19:53:05 +02:00
jkobus
97a86c50dc Basic integration of diff editor inside git plugin 
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-15 16:24:38 +02:00
Petar Perisin
f5ccdb6b23 Git - modify way to get remotes 
Need to use push remote, and not fetch one because of gerrit plugin
checks if remote url contains url set in gerritSettings. This needs push
and not fetch url.

Change-Id: If738e5c46f90ad00dc4616a2d109cab7a193620d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-13 20:59:46 +02:00
Orgad Shaneh
20c3d45409 Git: Output standard error on commit success 
post-commit or commit-msg hook might print useful information even
without failing the commit

Change-Id: I91b6ccfc43f1d148fb773ae074b2668927815235
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-13 11:41:29 +02:00
Orgad Shaneh
e836cd082c Git: Prefer remote tracking branch in GerritPushDialog 
In case it contains the latest remote commit

Change-Id: Id9e4cc40b7d1aa9daac3a9a2cf9ba41f589da7eb
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:01:08 +02:00
Orgad Shaneh
8695fe6d7c Git: Implement "Fixup previous commit" 
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-04 20:01:04 +02:00
Orgad Shaneh
5d325f6b1a Git: Use StashGuard inside RebaseManager 
If the rebase succeeds without conflicts, pop

Change-Id: I4f0c6ad3061f4f69f7e5c9450f972cce5c15227d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-04 20:00:39 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
 2013-05-03 09:49:28 +02:00
Orgad Shaneh
be7f73308c Git: Use consistent ordering for Merge Tool dialog 
On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"

That makes Ignore default on Windows, which is confusing

Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-02 17:30:57 +02:00
Orgad Shaneh
20f1208e0f Git: Pass CommitData by reference 
It is used for both input and output, the pointer is assumed
to be valid

Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-02 16:52:55 +02:00
Orgad Shaneh
06da25f610 Git: Add commit type to CommitData 
Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-02 16:52:10 +02:00
Orgad Shaneh
7b851602cc Git: Use an enum for simple/amend commit 
Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-30 14:38:00 +02:00
Orgad Shaneh
40d001694b Git: Use synchronousParentRevisions to retrieve parents 
Replace explicit 'git log' call

Change-Id: I7fd3821d9a321d84fa25bad4bd0a4525fee11993
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-29 11:34:12 +02:00
Orgad Shaneh
a5962841cf Git: Support graph log for all log types (file, project, repo) 
* Added a Graph toggle button for log editor
* Hide diff parameters when Diff is off
* Remove GitClient::graphLog

Change-Id: Ib87560bc4d6d7dbe866f0e58db8743a95df0622b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-29 11:01:05 +02:00
Orgad Shaneh
48b9747550 Vcs: Allow multiple flags in parameter widgets 
Refactor combobox values to use %1 as a placeholder for values

Change-Id: I9a9bb6b9ba5c21bcaad4a3047d322856225892bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-29 11:00:19 +02:00
Petar Perisin
571672c414 Git - capitalize command in progress in topic 
This makes command stand out. Before it looked like regular branch.

Change-Id: I9f47e42392bb70cbd9ceec94fd4d55dc15c95b02
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-28 08:29:19 +02:00
Petar Perisin
d425d6485e Git - move ensureStash inside StashGuard 
this is where stash popup question belongs

Change-Id: Ib3435f12eacd0b932ba2a67ecd728e5a41c0c64a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-26 14:13:12 +02:00
Petar Perisin
5478cf3c78 Git - bugFix in submoduleList 
it looks like submodule list in git config does not return paths. that
is why I have direct reading of .gitmodules file now.

Change-Id: I7f441d0b2e31ad7b73fbc8c05e5c9a9e0c84036c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-24 20:18:12 +02:00
Petar Perisin
44f14351b4 Git - command in progress in Topic 
Change-Id: I83a00e9677924efc244a91d20cdded77ee9cdff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-21 23:09:36 +02:00
Petar Perisin
311ca8cd01 Git - added continue and abort 
Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-21 23:07:46 +02:00
Orgad Shaneh
e6da908321 Git: Refactor reset 
Remove enum, provide the associated flag in the combobox.

Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-19 14:12:25 +02:00
Petar Perisin
93e51c186a Git: make ensureStash dialog more clear. 
Change-Id: I19ecde462d7a8a5fb00caa0414a9833ecab5057b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-19 07:48:27 +02:00
Friedemann Kleint
ad9081e3d8 tr()-Fixes in git/gerrit. 
Introduce common message for "Cannot run", remove exclamation
marks.

Change-Id: Ib3f36e95c67136041cde56e697ec4ba0a3b9549e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-15 15:04:05 +02:00
Petar Perisin
7c6bb25248 Git: Also show tags in the branches dialog 
Change-Id: I74e010af7bff046647ac75e731a87867ff34b0f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-11 17:06:24 +02:00
Petar Perisin
c49fe8350d Git: Add a function for getting current local branch 
Change-Id: Ibda70cb896633cc7afa3a845b99aac523246c558
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-08 19:23:47 +02:00
Orgad Shaneh
d63e38b021 Git: Fix breakage in parent commit lookup 
Broken by fe1f7e4bf6

Change-Id: I8212b306d52ee96320a0b14f6f616b48aa928703
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-08 10:43:28 +02:00
Friedemann Kleint
9393335c1d Clean headers in Git. 
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 15:10:02 +02:00
Petar Perisin
fe1f7e4bf6 Gerrit: Added pushToGerrit dialog 
Change-Id: Ic16eae2def11343ef7be5ce8378d24b5fd11a386
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 11:28:05 +02:00
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