311 Commits

Author	SHA1	Message	Date
Jesse Duffield	3b2353b5ae	remove redundant call to refreshCommitFilesView ... We already call this function inside the refreshCommitsView function. We call it there because it's logical that A) one occurs whenever the other does and B) the commit files only get refreshed after we've updated the commits themselves	2019-03-16 10:20:27 +11:00
Jesse Duffield	4f7f6a073c	allow user to discard old file changes for a given commit	2019-03-16 10:20:27 +11:00
Jesse Duffield	0e008cc15f	allow user to checkout old files	2019-03-16 10:20:27 +11:00
Jesse Duffield	1ad9c6faac	minor cleanup	2019-03-16 10:20:27 +11:00
skanehira	06fe726ee7	Add feature of display committed file list #383	2019-03-16 10:20:27 +11:00
Jesse Duffield	ac5088eee6	allow both enter and space to execute menu item	2019-03-03 23:18:28 +11:00
Jesse Duffield	e36899d5c5	prevent crashes when scrolling up	2019-03-03 23:08:07 +11:00
Jesse Duffield	a5d27764cd	support user configuring mouse events to be enabled	2019-03-03 16:15:20 +11:00
Jesse Duffield	43758cbb5f	i18n for rebase loading states	2019-03-03 16:11:20 +11:00
Jesse Duffield	0079015102	distinguish between inline and non-inline merge conflicts	2019-03-03 15:58:01 +11:00
Jesse Duffield	e0bdfad63a	don't crash if we have no lines to stage	2019-03-03 15:48:01 +11:00
Jesse Duffield	f07fc31f8b	fixup layout issue that was causing crashes when the window was too small	2019-03-03 15:34:53 +11:00
Jesse Duffield	4bb577ab7d	show loading status for rebasing events	2019-03-03 15:21:33 +11:00
Jesse Duffield	8305d8e72f	hide donate button if mouse events are disabled	2019-03-03 15:21:20 +11:00
Jesse Duffield	790235f64b	add another match on the error message to tell us we've encountered merge conflicts	2019-03-02 21:31:48 +11:00
Jesse Duffield	dbb01b028d	populate dutch and polish i18n files with new messages	2019-03-02 21:31:48 +11:00
Jesse Duffield	0c886eddfb	Revert "remove old rebase code now that we're only ever interactively rebasing" ... This reverts commit 1a19b1412d.	2019-03-02 20:00:26 +11:00
Jesse Duffield	399346c2ee	disable mouse feature until its ready	2019-03-02 20:00:17 +11:00
Jesse Duffield	7a170bbccf	extend cheatsheet generator to contain context based keybindings	2019-03-02 19:05:21 +11:00
Jesse Duffield Duffield	8c0ea8f45f	mouse support	2019-03-02 17:49:30 +11:00
Jesse Duffield	afbc028ad6	revert to the old keybinding for stash: I don't want anybody accidentally deleting changes they are trying to stash	2019-03-02 17:46:56 +11:00
Jesse Duffield	e331dfcaf8	update i18n	2019-03-02 17:46:56 +11:00
Jesse Duffield	1337f6e76a	appease golangci	2019-03-02 17:45:53 +11:00
Jesse Duffield Duffield	f4938deaae	change type of cherryPickedCommits from []string to []*Commit	2019-02-24 17:34:19 +11:00
Jesse Duffield Duffield	a8858cbd12	support cherry picking commits	2019-02-24 13:51:52 +11:00
Jesse Duffield Duffield	1a19b1412d	remove old rebase code now that we're only ever interactively rebasing	2019-02-24 11:03:14 +11:00
Jesse Duffield Duffield	95d451e59a	Make it easier to run sync/async commands, switch to interactive rebase when rebasing on branches	2019-02-24 10:58:15 +11:00
Jesse Duffield	6c1d2d45ef	some i18n and restricting rewording during interactive rebase	2019-02-24 09:42:35 +11:00
Jesse Duffield	f6b3a9b184	rearranging todo items while interactively rebasing	2019-02-24 09:42:34 +11:00
Jesse Duffield	9661ea04f3	wrap amend command in a confirmation	2019-02-20 19:46:27 +11:00
Jesse Duffield	0228e25084	work towards more interactive rebase options	2019-02-19 23:36:36 +11:00
Jesse Duffield	dcc7855fd0	pull commit list builder functions into their own builder struct	2019-02-19 09:18:30 +11:00
Jesse Duffield	d44638130c	add various interactive rebase commands	2019-02-18 23:27:54 +11:00
Jesse Duffield	76a27f417f	rename any commit	2019-02-18 21:29:43 +11:00
Jesse Duffield	adc2529019	dealing better with errors at the top level	2019-02-18 19:42:23 +11:00
Jesse Duffield	43ab7318d3	remove HasMergeConflicts struct instance variables	2019-02-18 19:28:02 +11:00
Jesse Duffield	cb372d469f	fix golangci errors	2019-02-16 21:30:29 +11:00
Jesse Duffield	88ba6efdd5	remove outdated TODO	2019-02-16 21:20:10 +11:00
Jesse Duffield	e011e9bc42	more work on rebasing feature	2019-02-16 21:01:17 +11:00
Jesse Duffield	ad93b4c863	consider whether the view has focus when rendering the contents of a view	2019-02-16 15:17:44 +11:00
Jesse Duffield	198cbee498	introduce panel contexts and more work on rebasing	2019-02-16 12:07:27 +11:00
Jesse Duffield	daca07eaca	add loading panel	2019-02-16 12:03:22 +11:00
Jesse Duffield	c101993405	post-merge cleanup	2019-02-11 22:47:14 +11:00
Jesse Duffield	6430ab6ac9	Merge branch 'master' into feature/rebasing	2019-02-11 22:46:27 +11:00
Jesse Duffield	cfe3605e6b	use go-errors package to display stacktrace of errors that cause panics	2019-02-11 22:39:17 +11:00
Jesse Duffield	75ab8ec4d9	catch rebase errors and show in error panels	2019-02-11 21:29:47 +11:00
Jesse Duffield	77faf85cfc	post-merge cleanup	2019-02-11 21:07:12 +11:00
Jesse Duffield	3d343e9b57	Merge branch 'master' into feature/rebasing	2019-02-11 21:02:53 +11:00
Jesse Duffield	3a607061a2	Only reset origin in main view when handling the selection of a new file	2019-01-18 09:32:15 +11:00
Jesse Duffield	695b092c41	Directly send wrap argument rather than the view	2019-01-17 10:29:52 +11:00