1075 Commits

Author	SHA1	Message	Date
Kristijan Husak	68586ec49a	Handle regex compilation errors and show them to the user.	2020-04-20 18:47:50 +10:00
Kristijan Husak	6cf75af0af	Add option to set predefined commit message prefix. Fixes #760.	2020-04-20 18:47:50 +10:00
Jesse Duffield	304607ae5d	support configurable merge args	2020-04-20 18:40:49 +10:00
Jesse Duffield	e9f28855a2	add bugfix git flow option	2020-04-20 18:31:13 +10:00
Glenn Vriesman	66d7d5f312	fix: fixed gpg breaking terminal ... Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>	2020-04-20 18:30:57 +10:00
Jesse Duffield	59734f1069	whoops	2020-04-17 09:27:23 +10:00
Jesse Duffield	2974a57943	support copying stuff to clipboard	2020-04-15 10:44:56 +00:00
Jesse Duffield	97d7a8ad0c	add reverse patch option	2020-03-29 21:53:25 +00:00
Jesse Duffield	b89ba365d0	unbold diff info	2020-03-29 18:31:19 +11:00
Jesse Duffield	47ff388549	some more UI logic	2020-03-29 18:26:24 +11:00
Jesse Duffield	647ab9bf0f	better keybinding	2020-03-29 18:26:24 +11:00
Jesse Duffield	76431b4673	simplify things	2020-03-29 18:26:24 +11:00
Jesse Duffield	be0dd29e3a	don't support files until we understand the use case	2020-03-29 18:26:24 +11: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	33d287d2f0	remove old diff mode code	2020-03-29 18:26:24 +11:00
Jesse Duffield	9eb1cbc514	reset main's origin when cycling views	2020-03-29 02:36:01 +00:00
Jesse Duffield	40b173118a	fix conflict race condition	2020-03-29 02:36:01 +00:00
Jesse Duffield	8822c409e2	split reflog commits into ReflogCommits and FilteredReflogCommits	2020-03-29 11:37:29 +11:00
Jesse Duffield	aa750c0819	load reflog commits manually when in filter mode for branches panel	2020-03-29 11:37:29 +11:00
Jesse Duffield	d90d9d7330	reset state on each Run() call	2020-03-29 11:37:29 +11:00
Jesse Duffield	a8db672ffb	refactor gui.go	2020-03-29 11:37:29 +11:00
Jesse Duffield	76b66ae26f	properly reset gui state when restarting or coming back from a subprocess	2020-03-29 11:37:29 +11:00
Jesse Duffield	a2790cfe8e	rename to filtered mode	2020-03-29 11:37:29 +11:00
Jesse Duffield	624ae45ebb	allow scoped mode where the commits/reflog/stash panels are scoped to a file ... WIP restrict certain actions in scoped mode WIP	2020-03-29 11:37:29 +11:00
Jesse Duffield	2756b82f57	fix width of half screen mode	2020-03-29 11:37:29 +11:00
Jesse Duffield	52f41ab0d5	update cheatsheet	2020-03-28 03:16:44 +00:00
Jesse Duffield	fbb767893e	support lazyloading in commits view	2020-03-28 14:02:53 +11:00
Jesse Duffield	229f5ee48c	add keybindings for paging in list panels and jumping to top/bottom	2020-03-28 14:02:53 +11:00
Jesse Duffield	517b7d0283	fix up some things with the patch handling stuff	2020-03-28 13:19:35 +11:00
Jesse Duffield	0c0231c3e8	autostash changes when pulling file into index	2020-03-28 13:19:35 +11:00
Jesse Duffield	a9559a5c87	move working tree state function into git.go	2020-03-28 13:19:35 +11:00
Jesse Duffield	814ee24c8d	better error handling	2020-03-28 11:59:45 +11:00
Jesse Duffield	7876cddf4a	remove dead code	2020-03-28 11:59:45 +11:00
Jesse Duffield	e9051355a1	fix test	2020-03-28 11:59:45 +11:00
Jesse Duffield	29316a528a	better documentation	2020-03-28 11:59:45 +11:00
Jesse Duffield	036b53acf8	in fact we don't need any of these options	2020-03-28 11:59:45 +11:00
Jesse Duffield	919463ff02	actually don't even bother limiting	2020-03-28 11:59:45 +11:00
Jesse Duffield	3f7ec3f3b8	load reflog commits in two stages to speed up startup time	2020-03-28 11:59:45 +11:00
Jesse Duffield	19604214d7	discard old reflog commits when in new context	2020-03-28 11:59:45 +11:00
Jesse Duffield	f7add8d788	smarter refreshing for tags and remotes	2020-03-28 11:59:45 +11:00
Jesse Duffield	d97c230747	stop switching focus to commit files view while staging line by line	2020-03-28 11:59:45 +11:00
Jesse Duffield	906a49049e	smart refreshing files	2020-03-28 11:59:45 +11:00
Jesse Duffield	c1a4bd0482	more smart refreshing ... WIP WIP WIP WIP WIP fix how diff entries are handled WIP WIP WIP WIP WIP WIP	2020-03-28 11:59:45 +11:00
Jesse Duffield	d0336fe16f	better presentation of remotes	2020-03-28 11:59:45 +11:00
Jesse Duffield	61b4bbf74e	clean up signature	2020-03-28 11:59:45 +11:00
Jesse Duffield	384c2e13d7	better refreshing for stash	2020-03-28 11:59:45 +11:00
Jesse Duffield	198d237679	more centralised handling of refreshing	2020-03-28 11:59:45 +11:00
Jesse Duffield	39315ca1e2	use wait groups when refreshing	2020-03-28 11:59:45 +11:00
Jesse Duffield	efb51eee96	more efficient refreshing	2020-03-28 11:59:45 +11:00
Jesse Duffield	fbbd16bd82	use reflogs from state to work out branch recencies	2020-03-28 11:59:45 +11:00
Jesse Duffield	bd2c1eef53	remove redundant fetch of reflog	2020-03-28 11:59:45 +11:00
Jesse Duffield	d1395b15bb	use GIT_EDITOR	2020-03-27 19:26:14 +11:00
Máximo Cuadros	2d8ed5e274	*: update go-git import	2020-03-27 19:06:21 +11:00
Jesse Duffield	95b147079f	allow applying patch directly	2020-03-26 21:44:45 +11:00
Jesse Duffield	83757f1065	limit size of menu panel	2020-03-26 21:44:33 +11:00
Jesse Duffield	f2036b42e5	only load new reflog entries	2020-03-26 21:44:33 +11:00
Jesse Duffield	21b7d41845	relax limit on commit list and reset on branch change	2020-03-26 21:44:33 +11:00
Jesse Duffield	91a404d033	separate commits from cherry pick state	2020-03-26 21:44:33 +11:00
Jesse Duffield	d027cf969c	better handling of current branch name	2020-03-26 20:37:06 +11:00
Jesse Duffield	37acc17cf3	more lenient getting of short shas	2020-03-26 18:30:02 +11:00
Dawid Dziurla	c831ad39c9	pkg: use upstream pty package	2020-03-25 21:26:15 +11:00
Jesse Duffield	bbcc4b7b70	just disallow undo/redo while rebasing because you need more info than just the reflog	2020-03-25 09:39:04 +11:00
Jesse Duffield	45bba0a3c5	ignore redundant actions when undoing and redoing	2020-03-25 09:39:04 +11:00
Jesse Duffield	d105e2690a	vastly improve the logic for undo and redo	2020-03-25 09:39:04 +11:00
Jesse Duffield	32d3e497c3	fix tests	2020-03-25 09:39:04 +11:00
Jesse Duffield	30a5d1b486	move into undoing file	2020-03-25 09:39:04 +11:00
Jesse Duffield	6b3ea56add	refactor undo and redo	2020-03-25 09:39:04 +11:00
Jesse Duffield	c3aefdb98e	stateless undos and redos	2020-03-25 09:39:04 +11:00
Jesse Duffield	094939451d	more explicit env vars	2020-03-25 09:39:04 +11:00
Jesse Duffield	0e23f44b84	support reflog action prefix	2020-03-25 09:39:04 +11:00
Jesse Duffield	daecdd7c2b	redoing	2020-03-25 09:39:04 +11:00
Jesse Duffield	7c8df28d01	add waiting status to checkout ref handler	2020-03-25 09:39:04 +11:00
Jesse Duffield	65917272a2	undoing status	2020-03-25 09:39:04 +11:00
Jesse Duffield	137fd80fdb	note that undo functionality is experimental	2020-03-25 09:39:04 +11:00
Jesse Duffield	98fbc61221	better formatted reflog list	2020-03-25 09:39:04 +11:00
Jesse Duffield	f80d15062b	use reflog undo history pointer	2020-03-25 09:39:04 +11:00
Jesse Duffield	b1b0219f04	autostash changes when hard resetting	2020-03-25 09:39:04 +11:00
Jesse Duffield	b1941c33f7	undo via rebase	2020-03-25 09:39:04 +11:00
Jesse Duffield	5d460e1e5e	add tab keybindings	2020-03-23 23:25:00 +11:00
Jesse Duffield	3d3e0be7bd	more compatible commands	2020-03-23 22:33:17 +11:00
Jesse Duffield	3aab37611a	show status of selected cherry picked commits	2020-03-19 21:42:21 +11:00
Jesse Duffield	8fbcc36331	allow resetting cherry picked commits selection	2020-03-19 21:42:21 +11:00
Jesse Duffield	dadb646252	fix branch building	2020-03-19 12:04:17 +11:00
Jesse Duffield	0227b93409	fix branch parser	2020-03-18 23:26:02 +11:00
Jesse Duffield	b0ec0821d5	fix docs	2020-03-18 22:50:35 +11:00
hitsuji_no_shippo	13a7806cac	add opne menu keybindings in docs	2020-03-18 22:50:35 +11:00
hitsuji_no_shippo	41c76fb748	add close menu keybindings in docs	2020-03-18 22:50:35 +11:00
hitsuji_no_shippo	ac0c3b9f92	fix search keybindings in docs	2020-03-18 22:50:35 +11:00
Jesse Duffield	1be0ff8da7	better upstream tracking and allow renaming a branch	2020-03-18 21:29:06 +11:00
hitsuji_no_shippo	2169b5109f	add search keybings in docs	2020-03-11 19:43:22 +11:00
Jesse Duffield	7df4b736cf	be a bit more lenient	2020-03-09 12:41:41 +11:00
Jesse Duffield	e47ad846c4	big golangci-lint cleanup	2020-03-09 12:23:13 +11:00
Jesse Duffield	19146d61b1	use selected branch as base when creating a new branch	2020-03-08 18:44:15 +11:00
skwerlman	e541b809ce	update tests to match changed command	2020-03-06 09:25:31 +11:00
skwerlman	6ca08c6519	make branches and files non-ambiguous for git-log ... fixes #694	2020-03-06 09:25:31 +11:00
Jesse Duffield	31e201ca52	allow configuring side panel width	2020-03-04 00:12:23 +11:00
Jesse Duffield	b3522c48d9	refactor	2020-03-04 00:12:23 +11:00
Jesse Duffield	0fc58a7986	fix test	2020-03-04 00:12:23 +11:00
Jesse Duffield	54241d8ab9	more generic way of supporting custom pagers	2020-03-04 00:12:23 +11:00
Jesse Duffield	355f1615ab	supporing custom pagers step 1	2020-03-04 00:12:23 +11:00
William Wagner Moraes Artero	3ce2b9b79a	chore: keeping coverage up :D	2020-03-01 10:57:12 +11:00
William Wagner Moraes Artero	a79182e50d	fix: accidentally escaped %s	2020-03-01 10:57:12 +11:00
William Wagner Moraes Artero	0eb3090ad6	fix: owner groups (GitLab)	2020-03-01 10:57:12 +11:00
William Wagner Moraes Artero	6ea25bd259	feat: flexible service configuration	2020-03-01 10:57:12 +11:00
William Wagner Moraes Artero	fe5f087f9c	feat: configurable services	2020-03-01 10:57:12 +11:00
Jesse Duffield	79299be3b2	better keybindings for patch building mode	2020-02-29 18:48:10 +11:00
Jesse Duffield	4c9b620bd0	better keybindings for staging by line	2020-02-29 18:48:10 +11:00
Jesse Duffield	a7508a5dfd	fix cheatsheet script to support different contexts	2020-02-29 17:46:00 +11:00
David Chen	a9fe0b8000	set --abbrev-commit to return 8-digit hash strings	2020-02-27 18:05:41 +11:00
David Chen	5af7b0235e	fix #680: unpushed commits still appear to be green instead of red	2020-02-27 18:05:41 +11:00
Corentin Rossignon	bf946200e9	Fix OutOfBound array access when looking for ReflogCommits ... refs #679	2020-02-27 09:34:40 +11:00
Jesse Duffield	890cc87724	fix bug where commits appeared as green despite not being pushed	2020-02-27 09:33:09 +11:00
Jesse Duffield	8eb0b0f4ca	do not close over variables in a function	2020-02-25 22:09:43 +11:00
Jesse Duffield	e6a8dc0bcf	better logic for checking if we're rebasing	2020-02-25 22:09:43 +11:00
Jesse Duffield	02c497fad6	show file list when diffing commits	2020-02-25 21:38:38 +11:00
Jesse Duffield	d0ab747479	color active frames green by default	2020-02-25 21:27:50 +11:00
Jesse Duffield	f94d0be2c9	refactor the way we render lists	2020-02-25 21:21:07 +11:00
Jesse Duffield	9fd9fd6816	better commit lines in fullscreen mode	2020-02-25 21:21:07 +11:00
Jesse Duffield	8ad01fe32f	refresh commits when adding a tag	2020-02-25 09:10:23 +11:00
Jesse Duffield	fdb543fa7d	add half and fullscreen modes	2020-02-25 08:45:30 +11:00
Jesse Duffield	52b5a6410c	show item counts in frames	2020-02-25 07:19:46 +11:00
Jesse Duffield	0034cfef5c	show tags in commits panel	2020-02-24 23:13:54 +11:00
Jesse Duffield	78b62be96f	better handling of clearing the search	2020-02-24 22:18:04 +11:00
Jesse Duffield	1f5ccab1ce	eagerload commits when searching	2020-02-24 22:18:04 +11:00
Jesse Duffield	46be280c92	support searching in side panels ... For now we're just doing side panels, because it will take more work to support this in the various main panel contexts	2020-02-24 22:18:04 +11:00
Jesse Duffield	2a5763a771	switch custom command keybinding to ':'	2020-02-24 22:04:39 +11:00
Jesse Duffield	370cec098b	show diff stat	2020-02-24 09:20:50 +11:00
Dawid Dziurla	49a2f0191f	tasks: don't use a function that requires Go 1.12	2020-02-24 09:09:27 +11:00
Jesse Duffield	fabdda0492	allow customizing background color in staging mode	2020-02-23 18:37:19 +11:00
Glenn Vriesman	6fc3290a05	Reflog: Use 20 sha digits instead of 7 ... Signed-off-by: Glenn Vriesman <glenn.vriesman@gmail.com>	2020-02-20 08:34:01 +11:00
Jesse Duffield	66e6369c28	allow fastforwarding the current branch	2020-02-18 23:07:38 +11:00
Jesse Duffield	0f0da9c32a	fix wording	2020-02-16 09:57:49 +11:00
Jesse Duffield	0a69c1a02d	add reset to reflog commit menu	2020-02-16 09:57:49 +11:00
Jesse Duffield	feaf98bd01	add reset to upstream option on files panel	2020-02-16 09:57:49 +11:00
Jesse Duffield	0fe9c15ce8	add mixed option to HEAD resetting, remove @{upstream}	2020-02-16 09:57:49 +11:00
Jesse Duffield	f528e12c83	allow resetting to tag	2020-02-16 09:57:49 +11:00
Jesse Duffield	8ca9f93ccf	allow resetting to remote branch	2020-02-16 09:57:49 +11:00
Jesse Duffield	73d8064837	allow resetting to branch	2020-02-16 09:57:49 +11:00
Jesse Duffield	5b1f60b7eb	refactor create reset menu logic	2020-02-16 09:57:49 +11:00
Jesse Duffield	2e1344f611	fix specs	2020-02-15 08:47:36 +11:00
Jesse Duffield	5b9996b16f	remove old createMenu function	2020-02-15 08:47:36 +11:00
Jesse Duffield	6fdc1791e4	refactor stash options menu	2020-02-15 08:47:36 +11:00
Jesse Duffield	fd4f37b5c3	refactor git flow menu	2020-02-15 08:47:36 +11:00
Jesse Duffield	d76e8887e5	refactor patch options menu panel	2020-02-15 08:47:36 +11:00
Jesse Duffield	eb9134685a	refactor rebase menu panel	2020-02-15 08:47:36 +11:00
Jesse Duffield	d929b84786	refactor recent repos menu panel	2020-02-15 08:47:36 +11:00
Jesse Duffield	8ef3297b11	refactor reflog reset options panel	2020-02-15 08:47:36 +11:00
Jesse Duffield	27c7aeb117	refactor workspace reset options panel	2020-02-15 08:47:36 +11:00
Jesse Duffield	c9714600e8	refactor commit reset menu	2020-02-15 08:47:36 +11:00
Jesse Duffield	665fdded14	continue refactor of menu panel	2020-02-15 08:47:36 +11:00