73 Commits

Author	SHA1	Message	Date
Jesse Duffield	8d8bdb948b	avoid deadlock in merge panel	2022-01-15 14:15:41 +11:00
Jesse Duffield	cdcfeb396f	stop refreshing the screen so much	2022-01-15 14:15:41 +11:00
Jesse Duffield	364c5db19c	shorten name	2022-01-09 14:09:53 +11:00
Jesse Duffield	f503ff1ecb	start breaking up git struct	2022-01-09 14:09:53 +11:00
Jesse Duffield	91fe68576c	refactor	2022-01-07 10:52:51 +11:00
Jesse Duffield	66e840bc3f	more refactoring	2022-01-04 09:07:15 +11:00
Jesse Duffield	b028f37ba8	updating specs	2022-01-04 09:07:15 +11:00
Jesse Duffield	01ea5813a8	align Gui struct with GitCommand	2022-01-04 09:07:15 +11:00
Jesse Duffield	37be9dbea1	support scrolling left and right	2021-11-05 07:58:21 +11:00
Jesse Duffield	927ee63106	support aborting a merge or rebase with esc	2021-11-01 09:18:30 +11:00
Ryooooooga	df4eb70ba2	Fix translations	2021-08-25 22:23:55 +10:00
Ryooooooga	6ca42ff720	Fix pick all hunks	2021-08-25 22:23:55 +10:00
Ryooooooga	a0e7604f61	Support git config merge.conflictStyle diff3	2021-08-25 22:23:55 +10:00
Jesse Duffield	98375dc902	refactor merge panel	2021-04-18 18:58:09 +10:00
Jesse Duffield	6fbe660f96	full coverage for logging commands	2021-04-11 17:07:49 +10:00
Jesse Duffield	2d8f7d2a7b	better way of scrolling to a merge conflict	2021-04-11 10:21:53 +10:00
Jesse Duffield	d627b3bfc8	more refactoring	2021-04-06 19:34:32 +10:00
Jesse Duffield	4fe512ff3a	test ... type safe view access	2021-04-06 19:34:32 +10:00
Jesse Duffield	0898a7bb57	refactor	2021-04-06 19:34:32 +10:00
Jesse Duffield	bc9a99387f	refactor of contexts and filtering	2021-04-06 19:34:32 +10:00
Jesse Duffield	216b5341ae	better handling of scrolling for conflicted files	2021-04-02 11:09:12 +11:00
Jesse Duffield	eeeef9ca86	refactor	2021-04-02 11:09:12 +11:00
Jesse Duffield	cc9293b386	add mutex to prevent crashes with merge conflicts	2021-04-02 11:09:12 +11:00
Jesse Duffield	7d62f103e4	big refactor to give our enums actual types	2021-04-02 11:00:15 +11:00
Jesse Duffield	da3b0bf7c8	Start on supporting auto-suggestions when checking out a branch ... switch to other fuzzy package with no dependencies	2020-11-28 20:48:17 +11:00
Jesse Duffield	682db77401	fix lint errors	2020-11-18 08:36:19 +11:00
Jesse Duffield	37bb89dac3	type i18n	2020-10-10 00:23:01 +11:00
Jesse Duffield	4912205adb	remove viper ... WIP	2020-10-10 00:23:01 +11:00
Jesse Duffield	077f113618	add in-built logging support for a better dev experience	2020-09-26 11:00:50 +10:00
Jesse Duffield	d2d88fe64e	fix focus change on merge popup return	2020-08-23 19:28:59 +10:00
Jesse Duffield	94601b4dc9	use context to return to the correct view	2020-08-23 14:29:18 +10:00
Jesse Duffield	fda9f4ea7a	centralise logic for rendering options map	2020-08-23 14:29:18 +10:00
Jesse Duffield	0dd2c869a8	minor refactor	2020-08-23 14:29:18 +10:00
Jesse Duffield	9c866fd49c	more standardisation	2020-08-23 14:29:18 +10:00
Jesse Duffield	6c270b6e26	WIP	2020-08-23 14:29:18 +10:00
Jesse Duffield	f5b22d94d9	WIP	2020-08-23 14:29:18 +10:00
Jesse Duffield	ed4574bda9	standardise getting selected item	2020-08-23 14:29:18 +10:00
Jesse Duffield	7f89113245	WIP	2020-08-23 14:29:18 +10:00
Jesse Duffield	9b7a6934b3	more removing of g	2020-08-15 18:01:43 +10:00
Jesse Duffield	0822a9296c	rename	2020-08-15 18:01:43 +10:00
Jesse Duffield	d9fa02c53b	clean up interface for popup panels	2020-08-15 18:01:43 +10:00
Jesse Duffield	cf5cefb2d6	allow user to scroll themselves inside merge panel	2020-05-19 18:44:53 +10:00
Jesse Duffield	36ac764133	fix race condition when scrolling to merge conflict	2020-05-19 18:05:14 +10:00
Jesse Duffield	913f17ee3e	prevent flicker from bolding background of selected line	2020-05-15 21:12:12 +10:00
Jesse Duffield	267730bc00	standardise how we handle background colours	2020-05-13 21:24:25 +10:00
Jesse Duffield	40fbce91ce	add new diff mode ... WIP WIP WIP WIP WIP WIP WIP	2020-03-29 18:26:24 +11:00
Jesse Duffield	40b173118a	fix conflict race condition	2020-03-29 02:36:01 +00:00
Jesse Duffield	a9559a5c87	move working tree state function into git.go	2020-03-28 13:19:35 +11:00
Jesse Duffield	906a49049e	smart refreshing files	2020-03-28 11:59:45 +11:00
Jesse Duffield	198d237679	more centralised handling of refreshing	2020-03-28 11:59:45 +11:00