Commit Graph

2048 Commits

Author SHA1 Message Date
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
6f4f47c8d8 Git - topLeveldir in ChangeSelectionDialog
So ChangeSelectionDialog does not show full path of current file, but
just path to top level dir

Change-Id: I4960009216afc0564b009bbf4f89b676cb92c4df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-26 07:13:17 +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
Orgad Shaneh
83b57eda89 VCS: Remove redundant calls to default constructor
Change-Id: I4521e26e72c85e896e58e4d9d129f92b2d80f869
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-22 09:29: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
Eike Ziller
e31575a493 VCS: Clean up submit editor handling
It was not possible to simultaneously open two commit editors for
different version control systems, also there was no reason to scan all
open editors for the submit editor, since the plugins can just remember
the editor that they opened.

Change-Id: I1bea6ece3cd6faa1ecc0566bdd6f5fb10c816963
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-19 16:21:06 +02:00
Orgad Shaneh
5658eb69aa Git: Add Mixed reset (as default)
This is the default in Git

Change-Id: I65b5c0003a731799812d143d3142b58b30ddb878
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 14:12:36 +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
331af07a9e Git: bug fix for diff and log in BranchesDialog
Branch log and diff were sometimes having problems.
I have project in main git module, and I was not able to get branch diff and log in a submodule,
because they open new editor and as soon as it is opened m_repository changes to the master module.
Since repository working dir is set after editor opens, it is already changed in branchModel
Branch diff and log should now work as expected.

Change-Id: I72f730d77b8fe23ef6eac757415fe96321ef147b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-11 13:59:57 +02:00
Oswald Buddenhagen
f9f8cd354b auto-generate <dependencyList> in .pluginspec files
Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-11 12:52:03 +02:00
Petar Perisin
4a45c1c165 Interactive rebase - make selected commit available too
Since we select final commit for interactive rebase in a listed dialog,
it is IMO expected and more user-frendly to also have selected commit in
the interactive rebase list.

Change-Id: I56febd024cc174bcd046b1f02bccfe990043aae4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-10 12:04:41 +02:00
Petar Perisin
08eb65fb04 Git - Bug fix in changeSelectionDialog
disable checkout button too

Change-Id: I325436672091c6f4f824ed263c2643ecf31f93f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-09 20:02:18 +02:00
Friedemann Kleint
9d7e786b03 Provide instance()-method for Utils::NetworkAccessManager.
Preemptively fix exit warning "QEventLoop cannot be used
without QApplication" (Qt 5/dev) emitted by destruction of
the of the generic highlighter manager singleton which had a
member of type Utils::NetworkAccessManager.

Use a single instance of Utils::NetworkAccessManager for the
main thread and clean up properly using a qAddPostRoutine().

Change-Id: Ida57b9028a79eb4927818ce49088ea567f3bdfd6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-09 11:39:56 +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
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
2013-04-08 13:26:37 +02:00
Petar Perisin
0dee89bac1 Git: added rename branch
Change-Id: I327a2bc91b871dc03797d9af52bb2d32be8e76d2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-08 11:25:46 +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
Petar Perisin
9dce1fe429 Coding style modifications
Change-Id: I098cbde76e844229f189eb05d0e0b5013af8c5fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-08 10:33:14 +02:00
Robert Loehning
376a90e028 Added second button to message box
Change-Id: I59ec1c5000afcdd2c91ed55c32aaae11b95b620a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-08 08:58:20 +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
b1c9d0eb37 Git: Added Checkout Commit
Change-Id: I9446060b9a8ee1717b832f1f7b7dbcaf8e739ad3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-04 19:16:50 +02:00
Petar Perisin
09b1cf78fd Git: refactoring ChangeSelectionDialog
> Dialog now combines show, cherry-pick and revert
> has fixed path, and no way to change it
> not created on stack

Change-Id: I7cee0b2e775a80941b51a4ca023064baf0d6575c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-04 19:15:59 +02:00
Oswald Buddenhagen
06acd82ada derive TARGET from QTC_{LIB,PLUGIN}_NAME
the information is redundant now

Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 14:37:56 +02:00
Oswald Buddenhagen
66a3553107 make library and plugin dependencies declarative
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.

Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-03 14:37:45 +02:00
Oswald Buddenhagen
9631fb88cf centralize assignment of TEMPLATE = lib
Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 17:13:17 +02:00
Oswald Buddenhagen
7ce3362288 automatically include libs' and plugins' _dependencies.pri files
Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 12:19:31 +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
Oswald Buddenhagen
4fa66c8a33 factor out all plugin dependencies to _dependencies.pri files
this makes it uniform for all plugins

Change-Id: I46ede2cb576059dfbaa74c2448517a102eb44ddf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-27 16:21:16 +01: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
hjk
2cea4c6f80 Vcs: Construct Core::Id directly for submit editor
Change-Id: I21ca57fa6b73887dfc88b31240096b0851d53cae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-21 13:13:35 +01:00
Orgad Shaneh
9b22c8ed62 Revert "Git: Undo changes on pull with rebase when user chooses not to stash"
The dialog text doesn't state that the changes will be
discarded. This is likely to be an unexpected behavior.

Will improve the dialog on master

This reverts commit cf41cd5e2a9b1927fd533789a30cfd80a4e0791e

Task-number: QTCREATORBUG-7031
Change-Id: I52eaf3cdef1b10b261ee9d2e9e14aa98e6e32bdd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-20 12:15:40 +01:00
Friedemann Kleint
89e0a66f74 Git: Recognize SHA1s from 7 to 40 digits.
Qt's grafts have 9-digit SHA1s which did not work
with the previous 7-8/40 character limits.

Change-Id: I3989405d00b575a6efb7dc6a467cbb24df9f3db5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-19 16:35:33 +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
hjk
543ab54f41 Git: Simplify use of Core::Id
Change-Id: Ib7d68fa0627eda28865e2fa7baf61e9ed40914c9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-19 13:16:41 +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
db29090b05 Git: Test if an operation is in progress on commit
Suggest to continue

Change-Id: I7d8d22d976efe446c2f60e2ba18bf08a123cca36
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-03-15 12:49:19 +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
Friedemann Kleint
281b2332d2 Fix Krazy warnings about includes/header guards in version control.
Change-Id: I75f2040e9b3dd5d9786faf2e829ec808af7f1304
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-12 13:56:47 +01:00