84 Commits

Author	SHA1	Message	Date
Ryooooooga	3b5a019e1a	feat(merge_panel): Add open/edit files in merge conflict panel	2022-04-06 08:27:03 +10:00
Jesse Duffield	a34bdf1a04	update linters	2022-03-19 12:12:57 +11:00
Jesse Duffield	145c69d9ae	working again	2022-03-17 19:13:40 +11:00
Jesse Duffield	51547e3822	move all refresh code into the one file	2022-03-17 19:13:40 +11:00
Jesse Duffield	e363606fb6	move context keys into context package	2022-03-17 19:13:40 +11:00
Jesse Duffield	1dd7307fde	start moving commit panel handlers into controller ... more and more move rebase commit refreshing into existing abstraction and more and more WIP and more handling clicks properly fix merge conflicts update cheatsheet lots more preparation to start moving things into controllers WIP better typing expand on remotes controller moving more code into controllers	2022-03-17 19:13:40 +11:00
Jesse Duffield	a90b6efded	start refactoring gui	2022-03-17 19:13:40 +11:00
Jesse Duffield	84a1992055	better locking of merge panel state	2022-01-27 21:25:04 +11:00
Jesse Duffield	c8cc18920f	improve merge conflict flow	2022-01-26 14:50:47 +11:00
Jesse Duffield	595aca2a4b	make integration test pass	2022-01-17 19:14:59 +11:00
Jesse Duffield	99035959a1	fix merge scroll bug	2022-01-16 23:16:05 +11:00
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