Commit Graph

1706 Commits

Author SHA1 Message Date
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
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
Orgad Shaneh
5ee1030791 Gerrit: Workaround gerrit issue when origin has /p prefix
/p was used with older versions of gerrit. It is no longer required, but
still supported.

Change-Id: Ie7c6a941031c56cf805c13518deec0fadb2f69ab
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-27 11:47:12 +00:00
Orgad Shaneh
f53a07953f Gerrit: Avoid double refresh when opened for the first time
Change-Id: I05e50b22b6b368c655902b90585f770a332f53d3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-27 06:39:28 +00:00
Orgad Shaneh
59a0aeb739 Git: Fix and add accelerators in branches dialog
Change-Id: I5a3d1d2b8fe4f97635e12ff946187c5fb5207a43
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-25 18:17:37 +00:00
Orgad Shaneh
85a971fae1 Git: Remove unused setting
Change-Id: I0c5888fbbcf2302eb6db128ea3c6603751afa612
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-06-25 18:17:08 +00:00
Orgad Shaneh
a36536813f VCS: Set user choices on editor reload
Broke by 2c6adc1e74.

Change-Id: Iba435899c7b0da4b270f4ef8ece84c1839bf6b72
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-19 08:08:02 +00:00
Orgad Shaneh
6b0e1bc5f8 Merge remote-tracking branch 'origin/4.3' into master
Change-Id: I83af635dcac98e4fd78b21d8dd9dc3a27a4fdf94
2017-06-12 10:01:16 +03:00
Orgad Shaneh
95f49a3c8c Gerrit: Do not refresh the gerrit dialog when it is invisible
Change-Id: Icd4387f69b616f275b46b3b12e8db90b4b280554
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-06-08 09:13:13 +00:00
Orgad Shaneh
89057b552b Merge remote-tracking branch 'origin/4.3'
Change-Id: I56004e3ec9dc9d92d33bdae438c4f7e069eccc45
2017-06-02 15:13:51 +03:00
Orgad Shaneh
d64fa1ee48 Gerrit: Refresh when the dialog is re-opened
Task-number: QTCREATORBUG-10028
Change-Id: I60d91d88df5596f7d34605ed28d0cc6ef3427a8c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-06-02 09:12:35 +00:00
Orgad Shaneh
2584c4e180 Git: Improve branch listing in Show
* Separate local and remote branches
* List branches for each remote in a separate line
* List up to 12 branches per group
* Elide in the middle, list first and last branches in each group

Task-number: QTCREATORBUG-16949
Change-Id: If293cbd2536921261d9f420c71c2b68c8cb5bfe2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-29 10:38:59 +00:00
Orgad Shaneh
2307e4d2cc Git: Prevent * in branch/remote names
Change-Id: I8934352359710e1890a04310c22086f80dd4a7cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-05-29 07:19:20 +00:00
Orgad Shaneh
9b9a883a9a Gerrit: Fix SSH output parsing for Gerrit 2.14
Gerrit 2.13: {..., "number":"195547", ...}
Gerrit 2.14: {..., "number":195547, ...}

Change-Id: I13f668d7b8edd012bf72bf03052da56fc99f18eb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-05-25 18:41:35 +00:00
Orgad Shaneh
232442bc2d Git: Include decorations in Show
They got lost in 23b89f1e85.

Change-Id: I3ecbabf0886fdc66e6d7f097d48a02cff9df6cb3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-24 08:57:20 +00:00
Eike Ziller
b289dbde3c Fix style of visualized whitespace for various vcs editors
Blame, log and git rebase editors.

Task-number: QTCREATORBUG-17735
Change-Id: Ifd23ba7b6ccf3ef98d3026cdc8c17fd88c97797c
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-23 11:32:57 +00:00
Eike Ziller
cf57965ebc Simplify text format handling in syntax highlighters
Pass the mapping from custom enum to text style in form of a function,
which then can use a switch which is checked by compilers, and
avoids the need to lookup a different enum somewhere else to find
out what the mapping actually is.
That mapping is cached to keep performance as before.

Also, most highlighters created an enum just for the purpose of mapping
to text styles, basically creating duplicated subsets of text style like
enums everywhere. Instead provide a default, identity mapping from text
styles to text styles.

Change-Id: I2ea1ca702b99e36b8742dfda510b1b2753f0a1c2
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-05-23 07:47:22 +00:00
Orgad Shaneh
a4a146b3cb Move Git-specific logic from DiffEditor to Git
Change-Id: I29466c26a51844bb975ac3ecb68adf708021aa67
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-05-19 04:48:23 +00:00
Eike Ziller
64b19af7dd Merge remote-tracking branch 'origin/4.3'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I6d89ea588de955f5d878500b59285d3adde6c77d
2017-05-15 15:31:55 +02:00
Orgad Shaneh
02d2b36ce7 Gerrit: Avoid UTF-8 in comments
When the default charset is not UTF-8, the editor fails to open this
file for write.

Change-Id: Idda8379e10ac48e3a5c1012a1c6b7b06ef5835e5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 13:27:28 +00:00
Orgad Shaneh
7e8bac1512 Gerrit: Terminate previous query when remote is changed
Change-Id: Ifafaa9068dca069562973151361e653f6db3617e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-15 08:19:59 +00:00
Eike Ziller
6e8ee7479e Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
2017-05-09 15:07:30 +02:00
Orgad Shaneh
b67f853650 Gerrit: Fix REST for Gerrit 2.14
2.14 sends JSON without leading closing parentheses.

Change-Id: I51ec44124e6c3f64b3a76733329fe3ea329c60b0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-04 12:15:17 +00:00
Robert Loehning
9ee0cec3bc Gerrit: Move line back to correct case
Change-Id: I7d6ee5835d67fce21ea211099d9d6aa6061517b9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-05-02 14:41:28 +00:00
Orgad Shaneh
73f210dad6 Gerrit: Support certificate validation
Certificate should be validated by default. Only if it fails, and the
user approves, we may skip validation.

Change-Id: I7696cd7dda2d6d7ef1aa616557d5619b63372028
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-04-25 12:34:08 +00:00
Orgad Shaneh
46b7701398 Gerrit: Replace magic numbers with an enum
Change-Id: I591716865831877eda4a17e9c85169935d633b09
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-04-24 20:19:53 +00:00
Montel Laurent
5d27bc747b Use QFileInfo::exists(...) which is faster that QFileInfo(..).exists
Change-Id: I0d2e61d84c74e60ef4f54074a4ca00f2d0835562
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-14 13:18:28 +00:00
Orgad Shaneh
1af52db32e Git: Replace lambdas with std::bind
Reduces release build from by ~5K (255->250), and slightly shorter.

Change-Id: I326297b08374fe34cdd2dd05db3b978ae7775e06
Reviewed-by: hjk <hjk@qt.io>
2017-04-04 19:02:24 +00:00
Orgad Shaneh
b30b4f8a11 Git: Fix inline nested branch rename
We can't just change the node name. A branch named foo/bar can be
renamed to baz/yyy. We have to refresh the model after rename.

Change-Id: Id9dfaa15b9e0384668223ae746376025267f89a3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-26 20:38:03 +00:00
Orgad Shaneh
5736ef2c54 Git: Improve detection of nested local branch
If the current branch was foo/bar it was not detected correctly.

Change-Id: Ic030a6f4659801c6da2716c272a418c89585e22f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-26 20:37:58 +00:00
Orgad Shaneh
07921dee77 Git: Expand branches also on internal model refresh
Change-Id: I91e3b875be1a2c3b5da9ae7720709b34a7d83232
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-26 20:37:53 +00:00
Orgad Shaneh
8478e35384 Git: Minor cleanup in BranchModel
* Use member initialization
* Use nullptr
* Remove unneeded local var

Change-Id: Ibca6c3bc5caf9e028166b833ba1ed9fc165e290b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-26 20:37:49 +00:00
Max Blagay
213bfe9e9c Git: Remove "Sign off" shortcut from submit editor
The new "Sign off" option in Git submit editor had
the shortcut Alt+S, which conflicted with the shortcut
for "Diff Selected Files".

As "Sign off" will most likey be used seldom, the
shortcut is removed.

Change-Id: Id7763277da304834e9dc5d850272dd5fc207fcb9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-23 12:36:35 +00:00
Orgad Shaneh
16d2a10a1b Gerrit: Fix wrong references in REST parsing
* Fetch url/ref
* Patch set number

Change-Id: I1aec8850add21dc269326c637b246ba62266b889
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-21 06:14:25 +00:00
Orgad Shaneh
da7cb91446 Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
2017-03-14 16:20:14 +02:00
Orgad Shaneh
11e8ce65db Gerrit: Force remote refreshing on 401 error
Can happen if the password was changed.

Change-Id: If0f0fa047c376c193ceda50e5465d016e16b61a3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 13:02:40 +00:00
Orgad Shaneh
75273506c1 Gerrit: Resolve also user name from gerrit response
If gerrit provides it (version >= 2.10).

Change-Id: I7087be338e954fa13eb4a9fcc4f848d6272a46d6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:35 +00:00
Orgad Shaneh
8795ec0beb Gerrit: Replace single line slots with lambdas
Change-Id: I63c3e963a2aa04043c4da3da6313757b001f568d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:15 +00:00
Orgad Shaneh
db16f265c9 Gerrit: Add a button for server revalidation
Change-Id: I0ef823aa562093e5e3d63bc2766ab1a95ae259d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-03-14 12:55:10 +00:00
Orgad Shaneh
c1d013437f Gerrit: Persist server details
Avoid repeating connection tests for the same server between runs.

Change-Id: Iecea52af986a708f317878c171d4fcea088cbbde
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:04 +00:00
Samuel Gaist
4033471aa9 QRegExp include cleanup
This patch adds the missing include statements for QRegExp.

Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-13 22:05:30 +00:00
Orgad Shaneh
e0c6fd334f Gerrit: Remove superfluous title assignment
It's already done in setupUi().

Change-Id: I5f768436f5e374ef252d0ca4086180027e69f75b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-13 19:32:33 +00:00
Orgad Shaneh
dbe77890cd Gerrit: Minor cleanup
Change-Id: I7bfa74053c41c68b956929b73a9b50bf77cbf6e4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-13 07:43:42 +00:00
Orgad Shaneh
f9b556621c Gerrit: Store username provided by the user
Change-Id: I72163d974e744211da4c442c474611390f5d3111
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-13 05:55:38 +00:00