Commit Graph

2048 Commits

Author SHA1 Message Date
Orgad Shaneh
53b2df46e0 Gerrit: Set current repository every time the dialog is shown
Task-number: QTCREATORBUG-19562
Change-Id: I17918e08f7d3092ffe54ab359bf2b41c51813367
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 08:13:53 +00:00
Orgad Shaneh
1decef8fc9 Gerrit: Deduplicate detection of current repository
Change-Id: Ib3a63f71dd45c45b20eab51a2a0bf9c21ba8754a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-08 08:13:48 +00:00
Eike Ziller
a2739f55ed Merge remote-tracking branch 'origin/4.5'
Change-Id: Ic7c16091268083c0426cf29f0691a7ee458f2bd9
2017-12-07 09:16:01 +01:00
Orgad Shaneh
2559ad48a8 Git: Show success message on push
Change-Id: I78433d7c7aec65fbafcba49fabf0562571dfbeff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-12-05 10:12:09 +00:00
Alessandro Portale
2349a0a5c4 Git: Gerritpushdialog: Fix draft push for older Gerrits
Logic for "Non-Draft" and "Draft" was swapped.

Change-Id: I14640e1a6321332c6f0cc0b3e8364194f52bcbaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-12-03 18:37:41 +00:00
Eike Ziller
7f626b1182 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
2017-10-25 16:07:21 +02:00
Eike Ziller
cd93f624da VCS: Fix translation issues
Change-Id: I3d85a3fc9d34144ca30ef1e37b22bfe7874b8e64
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-24 08:12:11 +00:00
Robert Loehning
93c616b23f Git: Remove unused variable
Change-Id: If7656e0938380714bff655c80e6d0082a427ef71
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-23 09:08:24 +00:00
Alessandro Portale
1c0dc848e0 Git: Reduce the minimal height of the Gerrit dialog a bit
The current Gerrit dialog is too high for my 1366x768 screen, and
therefore it either misses the title bar or the confirmation buttons.

This change reduces the minimal height of the "changes" and "details"
sub-widgets proportionally.

Change-Id: I548e1e04bb47b881bee55e28bf362a84ae11a87c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-19 23:00:30 +00:00
Orgad Shaneh
371b2bbbab Merge remote-tracking branch 'origin/4.5' into master
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
2017-10-17 20:00:44 +03:00
Orgad Shaneh
e633b49cd0 Gerrit: Suppress updates while remotes are cleared
Change-Id: Iec13f7002816db54279507250a6b5050f41b45f2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 11:54:58 +00:00
Orgad Shaneh
2310ec5891 Gerrit: Support Private/Work-In-Progress push on Gerrit >= 2.15
A private change[1] is only visible to the uploader and reviewers (like
draft in older Gerrit).

A WIP change[2] does not generate notifications until it becomes ready.

[1] https://gerrit-review.googlesource.com/Documentation/intro-user.html#private-changes
[2] https://gerrit-review.googlesource.com/Documentation/user-upload.html#wip

Change-Id: I4905461c529e93e86be934c60eab218ff7474fcd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 08:58:14 +00:00
Orgad Shaneh
be3254c7c3 Gerrit: Resolve version also for valid servers
Change-Id: I2d02aec89bf5d7afe1d173fb5054f92f9bf1c3bf
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-17 06:27:14 +00:00
Orgad Shaneh
c19c2551fb Gerrit: Move push target logic to GerritPushDialog
Less indirection + will simplify new private/wip flags.

Change-Id: If8c4072b6456b4044d83ef17e130e0360a1d05f8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-15 16:44:59 +00:00
Orgad Shaneh
7a04014f9f Merge remote-tracking branch 'origin/4.5'
Change-Id: I2d78020f10aa66fdded63883030313e0c411ce02
2017-10-15 00:23:08 +03:00
Orgad Shaneh
5a7a8cbf74 Gerrit: Resolve and store gerrit version
This can be used for enabling features that are available from a specific
version.

Change-Id: I4ce1c8684df2b8e194e8bbb02769ba99fc256408
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-13 13:06:31 +00:00
Orgad Shaneh
5e798b0bf4 Gerrit: Improve error message when Gerrit remote is missing
Task-number: QTCREATORBUG-18980
Change-Id: I99336732d59136f9aec9fc0a97fb3135e9c43f65
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-13 13:06:14 +00:00
Eike Ziller
a83755157b Merge remote-tracking branch 'origin/4.5'
Change-Id: I0a4a1b6787afc817acf2b7a1c3fd2b881c35f57a
2017-10-13 11:59:49 +02:00
Orgad Shaneh
5d5d0497e5 Git: Use C locale when parsing the command output
Task-number: QTCREATORBUG-19017
Change-Id: Ib77d66e22d227d43245d352905f9b095f7d0f42b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-12 18:52:58 +00:00
Eike Ziller
07bec99e8f Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
2017-10-09 12:09:27 +02:00
Tobias Hunger
c330cf0679 Replace manual signal blocking/unblocking with QSignalBlocker
Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-04 09:35:06 +00:00
Orgad Shaneh
84b57027c8 Git: Fix progress during rebase
Broke by c4b5048836.

Change-Id: I35b22b6ab5fd8767ef729906b8344a0d6aa1f0cf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-04 07:51:12 +00:00
Laurent Montel
ac6055eeb0 Git: clean forward declaration
Change-Id: Ic8e988d9fa27f9e92fdcfe111220a5c929998afb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-28 07:05:19 +00:00
Eike Ziller
8e62881b12 Make DocumentManager::projectsDirectory a FileName
Change-Id: I9454c2148c398939c64bfa6b1fc182670a1d5f99
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-19 10:13:49 +00:00
Eike Ziller
3d9cf954e2 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp

Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0
2017-09-19 12:10:26 +02:00
Andre Hartmann
8488ce627b Git: Refresh RemoteModel when last remote was removed
The existing check prevented a model update if the remote
list was empty and therefore kept an orphan entry and forbid
adding the remote again until the dialog was re-opened.

Task-number: QTCREATORBUG-18904
Change-Id: I5a45919a8af5108d44f85f87a64a00cf459af3bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-14 10:44:43 +00:00
Tobias Hunger
21ab4c427c VCS: Offer to save-all before commit
Task-number: QTCREATORBUG-3857
Change-Id: I3ff3d90803eec4134b9da4af5567753ad7bffafb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-09-12 10:04:20 +00:00
Orgad Shaneh
3b4c6ed5bd PushToGerrit: Fix support for multiple projects on the same remote
Use case: A project has a legacy repo and a new repo. Both are used as
remotes in the same local directory. If the legacy repo's remote name is
less than the current repo (legacy < origin) then only legacy appears.

Change-Id: Ie02cbee3142c4d2628cb51cbcad50cf903a75bb0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-11 09:49:41 +00:00
Ulf Hermann
47886969cc Drop unused variables and lambda captures
Also, add context to connect() expressions where we are or were
capturing "this".

Change-Id: I6e006ba6f83d532478018550d148ee93eca59605
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-09-08 09:06:53 +00:00
Orgad Shaneh
139792ee25 Merge remote-tracking branch 'origin/4.4'
Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
2017-08-30 01:24:11 +03:00
Eike Ziller
04da881268 Fix copyright year in plugin info, --version, and macOS info
By using the new QTCREATOR_COPYRIGHT_YEAR variable

Task-number: QTCREATORBUG-18612
Change-Id: I3bcf0319660d210436d3130c00f43325c460a66c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-08-24 11:23:40 +00:00
Eike Ziller
c01ddc4660 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsproject.h

Change-Id: I6b9cdf704be95ade02488c8b19582b6621282fb8
2017-07-28 15:24:14 +02:00
Leena Miettinen
b29ea4527a Git: Do not use the (s) plural in UI text
The UI text guidelines advice against this.

Change-Id: Ib8f9cb291f0217de10853412b133173f1d11e7b7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-28 08:06:56 +00:00
Orgad Shaneh
b123018287 Git: Fix blame with selection that ends on the last line
This also removes an additional line when the cursor is on a line start.

Change-Id: Iaec6f60b8e33d98c3a3ed0555ee4ff01991ad7fb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-27 10:33:10 +00:00
Tobias Hunger
5d8b0e6352 Utils: Separate rendering out of ProgressIndicator
I want to reuse the rendering of the progress indicator outside
of a widget.

Change-Id: Icaeeb798578ad838693b68556bf2193c4ba45cfa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-27 09:15:05 +00:00
Eike Ziller
efa5a7b6d7 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qtcreator.pri

Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
2017-07-25 11:54:44 +02:00
Eike Ziller
e8e46ab553 Plugins: Fix that mimetype definition was not valid JSON
JSON officially does not support multiline strings, so we should use
the same mechanism that we already use for the plugin description
(i.e. additionally support arrays of strings which are interpreted
as lines).
This just happens to work because Qt's JSON parser eats it without
choking.

Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-25 06:00:49 +00:00
Orgad Shaneh
948fad02d1 Git: Recurse into submodules on grep if applicable (Git >= 2.13)
Change-Id: I5028d6a46749b22cc0e0f5707c9e283126511902
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-24 15:10:15 +00:00
Orgad Shaneh
f073c39b86 Git: Minor cleanup in grep
Change-Id: I2a686b6f56947d3fbb6dc70757e539bf4f274bff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-23 20:24:28 +00:00
Eike Ziller
1feb5c604d Merge remote-tracking branch 'origin/4.4'
Change-Id: I02e54f45d233b89ddaee9c87da9b9af2a56374b8
2017-07-21 10:08:05 +02:00
Alessandro Portale
e8477cf248 Git: More visible reset icon in GerritRemoteChooser with light themes
The _TOOLBAR variant of the icon has almost the same color as the
background in light themes and is therefore not suited, here.

Change-Id: Ifc28bfca2f8c0764f0bc507dad63d8936727f610
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-21 07:48:26 +00:00
Orgad Shaneh
240d2dc4d4 Git: Fix initial button enabling in Branches dialog
Change-Id: Iad99dd1468457b8de262ee16c4182ac9ff82e0b8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:15:53 +00:00
Tobias Hunger
19c9194b11 VcsManager: Register IVersionControls with VcsManager
Get some more objects out of the pool.

Change-Id: Id93021b712307c4777dc39b9d15aa18a46318885
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-10 08:44:47 +00:00
Jarek Kobus
4bea049c45 VcsBase: Create common base diff editor controller
Reuse it in subversion and git plugins.
It makes subversion diff more asynchronous than before.
Make VcsBase plugin dependand on DiffEditor plugin.

Change-Id: Iafea2941b890a95a269362e022af2dc03cdea550
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 14:20:07 +00:00
Jarek Kobus
0a2590e7be DiffEditor: process git diffs asynchronously
It won't freeze GUI in case of huge diffs.

Change-Id: Ida6bdcb1ef6867969cd86d4bc9652c64bc74e6ec
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-05 14:19:42 +00:00
Orgad Shaneh
9df86c2e67 Gerrit: Show only gerrit remotes in Push to Gerrit dialog
Task-number: QTCREATORBUG-16367
Change-Id: I18e24dd0748bd64790bd8d2c0eeeee2cf1d3991a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-01 19:37:37 +00:00
Orgad Shaneh
caaf370660 Gerrit: Store also remote name in remote chooser
Separate name/server data from the combo box.

Task-number: QTCREATORBUG-16367
Change-Id: Ie7bfbe19a07b948f5d170846909092be53e617bd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-01 19:01:45 +00:00
Orgad Shaneh
844f9f47de Git: Move "Include tags" to branches dialog
Change-Id: Icc06dbf8b80a55c3962967c1f37a9c506b8e5bd8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-29 15:51:23 +00:00
Orgad Shaneh
b57372f2b5 Replace include guards with #pragma once
Change-Id: Ic36cf0e9cac61d4d9a7e4434192944f5301b8aaa
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-28 08:07:56 +00:00
Orgad Shaneh
ac9ad08f67 Gerrit: Factor out remote server chooser
Preparing for re-use in Push to Gerrit dialog.

Task-number: QTCREATORBUG-16367
Change-Id: Ic72f72024d6b6b5a525f6855a9947d4c2dc6de48
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-28 07:27:38 +00:00