Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-10-06 06:57:09 +03:00
Code Issues Projects Releases Wiki Activity
1,056 Commits 87 Branches 20 Tags 80 MiB
005d57ba02
Commit Graph

78 Commits

Author SHA1 Message Date
Martin Marmsoler
875d09cc6a format 2022-08-11 11:24:17 +02:00
Martin Marmsoler
c30fc327f7 get rid of the #define private publics so that the windows builds are running through 2022-08-08 08:22:00 +02:00
Martin Marmsoler
ae0e12f38c use functions instead of accessing mDetails directly. First approach to get rid of "#define private public" 2022-08-04 15:43:32 +02:00
Martin Marmsoler
219688354e format 2022-07-23 13:23:03 +02:00
Martin Marmsoler
8e7e6d1917 unzip to temporary folder 2022-07-22 08:25:55 +02:00
Martin Marmsoler
36bb697f11 check that refresh triggered 2022-07-22 08:25:08 +02:00
Martin Marmsoler
45c4b485d4 refreshs are not needed 2022-07-22 08:22:21 +02:00
Martin Marmsoler
2183d884da when conflict happens, rebaseCommitSuccess will not be called 2022-07-22 01:37:07 +02:00
Martin Marmsoler
f5eac92c4b comment out not working tests 2022-07-22 01:32:03 +02:00
Martin Marmsoler
b1eae5c648 fix tests , last part will not work until libgit2 is updated 2022-07-22 01:31:17 +02:00
Martin Marmsoler
7973c65289 when aborting, rebaseFinished shall not be called 2022-07-22 01:22:52 +02:00
Martin Marmsoler
d3e8f42d8b fix test 2022-07-21 15:58:49 +02:00
Martin Marmsoler
a7518bb3b7 cleanup 2022-07-21 15:40:34 +02:00
Martin Marmsoler
a9858b17b1 remove LogEntry from Repository. So it is more flexible 2022-07-21 08:19:35 +02:00
Martin Marmsoler
72db140fec if a conflict happens during rebase git executable returns 1 instead of zero 2022-07-14 15:58:28 +02:00
Martin Marmsoler
2e897e166e move compile definition to testlib, because it is not needed in the final application 2022-07-14 15:39:40 +02:00
Martin Marmsoler
c08dde3813 add possibility to force commiting so in the rebase test it can forced which is needed because during rebase operation we are on a detached head 2022-07-13 09:53:24 +02:00
Martin Marmsoler
9b3ad12be6 check exit code 2022-07-13 09:38:50 +02:00
Martin Marmsoler
47062659a6 remove comments 2022-07-13 09:33:48 +02:00
Martin Marmsoler
caa59226ae not needed for this test 2022-07-13 09:32:02 +02:00
Martin Marmsoler
a7489b8353 wrong condition 2022-07-13 09:29:47 +02:00
Martin Marmsoler
f1127ac81b turn on all tests 2022-07-13 09:22:02 +02:00
Martin Marmsoler
01271d68da update rebase tests 2022-07-13 08:29:31 +02:00
Martin Marmsoler
8bac63bb68 fix second test 2022-07-11 11:30:46 +02:00
Martin Marmsoler
b4828839a8 window.show() must be done, otherwise windowHandle() is not loaded and therefore a nullptr exception happens. Use MainWindow on stack so it must not be deleted afterwards 2022-07-08 13:06:08 +02:00
Martin Marmsoler
eac0d96ff1 WIP 2022-07-01 08:56:28 +02:00
Martin Marmsoler
58be827b3a Update rebase.cpp 2022-06-29 18:05:05 +02:00
Martin Marmsoler
2e9f4b0ed8 initial commit for rebaseMergeConflicts 2022-06-29 17:29:09 +02:00
kas
db6ce24fe8 Use official name for macOS 2022-06-19 15:33:16 +02:00
Martin Marmsoler
1f91c72e6a use committer also for revert 2022-06-09 07:48:20 +02:00
Martin Marmsoler
c9f86c81b7 distinguish between author and committer. So when cherry picking, the changes will be committed, but the author will not be overwritten, only the committer. 2022-06-09 07:47:32 +02:00
kas
ef28a1b218 Fix tests on Windows 
Qt 5.15.2 has no QPlatformNativeInterface for non-X11 platforms, leading to a NULL pointer dereference when showing a message box
See https://github.com/qt/qtbase/blob/v5.15.2/src/plugins/platforms/offscreen/qoffscreenintegration.cpp#L232

The tests failing because of that are now labeled "NO_WIN32_OFFSCREEN"
and can be ignored using the CMake target "check_no_win32_offscreen"
 2022-06-08 13:43:21 +02:00
Martin Marmsoler
69dd2adcdd move FileWidget to stack, so no delete is needed. All blocks are surrounded by brackets 2022-06-07 21:06:30 +02:00
Martin Marmsoler
d50ba88a97 format 2022-06-07 16:53:16 +02:00
Martin Marmsoler
f2ce63209f add forgotten #endif 2022-06-07 16:51:10 +02:00
Martin Marmsoler
d34584041d fix linux test 2022-06-07 08:57:47 +02:00
Martin Marmsoler
af8ede7675 add comment 2022-06-07 08:46:13 +02:00
Martin Marmsoler
397e4f53f9 use stack variables, so no delete is needed 2022-06-07 08:32:10 +02:00
Murmele
b92ac0cdf2
Update test/EditorLineInfos.cpp 2022-06-01 09:16:42 +02:00
Martin Marmsoler
927e1172ff format and remove not needed function 2022-05-30 10:04:26 +02:00
Martin Marmsoler
bf1cd57611 add test for multihunks 2022-05-29 12:03:08 +02:00
Martin Marmsoler
5fe8c66815 add test for crlf 2022-05-29 12:03:06 +02:00
Martin Marmsoler
d8c8c9413b fix extracting zip on windows 2022-05-29 12:03:05 +02:00
Martin Marmsoler
06ed2bf9ed add windows test 2022-05-29 12:03:04 +02:00
Martin Marmsoler
0c3b9949cc format init_repo.cpp 2022-05-06 10:41:42 +02:00
Martin Marmsoler
494ce51854 Diff.moc not needed because not Q_OBJECT is in the class 2022-05-06 09:41:35 +02:00
Martin Marmsoler
9f96c9f4d7 use TEST_MAIN instead of QTEST_MAIN, so the ubuntu install requirements are not needed anymore 2022-05-06 09:16:21 +02:00
Martin Marmsoler
2b0900def3 fix index tests 2022-05-05 23:11:21 +02:00
Martin Marmsoler
cde4e7d10f use platform offscreen to get rid of the failure: qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. 2022-05-05 22:55:36 +02:00
Martin Marmsoler
be570fe396 cleanup 2022-05-05 22:35:21 +02:00