feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
40,653 Commits 108 Branches 368 Tags
d7ecf7df4b8eb5424b427ebfc9cd9a14e60cc047
Commit Graph

621 Commits

Author SHA1 Message Date
Tobias Hunger
d7ecf7df4b Git: Add a static method to attach a GitProgressParser to a VcsCommand 
Change-Id: Ia7e104665360a254d5f3867b69e11fb7c46ff93e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-15 10:12:46 +00:00
Tobias Hunger
9364f64f2a Git: Use default encoding for git-branch output 
I see no reason why that should require source encoding.

Change-Id: Idd7103f09fd66f0363f8e58e04a8abdb183f74ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-15 10:12:38 +00:00
Tobias Hunger
b6608d0d37 Git: Simplify use of conflict handler a bit 
Disentangle binding to an existing command from the actual task of
the conflict handler. This makes usage more clear.

Also rename "command" to "abortCommand" which is also more clear
as to what it is used for.

Change-Id: I862cfec97fbf512a3121f0a7d58ae12f148879a6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-15 10:12:14 +00:00
Orgad Shaneh
d8ad33b54d Git: Fix retrieval of parent commit in blame 
Broken by dcdcf54048.

Change-Id: I8e3015f710a8e7dd059b8419e66f58c76373b297
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2015-04-14 20:28:19 +00:00
Tobias Hunger
5954506d19 Vcs: Move vcsSynchronousExec into VcsBaseClientImpl 
Use it in favor of git's synchronousGit method.

Change-Id: I1fc8031cb6d258073b64163aeeeaeac84443fb8c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-14 11:22:00 +00:00
Tobias Hunger
dcdcf54048 Vcs: Move vcsFullySynchronousExec into VcsBaseClientImpl 
Use that in the gitplugin in favor of fullySynchronousGit.

Change-Id: Ifd981f3fc5e87e16ad52caf32c204f81acffe586
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-14 11:21:21 +00:00
Nikita Baryshnikov
147dad8944 DiffEditorManager simplify 
by using EditorManager::openEditorWithContents

Change-Id: I2850648bff0f5b8f01254b9c7ce9539c1262f576
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-13 12:33:01 +00:00
Tobias Hunger
7c083eadee Vcs: Make VcsBaseClient return stderr on fullySynchronous execution 
Change-Id: I7a72a2f865148d7cf375897ec944a45f4b440818
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-13 10:48:01 +00:00
Tobias Hunger
7719fb669c Vcs: Standardize on second based timeouts 
Change-Id: Ia273fda05a4c4a1934819f26e5dc1b6b80a89f6f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-13 10:47:08 +00:00
Tobias Hunger
a55fb4a378 Vcs: Move annotate and annotateRevisionRequested into VcsBaseClientImpl 
... and use that in the Git client.

Change-Id: Ie70ec0d5908776d11eb69613d45f565d4f0ce32b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-13 10:40:58 +00:00
Tobias Hunger
e7616f8769 Vcs: Move createVcsEditor into VcsBaseClientImpl 
... and use that in Git as well.

Change-Id: I81c85fcf5a7da7e9f756f117ea6c38c15294a401
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-13 09:08:35 +00:00
Eike Ziller
11590a8c5f Merge remote-tracking branch 'origin/3.4' 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7
 2015-04-13 10:53:03 +02:00
Orgad Shaneh
4eb2224f47 Git: Add override 
Change-Id: Iae0779c1efa8b3b46cf504f7bda00d614a4a157e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2015-04-12 20:03:04 +00:00
Orgad Shaneh
18a5d019c0 Git: Fix suppression of git status command 
Missed in 808f4492c5.

Change-Id: I8760ab9fa897d708423b21c34771d5275f87d1d7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2015-04-12 11:35:48 +00:00
Nikita Baryshnikov
1d23de641f GitClient: fix diff when committing 
When a commit has several files, opening diff for the first file
works, but trying to open another diff without closing the previous
one doesn't refresh the diff editor.

Change-Id: Ia973cb70f2355a89b70787dd97042ef9f751d9d6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
 2015-04-12 09:56:56 +00:00
Tobias Hunger
0f5fdbe0f2 Git: WS fix 
Change-Id: I0b4d37ae8ccd5f5edd8f049d31519be7d2131036
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-10 14:14:47 +00:00
Tobias Hunger
68045c1d0d Vcs: Move resetCachedVcsInfo into VcsBaseClientImpl 
Change-Id: I544472d2024bd82039908c67ab133556617b4fdb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-10 09:58:39 +00:00
Tobias Hunger
07d6757ca8 Vcs: Move createCommand and enqueueJob into VcsBaseClientImpl 
Change-Id: I86a4ddfd6c53a3be61c56579d8eaf5d49258a8f1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-10 09:49:47 +00:00
Tobias Hunger
2ccae82b5c Vcs: Move vcsBinary and vcsTimeout into VcsBaseClientImpl 
Change-Id: Ib14432c85f42606a0437f3848b9dfa2fe63fb2f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-09 07:25:17 +00:00
Tobias Hunger
4f7844d6f5 Git: s/GitPlugin::gitClient/GitPlugin::client/ 
... same name as with almost all other plugins.

Change-Id: I964159044d86685735e8b1e816a0bf67e0576fd8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-08 09:52:25 +00:00
Tobias Hunger
90ce38da39 Vcs: Move handling of settings from VcsBaseClient to VcsBaseClientImpl 
... and update users of that functionality accordingly.

Unexpected plus: Now every supported VCS actually saves their setting
when requested.

Change-Id: I02db7b2ce14e5f52d26409b2a01aea290c2a294a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-08 09:30:44 +00:00
Nikita Baryshnikov
217862be2f GitClient fix extra CR at end of email/author 
in submit editor. Introduced in cb5886139e

Change-Id: Ieefa64a9d2c3ba1524a1cf6fe94f6e1c709fb5d4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-26 15:28:28 +00:00
Tobias Hunger
66b94f490f Git: Make createVcsEditor take the same arguments as in VcsBaseClient 
Make createVcsEditor in GitClient have the same signature as
createVcsEditor in VcsBaseClient.

Change-Id: I652175cbbf90b5bccd007fe8f028e364fe61a9aa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-26 14:21:57 +00:00
Tobias Hunger
3718dfce98 Git: Add enqueueJob method to GitClient 
That makes it more similar to the VcsBaseClient.

Change-Id: Iabdd177d0734a6c1001c9bc5c5a0e2375ec169bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-26 14:21:29 +00:00
Tobias Hunger
5c8af1a490 Git: Make GitClient and VcsBaseClient more similar 
Use the same signature for the createCommand method in both.

Change-Id: I948a9fd1af2850730736731c53ee8d1b0b9b30bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-26 14:21:02 +00:00
Tobias Hunger
f44161bb9a Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClient 
Change-Id: I966a76ee4c1e5c45ac7332613e90cf511afc584c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-26 14:20:54 +00:00
Tobias Hunger
cb5886139e Git: Remove readConfigBytes 
Integrate that into readConfigValue and use that instead.

Change-Id: I47f860a49f1528ff1aa5f4dc645497034ab87d5b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-03-25 13:42:30 +00:00
Tobias Hunger
a168a5a448 Git: Remove assert 
It is save to remove this assert as runCommand handles another command
being in flight already.

Change-Id: I8b7f1a9b8f3418def1a97f165ef6bdb9b03de04e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-03-11 10:03:48 +00:00
Tobias Hunger
3d360653cf Clean headers of the DiffEditor plugin. 
Change-Id: I1c49527f010acbece31849127fc4d182678b6f37
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
 2015-03-10 14:28:13 +00:00
Orgad Shaneh
478a2e86f9 Git: Support Log for selected commit in git editors 
Change-Id: I5081471b3be65de1948d9bfdd52fd812df5e6a7a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-03-10 13:53:16 +00:00
Tobias Hunger
b2b8b867d6 DiffEditor: Refactor the user-facing parts 
* Move all data handling into DiffEditorDocument
* Move much of the logic of how to update views into the
  DiffEditor.
* Introduce a base class for the different views on the diff
  to implement.
* Remove DiffEditorGuiController
* Make DiffEditorController smaller and merge the DiffEditorReloader
  into the class
* Simplify communication between the classes involved
* Make much of the implementation private to the plugin

Change-Id: I7ccb9df6061923bcb34cf3090d6d8331895e83c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-03-10 10:25:52 +00:00
Friedemann Kleint
54da18eaaa Clean exported headers of the Core plugin. 
Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-05 07:18:14 +00:00
Tobias Hunger
bdbe119dbe Git: Remove unnecessary destructor 
Change-Id: Ib4041924e1544d1ec2c5837c62c23554c6be0e91
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-03-03 10:20:32 +00:00
Tobias Hunger
956abd2803 DiffEditor: Make DiffEditorDocument internal 
Only expose Core::IDocument and keep DiffEditorDocument internal
to the DiffEditor plugin.

Change-Id: If39b82e2f20d40a65284503b4d4fd8dad919ad3a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-16 15:50:16 +00:00
Orgad Shaneh
7471187404 Gerrit: List remote branches also for non-fetched remotes 
Task-number: QTCREATORBUG-13718
Change-Id: I0259d06f4f06b68af459d747176dc46b14a55008
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-16 15:29:25 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Orgad Shaneh
42e0ea62f6 Git: Support stash --keep-index 
Task-number: QTCREATORBUG-13587
Change-Id: I23f62b961df73872ae980d95b91a3285c0e367c1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-09 20:59:40 +00:00
Orgad Shaneh
c9df079885 Git: Improve stash 
* Use explicit "save" sub-command
* Show output in log window

Change-Id: Icd4a47de2e4548322d1ea06f126d0bd6023e67ee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-09 20:59:35 +00:00
Orgad Shaneh
2a677ce8b3 Git: Save all documents before stash pop 
... and refresh the stash dialog

Change-Id: Iba16efc4f612cd1997493206704100ec57493932
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-02-09 20:59:32 +00:00
Tobias Hunger
0ed08bdfdf Git: De-noise code 
Change-Id: Ibcae2f432b3a9262e9c7c23cf2d8f9ca018cd771
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-01-28 13:35:08 +00:00
Tobias Hunger
bdae49c474 DiffEditor: Use Qt5 style connects 
Change-Id: I051b2128620bf0317b359852007463c6601ceaca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-01-28 13:35:05 +00:00
Tobias Hunger
56637a5d25 GitClient: Use Qt5 style connects 
Change-Id: Idc7d5d2a52627d8a328c28863bb99174ad0154e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-27 14:52:45 +00:00
Tobias Hunger
d20833364a VcsBaseClient: Fix build on windows 
Windows does pick ::log in favor of this->log in the lambda.

Change-Id: Ib3037606dfe70de955b10e69e2bc513b99b82fca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-01-22 16:03:22 +01:00
Hugues Delorme
4b5d2ccef7 Vcs: in VcsBaseClient use functors to create log/diff parameter widgets 
Also API of VcsBaseEditorParameterWidget was changed to take benefit of C++11 lambdas.
Slot executeCommand() is no longer virtual and only fires signal commandExecutionRequested().
The Vcs client just has to bind a lambda to this signal instead of some boiler-plate code
like keeping track of the arguments of diff/log with "struct XxxDiffParameters", etc.

Change-Id: I347c97d84a8324e9c661df4e6d9a6075980b020f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-01-22 14:28:35 +01:00
Tobias Hunger
03c9b935de Git: Sprinkle with auto 
Change-Id: I13886e17ee49702a69450e0f0b7d161cdfed1385
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-22 14:19:09 +01:00
Tobias Hunger
2b5f100769 Git: Fully set up VcsCommand before executing it 
Change-Id: Ia3ccc95a70b831ae999e3176f661d12712958bfc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-20 11:19:02 +01:00
Eike Ziller
4c63deae5c Git/VCS: Use spinning progress indicator for log view 
Show a spinning progress indicator instead of the "Waiting for data"
text for e.g. the git log view and other commands that use
VcsBaseEditor.

Change-Id: Ie4c73f85397f8809bda6bb276140eb695d96174f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-19 10:45:35 +01:00
Tobias Hunger
262f7f428f Vcs: Remove unused GetRepositoryRootOperation 
Change-Id: I2443aef788c75a96ba19e2499dfb3f17c201d468
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-19 10:20:12 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Orgad Shaneh
c6a983d271 Core: Use FileName for file path in IDocument 
Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-12 10:23:37 +01:00